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 |
|
Anton Dyudin
|
28370ba193
|
sessions were being replaced without being stopped. Fixes #406
|
2015-09-18 15:11:23 -07:00 |
|
Philip C Monk
|
0bfa034edb
|
added clay architecture doc
|
2015-09-18 16:45:09 -04:00 |
|
Philip C Monk
|
646fa7cf14
|
:+merge -> |merge
|
2015-09-17 19:20:07 -04:00 |
|
Anton Dyudin
|
6310b2495c
|
Merge branch 'master' of https://github.com/urbit/urbit into pittyp
|
2015-09-17 13:57:38 -07:00 |
|
Anton Dyudin
|
c44ca28430
|
Merge branch 'master' into pittyp
|
2015-09-17 13:56:00 -07:00 |
|
Philip C Monk
|
eff952ad2a
|
Merge remote-tracking branch 'my/pending' into test
|
2015-09-17 16:55:57 -04:00 |
|
Philip C Monk
|
dd915b591e
|
Merge remote-tracking branch 'anton/nobreach' into pending
|
2015-09-17 16:54:33 -04:00 |
|
Anton Dyudin
|
fc9c0181ff
|
FIxed '_'.repeat bug
|
2015-09-17 13:50:10 -07:00 |
|
Philip C Monk
|
7c5860412a
|
fix %talk-telegrams
|
2015-09-17 15:10:01 -04:00 |
|
Philip C Monk
|
081da0eee4
|
Merge remote-tracking branch 'my/pending' into test
Conflicts:
urb/urbit.pill
|
2015-09-17 14:51:01 -04:00 |
|
Philip C Monk
|
4550b6a97b
|
Merge remote-tracking branches 'anton/nobreach' and 'galen/test' into pending
|
2015-09-17 14:36:41 -04:00 |
|
Anton Dyudin
|
3f7935e453
|
Merge branch 'master' into nobreach
|
2015-09-17 11:34:38 -07:00 |
|
Philip C Monk
|
5de171f23d
|
RIP %indirect
|
2015-09-16 19:45:54 -04:00 |
|
Philip C Monk
|
a84fb403f6
|
turn off autoload with |autoload
|
2015-09-16 19:40:53 -04:00 |
|
Anton Dyudin
|
cf5a8c79c2
|
fix tree, per-day talk output format, rendering
|
2015-09-16 15:52:40 -07:00 |
|
Philip C Monk
|
aaa9022a48
|
autoreload and autoreset
|
2015-09-16 18:39:11 -04:00 |
|
Raymond Pasco
|
ead654f18e
|
Merge remote-tracking branch 'gunga/reap-jet' into test
|
2015-09-16 17:01:25 -04:00 |
|
Anton Dyudin
|
610cf1b95f
|
clean up pre-ford-refactor shims
|
2015-09-16 13:57:24 -07:00 |
|
Joan Torres
|
58ddbe73fa
|
Add ++reap jet
|
2015-09-16 13:50:36 -07:00 |
|
Anton Dyudin
|
3b99a6083e
|
more compact rend-work-duty
|
2015-09-16 13:47:26 -07:00 |
|
Galen Wolfe-Pauly
|
6bd7c717f5
|
confusion
|
2015-09-16 12:10:38 -07:00 |
|
Galen Wolfe-Pauly
|
642b8da58e
|
not sure how that got reverted
|
2015-09-16 12:04:51 -07:00 |
|
Philip C Monk
|
3bfe641b1c
|
added |cancel
|
2015-09-15 20:24:44 -04:00 |
|