Philip C Monk
|
c7d8cfd114
|
mostly working userlevel conflict merge
|
2015-04-07 18:24:16 -04:00 |
|
Philip C Monk
|
939c129539
|
bug fixes
|
2015-04-06 19:20:28 -04:00 |
|
Philip C Monk
|
76fd6824a6
|
:merge rework
|
2015-04-03 21:31:57 -04:00 |
|
Philip C Monk
|
a8409da5cf
|
autosync works
|
2015-03-23 16:40:33 -04:00 |
|
Philip C Monk
|
f55f5bc295
|
moving stuff around
|
2015-03-11 20:37:37 -04:00 |
|
Philip C Monk
|
7bf9db3b1a
|
merging across network works
|
2015-03-11 15:43:44 -04:00 |
|
Philip C Monk
|
277a301036
|
Merge remote-tracking branch 'origin/master' into typedclay
Conflicts:
urb/urbit.pill
|
2015-03-10 15:47:22 -04:00 |
|
Anton Dyudin
|
8771f59ff3
|
Fix #262
|
2015-03-06 11:27:39 -08:00 |
|
Philip C Monk
|
31d3788115
|
Merge remote-tracking branch 'origin/master' into typedclay
Conflicts:
urb/urbit.pill
urb/zod/arvo/eyre.hoon
urb/zod/arvo/hoon.hoon
urb/zod/arvo/zuse.hoon
urb/zod/main/app/poke/core.hook
urb/zod/main/app/reboot/core.hook
urb/zod/main/app/shell/core.hook
urb/zod/main/app/tree/core.hook
|
2015-03-05 18:27:07 -05:00 |
|
Philip C Monk
|
8777772efa
|
basic userspace merge tool
|
2015-03-02 20:28:32 -05:00 |
|
Philip C Monk
|
0e024a009f
|
move along, nothing to see here
|
2015-02-27 01:35:41 -05:00 |
|
Anton Dyudin
|
f487f457ab
|
sen disable
|
2015-02-06 12:56:21 -08:00 |
|
Anton Dyudin
|
4236ddf20d
|
++print refactoring
|
2015-02-06 12:46:30 -08:00 |
|
Anton Dyudin
|
55e6a1492e
|
Backlog de-flop 2
|
2015-02-06 12:40:54 -08:00 |
|
Anton Dyudin
|
fd47960fc2
|
++send cleaning
|
2015-02-06 12:32:18 -08:00 |
|
Anton Dyudin
|
a34f82f829
|
Fixed state erasure
|
2015-02-06 12:24:30 -08:00 |
|
Anton Dyudin
|
8bbe811ad1
|
Curl utility
|
2015-01-29 18:36:00 -08:00 |
|
Anton Dyudin
|
db05158f71
|
Merge branch 'test'
Conflicts:
urb/urbit.pill
|
2015-01-29 11:17:01 -08:00 |
|
Galen Wolfe-Pauly
|
51708dd145
|
begin de flopped
|
2015-01-28 07:13:30 -08:00 |
|
Anton Dyudin
|
b663c8974b
|
Added :time
|
2015-01-27 22:27:35 -08:00 |
|
Galen Wolfe-Pauly
|
ea2ca20e25
|
Merge branch 'master' into test
|
2015-01-27 09:01:25 -08:00 |
|
Anton Dyudin
|
189c20d7db
|
Twitter subscribing, surface tested via web UI
|
2015-01-27 00:19:18 -08:00 |
|
Anton Dyudin
|
8a8ff60aaa
|
Tweet confirmations
|
2015-01-26 22:20:39 -08:00 |
|
Philip C Monk
|
2f9510f764
|
Merge remote-tracking branch 'origin/test'
Conflicts:
urb/urbit.pill
|
2015-01-27 00:28:33 -05:00 |
|
Anton Dyudin
|
230eca3cc2
|
Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
urb/zod/main/app/rodeo/core.hook
|
2015-01-26 20:41:06 -08:00 |
|
Philip C Monk
|
a73da6dbff
|
bump protocol to 1
|
2015-01-26 23:38:19 -05:00 |
|
Anton Dyudin
|
5de6646f9f
|
Cleaned ~& to ~|
|
2015-01-26 20:35:03 -08:00 |
|
Anton Dyudin
|
f00f2a744e
|
Posting tweets
|
2015-01-26 20:30:22 -08:00 |
|
C. Guy Yarvin
|
a441475a9a
|
Syntax change.
|
2015-01-26 20:12:06 -08:00 |
|
Anton Dyudin
|
83007d6c30
|
Added discrimination per commanding twitter user
|
2015-01-26 19:43:38 -08:00 |
|
Anton Dyudin
|
3431844d94
|
Factored out structures
|
2015-01-26 19:11:08 -08:00 |
|
C. Guy Yarvin
|
a1fd3597e6
|
Turn off gall queue management, temporarily.
|
2015-01-26 18:54:14 -08:00 |
|
C. Guy Yarvin
|
b4d51eebe4
|
Improved friend handling.
|
2015-01-26 17:55:01 -08:00 |
|
Anton Dyudin
|
04594ceda9
|
Chatook
|
2015-01-26 16:36:09 -08:00 |
|
C. Guy Yarvin
|
1ebd16fd2a
|
Various fixes and improvements.
|
2015-01-26 14:41:24 -08:00 |
|
C. Guy Yarvin
|
0e6434f3ee
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-01-26 14:31:06 -08:00 |
|
C. Guy Yarvin
|
353ff78e34
|
Various fixes.
|
2015-01-26 14:31:00 -08:00 |
|
Anton Dyudin
|
c1c4b3b75a
|
Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
urb/urbit.pill
|
2015-01-26 14:12:50 -08:00 |
|
Anton Dyudin
|
52c26318fe
|
^X fix, flit cleaning
|
2015-01-26 13:53:35 -08:00 |
|
C. Guy Yarvin
|
36bfe2ab63
|
Fix general unsubscribe.
|
2015-01-26 12:54:45 -08:00 |
|
Anton Dyudin
|
c9caa1538e
|
Merge branch 'exec' into test
Conflicts:
urb/zod/main/app/shell/core.hook
urb/zod/main/app/terminal/core.hook
|
2015-01-25 21:29:21 -08:00 |
|
Anton Dyudin
|
bfe432e189
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-01-25 20:49:39 -08:00 |
|
C. Guy Yarvin
|
1c2eba7d4d
|
Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
urb/urbit.pill
|
2015-01-25 17:39:37 -08:00 |
|
C. Guy Yarvin
|
920754ad61
|
Various fixes and improvements.
|
2015-01-25 17:38:03 -08:00 |
|
Anton Dyudin
|
ae6f7b430c
|
Added since-id
|
2015-01-24 18:06:10 -08:00 |
|
Anton Dyudin
|
b6336209a9
|
Cache statuses
|
2015-01-24 17:48:41 -08:00 |
|
Anton Dyudin
|
30d47b9a6b
|
Commented interfaces, printf removal
|
2015-01-24 15:06:52 -08:00 |
|
Anton Dyudin
|
759d1db9f1
|
Fixed key order, rate limit handling
|
2015-01-24 13:31:45 -08:00 |
|
Anton Dyudin
|
cffbe9b15b
|
Polling, sort of
|
2015-01-23 21:16:12 -08:00 |
|
Anton Dyudin
|
e3a3c85fcc
|
Misc apps
|
2015-01-23 13:14:20 -08:00 |
|