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,253 Commits 768 Branches 10 Tags 215 MiB
d0c74442ea
Commit Graph

4253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip C Monk
79bca6e35a Merge remote-tracking branch 'origin/master' into pending 2015-10-01 18:04:08 -04:00
Galen Wolfe-Pauly
505fd03489 Merge branch 'test' of github.com:galenwp/urbit into test 2015-09-29 17:22:15 -07:00
Galen Wolfe-Pauly
5e07d3d703 Merge branch 'test' of github.com:urbit/urbit into test 2015-09-29 17:18:25 -07:00
Anton Dyudin
76bf326260 glyph autobinding 2015-09-29 16:47:30 -07:00
Galen Wolfe-Pauly
e97bec0bb5 tutorial drafts 2015-09-29 14:36:58 -07:00
Galen Wolfe-Pauly
0cc523538a based css 2015-09-29 14:29:38 -07:00
Galen Wolfe-Pauly
6651e78509 doc reorg and clean, tree blank item fix 2015-09-29 14:12:57 -07:00
Anton Dyudin
9dd386d4b2 Merge branch 'nobreach' into moretalk 2015-09-29 12:31:29 -07:00
Anton Dyudin
2f1b10a7d5 Merge branch 'master' of https://github.com/urbit/urbit into nobreach 2015-09-29 12:16:37 -07:00
Anton Dyudin
1d4891e4ef add ? expr, ?? expr, ??? expr 2015-09-29 12:15:33 -07:00
Anton Dyudin
58e86fb223 No ford profiling 2015-09-29 12:15:01 -07:00
Raymond Pasco
c8baf9e81c Merge remote-tracking branch 'burtonsamograd/ignore-emacs-temp-files' into test 2015-09-28 21:23:50 -04:00
Philip C Monk
1a02d31022 fix timers 2015-09-28 20:48:30 -04:00
Raymond Pasco
f1795ec9cd Backport big green merge button fallout to test 2015-09-26 18:05:02 -04:00
Philip C Monk
6d8cf6dbc9 repetitive reloading 2015-09-25 20:23:06 -04:00
Anton Dyudin
a243f2a59a ford profiling 2015-09-25 16:05:40 -07:00
Philip C Monk
da5959f641 Merge branch 'master' into test 2015-09-25 18:57:50 -04:00
Philip C Monk
cd59a04817 added cancel 2015-09-25 13:37:25 -04:00
C. Guy Yarvin
7488955887 Merge branch 'master' of https://github.com/urbit/urbit 2015-09-24 16:34:17 -07:00
Anton Dyudin
f93a8c2401 disable "empty path" handling out of confusion 2015-09-24 14:56:21 -07:00
Anton Dyudin
a2d9922d9c simplified Table of Contents js 2015-09-24 13:14:23 -07:00
Anton Dyudin
14d7407e04 fixed jquery object property iteration 2015-09-24 12:05:19 -07:00
Anton Dyudin
006b805044 diabled header onclick handling 2015-09-24 11:15:24 -07:00
Anton Dyudin
e21a202fbf fixed email component 2015-09-24 11:10:12 -07:00
Philip C Monk
29835e1fe0 Merge branch 'bvschwartz-patch-1', remote-tracking branch 'anton/nobreach' into pending 2015-09-23 20:38:42 -04:00
bvschwartz
a54d776d0a Update architecture.md 
formatting fix
 2015-09-23 17:34:10 -07:00
Anton Dyudin
993bcd3ddb sigh 2015-09-23 17:22:28 -07:00
Anton Dyudin
f77ffac57c actually fix async maybe? 2015-09-23 17:17:09 -07:00
Anton Dyudin
3a1170cedd Merge remote-tracking branch 'urbit/master' into nobreach 2015-09-23 16:57:31 -07:00
Philip C Monk
a30b5e82b9 Merge remote-tracking branch 'anton/nobreach' into pending 2015-09-23 19:56:55 -04:00
Anton Dyudin
cdad444127 actually fix EMPTY usage 2015-09-23 16:53:48 -07:00
Philip C Monk
7021de3172 Merge remote-tracking branch 'anton/nobreach' into pending 2015-09-23 19:41:14 -04:00
Anton Dyudin
b07f6fab02 null check 2015-09-23 16:40:30 -07:00
Philip C Monk
172a80a610 Merge remote-tracking branch 'anton/nobreach' into pending 2015-09-23 19:34:56 -04:00
Anton Dyudin
aaba53d2fa better emptiness handling take 2 2015-09-23 16:29:20 -07:00
Philip C Monk
ab6e845dfa Merge remote-tracking branch 'anton/nobreach' into pending 2015-09-23 19:11:15 -04:00
Anton Dyudin
107ea39690 fix invalid-path spin 2015-09-23 16:10:30 -07:00
Philip C Monk
3c65e2ec33 Merge remote-tracking branch 'anton/nobreach' into pending 2015-09-23 17:38:48 -04:00
Anton Dyudin
e7cddf6920 Merge remote-tracking branch 'glen/test' into nobreach 2015-09-23 14:25:54 -07:00
Anton Dyudin
c76ee92346 transitioned eyre to use weak etags 2015-09-23 13:50:31 -07:00
Galen Wolfe-Pauly
13dc738ac1 email component with validation and submit 2015-09-23 10:27:02 -07:00
Galen Wolfe-Pauly
c44084be40 email component 2015-09-23 09:56:58 -07:00
Philip C Monk
efeeef77f1 Merge remote-tracking branch 'galen/test' into pending 2015-09-21 16:05:18 -04:00
Galen Wolfe-Pauly
c61293fb44 fixed anchor bug 2015-09-21 13:00:58 -07:00
Philip C Monk
09c6d28d6b bump protocol to 5 2015-09-21 15:08:57 -04:00
Philip C Monk
417dda3aaf Merge remote-tracking branches 'anton/nobreach' and 'my/clayhammer' into test 
Conflicts:
	urb/urbit.pill
 2015-09-21 14:58:10 -04:00
Raymond Pasco
0d27f09019 Merge remote-tracking branch 'gunga/skid-jet' into test 2015-09-19 15:41:37 -04:00
Joan Torres
cb8e5f41df Add ++skid jet 2015-09-19 10:03:13 -07:00
Philip C Monk
06bda9cd8c fixed lose-changes-when-unrelated-conflict bug 2015-09-18 20:15:36 -04:00
Anton Dyudin
1c52d51661 manually bound glyphs 2015-09-18 16:20:30 -07:00