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 |
|
Anton Dyudin
|
fe05f3080c
|
/- /+ dojo syntax
|
2015-09-15 16:27:19 -07:00 |
|
Anton Dyudin
|
8d10ee10d9
|
fixed json tank reading
|
2015-09-15 16:26:22 -07:00 |
|
Philip C Monk
|
852bd5a202
|
Merge branch 'master' into clayhammer
|
2015-09-15 19:16:09 -04:00 |
|
Anton Dyudin
|
35a38194b0
|
Merge branch 'talklog' of https://github.com/philipcmonk/urbit into nobreach
|
2015-09-15 15:19:51 -07:00 |
|
Philip C Monk
|
6f4e65167b
|
timestamped talk logfiles
|
2015-09-15 18:13:43 -04:00 |
|
Anton Dyudin
|
93a8121a71
|
talk log frontend v0.1
|
2015-09-15 11:41:01 -07:00 |
|
Raymond Pasco
|
7beaf23459
|
Merge branch 'murn-jet' into test
Closes #402
|
2015-09-15 14:05:16 -04:00 |
|
Joan Torres
|
7699134470
|
Add ++murn jet
|
2015-09-15 13:59:00 -04:00 |
|
Anton Dyudin
|
1b67230713
|
tank handling
|
2015-09-15 10:50:30 -07:00 |
|
Anton Dyudin
|
4c14bd845a
|
better task rendering for frontend
|
2015-09-15 10:45:04 -07:00 |
|
Raymond Pasco
|
06ae00c96a
|
Forwardport branch 'readme-fix' into test
|
2015-09-15 02:38:00 -04:00 |
|
Anton Dyudin
|
e0b3f6b2b1
|
fixed telegrams serialization
|
2015-09-14 18:03:40 -07:00 |
|
Philip C Monk
|
4d2d972539
|
unlog
|
2015-09-14 19:07:47 -04:00 |
|
Philip C Monk
|
eb78b250fa
|
Merge branch 'pending' into test
|
2015-09-11 20:47:43 -04:00 |
|
Philip C Monk
|
a4634d96f1
|
Merge remote-tracking branch 'anton/nobreach' into pending
|
2015-09-11 20:39:24 -04:00 |
|
Anton Dyudin
|
e22d13c6a6
|
curl generator example
|
2015-09-11 17:36:52 -07:00 |
|
Philip C Monk
|
77eb638240
|
merge clay card-sending pathways
|
2015-09-11 20:27:32 -04:00 |
|
Anton Dyudin
|
1755179ce3
|
rename generators to %say, %ask, %get
|
2015-09-11 17:24:51 -07:00 |
|
Anton Dyudin
|
81eeb6714e
|
fix url grab
|
2015-09-11 17:07:50 -07:00 |
|
Anton Dyudin
|
ecfefc1a9a
|
more conservative dy-no-prompt
|
2015-09-11 15:52:37 -07:00 |
|
Anton Dyudin
|
56bbfa7eea
|
support %pig scrapers
|
2015-09-11 15:46:16 -07:00 |
|
Anton Dyudin
|
d291d0b59e
|
separate mark %as and gate-application %do
|
2015-09-11 15:00:20 -07:00 |
|
Anton Dyudin
|
0964b3fd6d
|
cat/dog to gen collapse
|
2015-09-11 15:00:11 -07:00 |
|
Philip C Monk
|
f60edac580
|
Merge branch 'pending' into test
|
2015-09-11 17:19:16 -04:00 |
|
Philip C Monk
|
c970aeeec2
|
Merge branch 'hotfix-doc-runes' of https://github.com/juped/urbit into pending
|
2015-09-11 17:09:46 -04:00 |
|