Commit Graph

4347 Commits

Author SHA1 Message Date
Anton Dyudin
f469557a42 clean up unbound generators 2016-02-05 14:17:30 -08:00
Galen Wolfe-Pauly
aebcc16adb Merge branch 'factor' of https://github.com/ohaitch/urbit into factor 2016-02-05 10:54:25 -08:00
Galen Wolfe-Pauly
37a566021e Odds and ends: login / out, dojo details.
tree@ced2501277
2016-02-04 19:56:11 -08:00
Anton Dyudin
c05e96c62f fix hoon location header information 2016-02-04 19:05:37 -08:00
Anton Dyudin
e1c1da92c2 standardize location-header structure 2016-02-04 18:57:44 -08:00
Anton Dyudin
83af2347c4 :talk &foo ~.channel now :talk|foo ~.channel 2016-02-04 18:12:48 -08:00
Galen Wolfe-Pauly
ac0ee5f3f0 in-between tree commits 2016-02-04 17:38:14 -08:00
Anton Dyudin
bf11734b85 ape -> app 2016-02-04 16:38:18 -08:00
Anton Dyudin
268d62cfe5 moved some tree-combine logic to marks 2016-02-04 16:27:55 -08:00
Galen Wolfe-Pauly
2a95c443ed Merge branch 'factor' of github.com:ohAitch/urbit into factor
Conflicts:
	urb/zod/web/tree/main.js

(had a newer main.js)

talk@26b0befe86
tree@621235bf52
2016-02-04 16:16:18 -08:00
Galen Wolfe-Pauly
d15cf9d5f7 working on hp 2016-02-04 16:00:23 -08:00
Galen Wolfe-Pauly
087911e581 sweeping with anton 2016-02-04 11:52:00 -08:00
Anton Dyudin
e77bda234e add comments to tree
https://github.com/urbit/tree/tree/0a9c5a0
2016-02-03 17:53:38 -08:00
Anton Dyudin
065bc10999 Merge branch 'factor' of https://github.com/galenwp/urbit into factor
Conflict: paste fixed in factor, deleted in glen/factor
2016-02-03 17:52:42 -08:00
Galen Wolfe-Pauly
bfd52f9e32 sweeping 2016-02-03 16:12:46 -08:00
Anton Dyudin
dd2aff37a8 fix metadata reading 2016-02-03 14:43:40 -08:00
Anton Dyudin
7f491f14c9 fix paste relative paths 2016-02-03 13:46:32 -08:00
Galen Wolfe-Pauly
7c9a506b84 Merge branch 'factor' of https://github.com/ohaitch/urbit into factor
Conflicts:
	urb/zod/web/tree/main.js

Tree@fbcdee088d
2016-02-03 10:32:34 -08:00
Galen Wolfe-Pauly
e872cc507c mobile 2016-02-03 10:23:49 -08:00
Anton Dyudin
4593025ec1 moved single-page apps to web/app 2016-02-02 18:08:32 -08:00
Anton Dyudin
5316ca03d8 exposed urb.waspElem, urb.waspURL
https://github.com/urbit/tree@3b360ff
2016-02-02 18:08:32 -08:00
Anton Dyudin
cfff86d1db moved web/app/dojo back to web/dojo as a module
https://github.com/urbit/sole@080b8b6
2016-02-02 18:08:19 -08:00
Anton Dyudin
80d5288cd2 moved subnav props to module, reactify now async
https://github.com/urbit/talk@3eba6c8
  https://github.com/urbit/tree@04cc845
2016-02-02 15:25:15 -08:00
Anton Dyudin
f1b3451c1d minor cleaning 2016-02-02 13:24:20 -08:00
Galen Wolfe-Pauly
4415296a69 ok working layers 2016-02-01 21:46:38 -08:00
Anton Dyudin
8e87106369 moved sole protocol coffee to separate repository
https://github.com/urbit/sole@e2741c0
2016-02-01 17:44:11 -08:00
Anton Dyudin
bf5e3cc73c default to elem.hook treatment 2016-02-01 16:54:45 -08:00
Anton Dyudin
423b065bbc Merge branch 'translation-fspm' into factor 2016-02-01 16:54:25 -08:00
Galen Wolfe-Pauly
e9032c460b talking 2016-02-01 16:00:45 -08:00
Anton Dyudin
a2081a7482 transfered /@ to "include by date", /& now "cast to mark" 2016-02-01 15:58:48 -08:00
Anton Dyudin
a86b7ccc43 preliminary refactoring: horns producing cages instead of vases 2016-02-01 15:15:10 -08:00
Anton Dyudin
53006273ee Don't inject ;meta(urb_front) if frontmatter is empty/nonexistent 2016-02-01 11:53:25 -08:00
Galen Wolfe-Pauly
8f714ad02d semi-working 2016-01-29 19:02:03 -08:00
Galen Wolfe-Pauly
94a3bc7e84 manual merge 2016-01-29 18:54:28 -08:00
Galen Wolfe-Pauly
5e91f7edaf everything ready to be cleaned. 2016-01-29 18:29:57 -08:00
Galen Wolfe-Pauly
6faa0521ab submenu 2016-01-29 18:18:51 -08:00
Anton Dyudin
4cc89df474 fix hoon source not rendering in tree 2016-01-29 17:36:37 -08:00
Anton Dyudin
011f7c0b48 Merge branch 'factor' into ford-ren - XX unresolved js 2016-01-29 17:35:38 -08:00
Anton Dyudin
6fc3c8e5c9 pre-merge: mv urb/zod/urb/zod/{lib,web/lib}/{js,css} 2016-01-29 15:52:28 -08:00
Anton Dyudin
be672cf4e7 pre-merge: mv web/lib/{**.(js|css),\1/}, web/*/{(js|css)/main.\1,main.\1} 2016-01-29 15:50:34 -08:00
Anton Dyudin
30faf9d0a8 pre-merge: remove urb/zod/web/docs, coffee/stylus source 2016-01-29 15:50:07 -08:00
Anton Dyudin
d1e6db156d Merge branch 'eyre-root-beam' into ford-ren - requested for glen/factor merge 2016-01-29 14:41:19 -08:00
Anton Dyudin
d653871875 pre-merge: mv urb/zod/web/*{/hymn.hook,.hoon} 2016-01-29 13:28:47 -08:00
Anton Dyudin
34e71276ad pre-merge: mv urb/zod/{pub,web}/*.hoon 2016-01-29 13:22:28 -08:00
Anton Dyudin
92a308d474 ford alts 2016-01-29 11:02:10 -08:00
Anton Dyudin
c378387232 disable edit-tree@8b14088..8fdcaf7 2016-01-28 17:38:53 -08:00
Galen Wolfe-Pauly
02b069d94a update compiled code, login look and feel 2016-01-27 15:01:05 -08:00
Galen Wolfe-Pauly
0c9da59537 no work 2016-01-27 11:10:33 -08:00
Galen Wolfe-Pauly
2e72056fb5 take out docs 2016-01-27 11:01:01 -08:00
Galen Wolfe-Pauly
7ebefb7c5f new talk, tree with new react 2016-01-27 10:53:37 -08:00