Commit Graph

1153 Commits

Author SHA1 Message Date
C. Guy Yarvin
2310047968 Merge branch 'master' of https://github.com/urbit/urbit
Conflicts:
	urb/urbit.pill
2015-04-08 11:36:01 -07:00
Philip C Monk
41cb6dcb76 Merge branch 'master' of https://github.com/urbit/urbit 2015-04-08 14:28:02 -04:00
Philip C Monk
56948115ef added :helm+init 2015-04-08 14:27:51 -04:00
C. Guy Yarvin
ee91ef6888 "Fix" init sync. 2015-04-07 19:19:31 -07:00
Galen Wolfe-Pauly
f0efeb068a login / out 2015-04-07 19:06:13 -07:00
Anton Dyudin
3c2762a9d1 :helm+sync syd her sud 2015-04-07 18:08:48 -07:00
Anton Dyudin
fcb46d2cef stopped urb.js %mean retry 2015-04-07 17:13:46 -07:00
C. Guy Yarvin
9b2ad6358b Entropy check and entropy hash. 2015-04-07 16:15:25 -07:00
Anton Dyudin
f2efac054b Merge branch 'dillbo' of https://github.com/urbit/urbit into dillbo 2015-04-07 16:07:35 -07:00
Anton Dyudin
33bd5366cc hook/door/dill-belt/mar 2015-04-07 16:07:10 -07:00
Philip C Monk
c7d8cfd114 mostly working userlevel conflict merge 2015-04-07 18:24:16 -04:00
C. Guy Yarvin
14aeab7aaa Revert some erroneous anton changes. 2015-04-07 15:16:37 -07:00
C. Guy Yarvin
b81d2891e2 Merge branch 'dillbo' of https://github.com/urbit/urbit into dillbo 2015-04-07 15:12:44 -07:00
C. Guy Yarvin
033537eb76 Various fixes and improvements. 2015-04-07 15:12:12 -07:00
C. Guy Yarvin
832da6c6c0 Rename gun to dog; some dojo syntax updates. 2015-04-07 14:15:06 -07:00
Galen Wolfe-Pauly
8dc635c4a6 preening 2015-04-07 14:02:40 -07:00
Galen Wolfe-Pauly
71a907835c mobile header 2015-04-07 13:47:46 -07:00
Galen Wolfe-Pauly
cbb47e0e41 Merge branch 'dillbo' of github.com:urbit/urbit-new into dillbo 2015-04-07 13:37:54 -07:00
Galen Wolfe-Pauly
63e6d87265 resubscribe when full 2015-04-07 13:37:39 -07:00
Anton Dyudin
f8e6df644d fixed 2015-04-07 13:36:33 -07:00
Anton Dyudin
970ac7bdb0 Pass through mean 2015-04-07 13:31:09 -07:00
C. Guy Yarvin
982467e95f Various fixes and improvements. 2015-04-07 12:05:21 -07:00
Anton Dyudin
c9a4a23969 Merge branch 'dillbo' into wires 2015-04-06 17:07:39 -07:00
C. Guy Yarvin
0fe7f18f34 Now workings. 2015-04-06 17:04:25 -07:00
Anton Dyudin
4be4aa208a unsubscribe wire 2015-04-06 16:43:46 -07:00
Anton Dyudin
8889e8bcd7 Merge branch 'dillbo' of https://github.com/urbit/urbit into dillbo 2015-04-06 16:36:49 -07:00
Anton Dyudin
e16d2105e0 wire-based source requests 2015-04-06 16:36:07 -07:00
Galen Wolfe-Pauly
3cb3c03326 Merge branch 'dillbo' of github.com:urbit/urbit-new into dillbo 2015-04-06 16:32:55 -07:00
Galen Wolfe-Pauly
083a035a70 cleaner audience 2015-04-06 16:32:35 -07:00
Philip C Monk
939c129539 bug fixes 2015-04-06 19:20:28 -04:00
C. Guy Yarvin
a481585191 Merge branch 'dillbo' of https://github.com/urbit/urbit into dillbo 2015-04-06 15:23:41 -07:00
C. Guy Yarvin
f7b6470249 Update for %sole. 2015-04-06 15:23:17 -07:00
Galen Wolfe-Pauly
ccdaa4fc8b updates to persistence, urb.js 2015-04-06 14:17:16 -07:00
C. Guy Yarvin
438816f893 Update talk-report for %cabal. 2015-04-06 12:57:23 -07:00
C. Guy Yarvin
30dc55c92a Various fixes and improvements. 2015-04-05 10:00:36 -07:00
C. Guy Yarvin
23d1175a2b Fix previous commit. Disable ++pray. 2015-04-04 03:54:25 -07:00
C. Guy Yarvin
2439350cc3 Various fixes and improvements. 2015-04-04 03:44:22 -07:00
Philip C Monk
76fd6824a6 :merge rework 2015-04-03 21:31:57 -04:00
C. Guy Yarvin
332fd26fd4 New krow system, will become work. 2015-04-03 11:25:21 -07:00
C. Guy Yarvin
f4c984bda0 Fix broken build. 2015-04-02 15:56:05 -07:00
C. Guy Yarvin
1ed2060aae Merge branch 'dillbo' of https://github.com/urbit/urbit into dillbo
Conflicts:
	urb/urbit.pill
2015-04-02 12:27:02 -07:00
C. Guy Yarvin
2b3a929ad2 Various fixes and improvements. 2015-04-02 11:50:31 -07:00
Philip C Monk
ff6a9c3198 ~doznec boots 2015-04-01 19:57:38 -04:00
C. Guy Yarvin
e52327a083 Various fixes and improvements. 2015-04-01 13:56:43 -07:00
C. Guy Yarvin
7a939c247a Remove all talk. 2015-03-31 17:20:07 -07:00
C. Guy Yarvin
17c7ff476e About to move talk to radio. 2015-03-31 17:17:30 -07:00
Philip C Monk
ca85c9728e make subs boot again 2015-03-31 15:52:47 -04:00
C. Guy Yarvin
20628f135e Various fixes and improvements. 2015-03-31 00:40:43 -07:00
Philip C Monk
21e3d981d4 historical .^ 2015-03-30 18:12:18 -04:00
C. Guy Yarvin
accaa6d957 Proper prompting, mostly. 2015-03-30 13:25:30 -07:00
C. Guy Yarvin
a179281a3c Merge. 2015-03-29 23:48:16 -07:00
C. Guy Yarvin
7900271094 New talk-in-radio, proper message printing. 2015-03-29 23:43:48 -07:00
C. Guy Yarvin
68b0dece78 Before a radio revision. 2015-03-29 22:13:33 -07:00
C. Guy Yarvin
b032d7e8cc More renaming. 2015-03-28 03:57:02 -07:00
C. Guy Yarvin
b0fd0b0684 Rename :drum back to :talk. :-) 2015-03-27 15:53:35 -07:00
C. Guy Yarvin
a17157761b Add entropy to configuration interface. 2015-03-27 13:36:24 -07:00
C. Guy Yarvin
1e5f6d868b Merge branch 'dillbo' of https://github.com/urbit/urbit into dillbo
Conflicts:
	urb/urbit.pill
2015-03-27 13:08:04 -07:00
C. Guy Yarvin
589b2d7101 Fix some error handling issues. 2015-03-27 12:43:27 -07:00
Anton Dyudin
95858b1568 Sane js redirection 2015-03-26 18:19:08 -07:00
Anton Dyudin
7ce6246d58 Merge branch 'dillbo' of https://github.com/urbit/urbit into dillbo 2015-03-26 18:01:55 -07:00
Anton Dyudin
dc175a3565 fixed tooks, unsubscription 2015-03-26 18:01:28 -07:00
Galen Wolfe-Pauly
df0c6ca2e5 Merge branch 'dillbo' of github.com:urbit/urbit-new into dillbo 2015-03-26 17:47:31 -07:00
Galen Wolfe-Pauly
575d835324 a working mobile 2015-03-26 17:44:39 -07:00
Anton Dyudin
42453bdf93 tooks 2015-03-26 16:29:17 -07:00
Philip C Monk
c246a061ad notification-only subscription path 2015-03-26 19:26:39 -04:00
Anton Dyudin
18b8b163a9 Session persistence 2015-03-26 15:32:32 -07:00
Galen Wolfe-Pauly
38af6ac3f6 bump react version 2015-03-26 15:31:07 -07:00
Galen Wolfe-Pauly
d85babc17f correct talk resource paths 2015-03-26 14:25:27 -07:00
Galen Wolfe-Pauly
70e73f4f03 here comes talk 2015-03-26 14:00:45 -07:00
Galen Wolfe-Pauly
15b67f181c talking it up 2015-03-26 13:55:26 -07:00
Anton Dyudin
fdad073040 urb.js safety 2015-03-26 13:37:25 -07:00
Anton Dyudin
259311f205 Merge branch 'eyre-new' into dillbo
Conflicts:
	urb/urbit.pill
2015-03-26 13:33:08 -07:00
C. Guy Yarvin
c35e6f4f30 Various fixes and improvements. 2015-03-26 12:29:04 -07:00
Anton Dyudin
9e73238769 non-json messages up 2015-03-26 12:13:32 -07:00
Galen Wolfe-Pauly
e6ed9e6ea7 mini mobi 2015-03-25 15:47:29 -07:00
Galen Wolfe-Pauly
985425932c var fix 2015-03-25 15:02:49 -07:00
Galen Wolfe-Pauly
1eccb2f34e Merge branch 'dillbo' into talk 2015-03-25 14:06:08 -07:00
Galen Wolfe-Pauly
6c97d8df87 talk details 2015-03-25 14:05:46 -07:00
C. Guy Yarvin
03af496c5d More deprintf-ing. 2015-03-25 12:04:25 -07:00
Galen Wolfe-Pauly
7eac5dab0a Merge branch 'dillbo' into talk 2015-03-25 11:59:44 -07:00
C. Guy Yarvin
5b74de17d4 With fewer printfs. 2015-03-25 11:33:49 -07:00
C. Guy Yarvin
427403a701 Great renamings. 2015-03-25 11:12:35 -07:00
C. Guy Yarvin
d20338305c Renaming, first step. 2015-03-25 11:03:40 -07:00
C. Guy Yarvin
3beb4660ee Add %love. 2015-03-24 20:04:23 -07:00
Galen Wolfe-Pauly
d8e5c1e0ae talk away 2015-03-24 19:09:27 -07:00
Galen Wolfe-Pauly
70151cde91 Merge branch 'dillbo' into talk 2015-03-24 17:37:17 -07:00
Galen Wolfe-Pauly
132872f5e1 audience 2015-03-24 17:36:45 -07:00
C. Guy Yarvin
67dc9c7c08 Missing guns. 2015-03-24 17:34:27 -07:00
Anton Dyudin
987b89cb33 brute disen/gen/ious refactor 2015-03-24 17:21:04 -07:00
Galen Wolfe-Pauly
f730f93d4a Merge branch 'dillbo' into talk 2015-03-24 17:16:00 -07:00
Galen Wolfe-Pauly
4eecaaccd7 top bar 2015-03-24 17:15:27 -07:00
Philip C Monk
5c489935cf another round of performance improvements 2015-03-24 19:35:04 -04:00
C. Guy Yarvin
315c321d65 Fix gall backpressure from seat. 2015-03-24 15:56:11 -07:00
Philip C Monk
9823077b86 waypoint 2015-03-24 17:46:32 -04:00
Anton Dyudin
cc45140ca6 Cached %bake
Conflicts:
	urb/zod/main/arvo/ford.hoon
	urb/zod/main/mar/react-snip/door.hook
	urb/zod/main/mar/react/door.hook
	v/raft.c
2015-03-24 16:30:30 -04:00
Galen Wolfe-Pauly
c74d00f2ec Merge branch 'dillbo' into talk 2015-03-24 12:22:23 -07:00
Galen Wolfe-Pauly
f7b24b74ee pruning 2015-03-24 12:21:50 -07:00
C. Guy Yarvin
14f7a42c1e Lose some printfs. 2015-03-23 20:50:01 -07:00
C. Guy Yarvin
ba090061ea Various fixes. 2015-03-23 13:56:00 -07:00
Philip C Monk
a8409da5cf autosync works 2015-03-23 16:40:33 -04:00