Commit Graph

58 Commits

Author SHA1 Message Date
Raymond Pasco
67d94c3f8a Merge remote-tracking branches 'ohaitch/redo-pull-161', 'joemfb/moon-error', 'knubie/master' and 'ohaitch/tree-64612ca'
Errata for merge a6e1b08
More user-friendly +moon experience
talk@d1ecb80
tree@64612ca
2016-06-26 00:38:42 -04:00
Anton Dyudin
313de74ab3 fix merge conflict resolution 2016-06-24 16:50:57 -07:00
Galen Wolfe-Pauly
bb0055a0ab new title 2016-06-15 15:05:10 -07:00
Anton Dyudin
a1721d2955 automatic resource packing 2016-06-07 14:45:54 -07:00
Raymond Pasco
84734bf61d Merge remote-tracking branch 'galenwp/clock'
Conflicts:
	web/talk/main.js
	web/tree/main.js
	web/tree/~.main_urb.js

Comments, talk feed, &c
2016-06-06 14:21:21 -04:00
Joseph Bryan
55f811d36f updates :tree to serve JS/CSS assets from the current desk 2016-06-06 12:55:48 -04:00
Anton Dyudin
61026b95dc parse tree-comments user out of ;h2:code:""
urbit/tree@6bdd46e
2016-05-23 18:33:41 -07:00
Galen Wolfe-Pauly
49b86157eb fixed css ordering 2016-05-18 22:48:27 -07:00
Anton Dyudin
1fd71203ad include bootstrap js for modules 2016-05-12 16:40:45 -07:00
Anton Dyudin
048904fdaa don't include %mime by default, base64 when you do
so that it doesn't break the page via stray </script> tags
2016-05-10 11:05:32 -07:00
Anton Dyudin
e83ef02c93 absolute, urbit paths for resources 2016-05-09 16:32:00 -07:00
Anton Dyudin
d9fdabfc91 add dbg.nomin query string flag to disable minification 2016-05-05 11:33:02 -07:00
Anton Dyudin
02dec5dfde default to serving concatenated css/js
web/tree/{main_hoon_urb.js,main_codemirror_fonts_bootstrap.css} are artefacts that should be maintained by concatenating {tree/main,lib/js/{hoon,urb}}.js and {tree/main,lib/css/{codemirror,fonts,bootstrap.min}}.css respectively
2016-05-03 14:37:52 -07:00
Anton Dyudin
7983d369b1 preload parent, child data
tree@624cc78
2016-05-03 14:33:33 -07:00
Anton Dyudin
0ed4f56935 add $now /_ @odor horn, closing #34 2016-04-18 17:22:07 -07:00
Anton Dyudin
1700b85ba6 fix defintion of tree/head aut 2016-04-01 17:48:54 -07:00
Anton Dyudin
f64cc68497 Merge remote-tracking branch 'glen/comment' into web-stream
urbit/tree@7ce6a70, react mountpoint changed in ren/
urbit/talk@48ab9a8
2016-03-31 18:01:51 -07:00
Anton Dyudin
bf87021aa9 added urb.sein, tree-json.beak 2016-03-29 15:29:22 -07:00
Anton Dyudin
730af1b93f add json translation for frontend use 2016-03-28 16:24:31 -07:00
Galen Wolfe-Pauly
6ecaec05ad homepage 2016-03-12 14:34:55 -08:00
Galen Wolfe-Pauly
3730bc82c9 move to web/pages 2016-03-03 11:28:02 -08:00
Anton Dyudin
a5a058d7da move tree-comments to separate renderer
Cherry-pick of a2cc5d5
2016-02-25 18:27:45 -08:00
Anton Dyudin
29dc7bda8b fix rss 2016-02-25 17:35:00 -08:00
Anton Dyudin
8cfbe65274 fix ren/index unused path 2016-02-17 16:05:38 -08:00
Anton Dyudin
c7e5ee9b1d sign off on ren, sur, web 2016-02-17 15:25:53 -08:00
Anton Dyudin
11341be6d7 fix rss renderer 2016-02-17 15:17:46 -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
6db85fe1ac more tree 151ization 2016-02-11 16:33:22 -08:00
Anton Dyudin
dafdf4d161 fix (some) generators 2016-02-11 16:33:22 -08:00
Anton Dyudin
8a6bb31ed0 151ify tree hooks 2016-02-11 16:33:22 -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
0c0283d2dd recent-first comment order 2016-02-09 21:15:53 -08:00
Anton Dyudin
a628961dbd fix comments mark 2016-02-09 21:15:53 -08:00
Anton Dyudin
bd143385c5 Merge branch 'data-dep' into tree-comments
handle chrome/data separation in an official manner
2016-02-09 21:15:52 -08:00
Anton Dyudin
71adc8fb50 first try at head-body separation 2016-02-09 21:15:38 -08:00
Anton Dyudin
1ad6414345 Revert "don't include initial tree-json"
This reverts commit ad7f3da4ff5424e47be343a5169885ecd018f856.
2016-02-09 19:42:58 -08:00
Anton Dyudin
263730193c type-check ;html:(head body) 2016-02-09 17:24:30 -08:00
Anton Dyudin
8504d823c6 moved ~/on/<dep>.js injection to mar/urb
The script itself remains in eyre, for usage by error messages.
2016-02-09 17:09:33 -08:00
Anton Dyudin
5677254816 move /~date.comments-md to /comments/~date.md
when outputing tree comments
2016-02-09 11:55:43 -08:00
Anton Dyudin
db968aab50 don't include initial tree-json 2016-02-08 15:21:22 -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
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
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
dd2aff37a8 fix metadata reading 2016-02-03 14:43:40 -08:00
Anton Dyudin
bf5e3cc73c default to elem.hook treatment 2016-02-01 16:54:45 -08:00
Anton Dyudin
a2081a7482 transfered /@ to "include by date", /& now "cast to mark" 2016-02-01 15:58:48 -08:00