urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-12 10:29:01 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,956 Commits 768 Branches 10 Tags 215 MiB
e9ec3b2ded
Commit Graph

4956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Anton Dyudin
1a61fe4378 added |init-oauth2 secrets dialog 2016-02-04 15:03:51 -08:00
Philip C Monk
abf111fb91 Merge remote-tracking branch 'anton/eyre-sec' into eyre-sec 2016-02-04 15:11:05 -05:00
Galen Wolfe-Pauly
087911e581 sweeping with anton 2016-02-04 11:52:00 -08:00
C. Guy Yarvin
24b1e1c5d2 Convert $+ to $-. 2016-02-03 23:12:23 -08:00
C. Guy Yarvin
76ab967ef6 About to change over to $-. 2016-02-03 22:59:22 -08:00
C. Guy Yarvin
4267697f9e Fully shifted over to modern typed namespace. 2016-02-03 20:51:01 -08:00
C. Guy Yarvin
779f70559b Ford uses new load model. 2016-02-03 19:32:14 -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
C. Guy Yarvin
e3e4b50b08 Stable. 2016-02-03 16:14:35 -08:00
Galen Wolfe-Pauly
bfd52f9e32 sweeping 2016-02-03 16:12:46 -08:00
Raymond Pasco
06903d894d Merge branch 'crub' 
This merge only takes the completed cryptosuite B implementation.
Curve will be enabled later.
 2016-02-03 17:53:50 -05: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
C. Guy Yarvin
0657bdee82 More typed .^. 2016-02-03 13:33:43 -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
C. Guy Yarvin
631d4b9c04 Fully transitioned to correct %face. 2016-02-02 18:45:11 -08:00
C. Guy Yarvin
c406a58d08 Ready to remove temporary %fuss. 2016-02-02 18:26:22 -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
C. Guy Yarvin
af35cff1d6 %face to %fuss. Next change back. 2016-02-02 17:50:34 -08:00
Philip C Monk
e5d5d2fb82 gh looks pretty good 2016-02-02 18:41:04 -05: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
C. Guy Yarvin
1832c14cca Merge remote-tracking branch 'cgyarvin/newdeal' into newdeal 2016-02-02 14:13:21 -08:00
Anton Dyudin
f1b3451c1d minor cleaning 2016-02-02 13:24:20 -08:00
C. Guy Yarvin
84e7c319ae Making typed .^ a little less fake. 2016-02-02 11:52:10 -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
C. Guy Yarvin
049f1defb2 151 merge is double solid. 2016-01-31 22:16:26 -08:00
C. Guy Yarvin
25d791e2a4 Merge remote-tracking branch 'upstream/master' into newdeal 2016-01-31 20:37:49 -08:00
C. Guy Yarvin
761f588cc6 Fix various marks, etc. 2016-01-30 19:37:03 -08:00
C. Guy Yarvin
fd7ab7b473 More %work removal. 2016-01-30 15:53:16 -08:00
C. Guy Yarvin
4c7a8e6f32 Removed %work. 2016-01-30 15:52:55 -08:00
C. Guy Yarvin
6c71b1cdf3 Fix oct*. Check in %work to delete it. 2016-01-30 15:44:22 -08:00
C. Guy Yarvin
8edc8d4361 Sigh. 2016-01-30 14:32:49 -08:00
Raymond Pasco
6496dcc25e Merge branch 'eyre-post', remote-tracking branch 'whereswaldon/odors-doc-update' 
POST to eyre hooks (currently just fakes url params)
Correct dojo type syntax in a doc
 2016-01-30 10:06:45 -05:00
C. Guy Yarvin
b4469d0aa3 Fix some shit code in lib/tree.hoon. 2016-01-29 20:40:01 -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