Commit Graph

276 Commits

Author SHA1 Message Date
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
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
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
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
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
4ef7983522 added redirect handling 2015-12-07 16:56:51 -08:00
Anton Dyudin
b3ea66fab3 update urb.util.basename 2015-12-07 13:36:13 -08:00
Anton Dyudin
8151b0279e move /as-rss to /web/as/rss, /tree-gen to /fab 2015-12-07 13:30:55 -08:00
Anton Dyudin
f2e4aad4b3 Revert "Revert "add as-rss blog summarizer" - ford /_ loop"
This reverts commit 388923e03a19cdfe514fdc0c39d2c083c556cbfa.
2015-12-07 13:01:38 -08:00
Anton Dyudin
0994ad1976 /pub -> /web, mostly 2015-12-07 12:57:38 -08:00