Raymond Pasco
e1480cb570
Merge remote-tracking branches 'philipcmonk/ford-fix', 'ray/lune-nule' and 'ohaitch/talk-comments'
...
Conflicts:
mar/tree/comments.hoon
Fix off-by-one in marks that was removing the last byte of clay files
Add ++lune/++nule Unix textfile arms
Route .tree 'comments' input through talk
2016-02-29 17:11:50 -05:00
Anton Dyudin
f0575a25ff
add %comments notification, fix talk ui for comments
...
urbit/talk@9fac3e3
2016-02-29 13:20:19 -08:00
Anton Dyudin
d331391486
proxy tree comments through talk
...
urbit/tree@bdebe54
2016-02-25 12:38:00 -08:00
Galen Wolfe-Pauly
209bc2daac
fix homepage after bootstrap update
...
bootstrap@8a279c8528
2016-02-24 16:31:02 -08:00
Galen Wolfe-Pauly
e3f9bc8038
Fix homepage and menu overlapping
...
tree@88abd89677
2016-02-24 16:19:25 -08:00
Galen Wolfe-Pauly
4968247461
fixes some tree overlay and scrolling bugs, the talk code execution bug and scroll offset bug.
...
talk@9f08e47a21
tree@cdb90fcc72
2016-02-23 22:32:30 -08:00
Galen Wolfe-Pauly
8917cbe7ad
fixed a nav stacking bug.
...
tree@1d7359c7278f95025b5cd6bcf08a9dd3ed2f32cd
2016-02-22 19:50:47 -05:00
Galen Wolfe-Pauly
fba886bee9
talk and tree update
...
tree@f4edc664bf
talk@044615bcd6
2016-02-22 18:04:51 -05:00
Anton Dyudin
c7e5ee9b1d
sign off on ren, sur, web
2016-02-17 15:25:53 -08:00
Anton Dyudin
5f42c0d07e
fix urb.js path
2016-02-12 13:29:54 -08:00
Anton Dyudin
7347b8c549
added .run renderer to work around #694 , fixed web dojo
2016-02-12 11:38:59 -08:00
Anton Dyudin
fb3c53553f
add missing /?s
2016-02-11 16:33:21 -08:00
Anton Dyudin
2fbeee9243
more header-comment normalization
2016-02-11 16:33:21 -08:00
Anton Dyudin
81297bc162
Merge branch 'hoon-151' into tree-comments
...
Merge hoon 151
2016-02-10 19:43:53 -08:00
Anton Dyudin
63639dde49
hoon151 syntax highlighting
2016-02-10 16:38:47 -08:00
Anton Dyudin
2c4c1c767b
update tree to use datadeps
...
https://github.com/urbit/tree@a3a2bc1
2016-02-09 21:43:05 -08:00
Galen Wolfe-Pauly
b71d945168
tree@ 3e59dc683a
...
talk@8d6967e238
2016-02-06 16:42:31 -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
Galen Wolfe-Pauly
ac0ee5f3f0
in-between tree commits
2016-02-04 17:38:14 -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
Galen Wolfe-Pauly
bfd52f9e32
sweeping
2016-02-03 16:12:46 -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
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