urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-14 20:02:51 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,976 Commits 768 Branches 10 Tags 215 MiB
49d11b5270
Commit Graph

24 Commits

Author SHA1 Message Date
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
d331391486 proxy tree comments through talk 
urbit/tree@bdebe54
 2016-02-25 12:38:00 -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
81297bc162 Merge branch 'hoon-151' into tree-comments 
Merge hoon 151
 2016-02-10 19:43:53 -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
37a566021e Odds and ends: login / out, dojo details. 
tree@ced2501277
 2016-02-04 19:56:11 -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
e872cc507c mobile 2016-02-03 10:23:49 -08:00
Galen Wolfe-Pauly
4415296a69 ok working layers 2016-02-01 21:46:38 -08:00
Galen Wolfe-Pauly
e9032c460b talking 2016-02-01 16:00:45 -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