Commit Graph

575 Commits

Author SHA1 Message Date
Philip Monk
67c5caada8
clay: add safe merge options
As described in gen/hood/merge/help.txt
2020-08-28 16:36:00 -07:00
Caio Marcelo de Oliveira Filho
92cf9d7c33 Merge branch 'master' into code-reset 2020-08-17 14:55:07 -07:00
Liam Fitzgerald
cf84670fc8 file-server: do not cache index.html
Removes caching for index.html so JS versioning can occur by referencing
JS bundles with different filenames
2020-08-03 09:53:49 +10:00
Caio Marcelo de Oliveira Filho
df868e2c4f jael, eyre: Add a way to reset the web login code
Jael now stores a `step` that is combined with the original salt to
produce a new code.  A `%step` card is used to increment that value,
and effectively resetting the keys.  Because the first `step` is zero,
the first code is the same as before.

Eyre was changed to be notified with `%code-changed` so it can forget
old cookies, sessions and discard all the existing channels.

A new generator was added |code, that does both querying and
resetting the code

    |code             :: shows current code, step and help
    |code %reset      :: changes the code

The old +code generator still works correctly.
2020-07-31 11:35:48 -07:00
L
798f3b5de0
Merge pull request #3110 from urbit/la/graph-store
graph-store: a consistent, strongly validated, interoperable data storage format
2020-07-30 15:25:17 -07:00
Logan Allen
7fb50a3f97 graph-store: respond to phil's comments, request %next for clay, and compare +tear to hash 2020-07-30 14:43:40 -07:00
Logan Allen
7c3d608185 hood: update to %9 and start %graph-store 2020-07-28 12:24:55 -07:00
Logan Allen
043714752e hood: no longer start graph hooks for now 2020-07-28 12:21:30 -07:00
Logan Allen
325667f9ec Merge branch 'master' into la/graph-store 2020-07-27 12:10:22 -07:00
Philip Monk
39052bdec0
Merge pull request #3185 from urbit/philip/kiln
kiln: get germ for actual desk
2020-07-24 21:20:53 -07:00
Philip Monk
5490a3cb73
kiln: get germ for actual desk 2020-07-24 16:37:15 -07:00
Caio Marcelo de Oliveira Filho
47871d0f48 ota: show information instead of disable by default
Instead of `|ota` cancel the OTA, make it show the current setting.
Make the cancel need a more explicit argument.

   |ota                 shows the current setting
   |ota disable         disable OTA
   |ota ~sponsor %desk  reset to a different sponsor/desk

Because most of the time the expected desk is going to be %kids, use
that in the "help message".
2020-07-22 16:27:05 -07:00
Logan Allen
0a2e721d7f graph-store: move over to +sham from +mug 2020-07-22 13:32:47 -07:00
Liam Fitzgerald
24b25a3422 Merge remote-tracking branch 'origin/release/next-userspace' into lf/groups-refactor 2020-07-22 10:42:52 +00:00
Philip Monk
350756b47a
glob: autostart and make ota-able 2020-07-17 16:58:28 -07:00
Philip Monk
016719ca6b
glob: added app to distribute js outside clay 2020-07-15 12:26:55 -07:00
Liam Fitzgerald
51f6aabf7c push-hook: use store-name.config correctly 2020-07-14 09:51:39 +10:00
Liam Fitzgerald
64065d720c groups: refactor ota 2020-07-13 01:44:49 +00:00
Logan Allen
9da7ed9042 Merge branch 'lf/groups-refactor' into la/graph-store 2020-07-08 15:42:29 -04:00
Logan Allen
80d67c2f16 graph-view: delete for now 2020-07-08 15:39:20 -04:00
Logan Allen
d237fb9ad6 graph: get graph building and remove or-map library 2020-07-08 15:24:59 -04:00
Logan Allen
106119a9ba Merge branch 'la/ordered-map-subset' into la/graph-store 2020-07-08 15:17:55 -04:00
Logan Allen
64a30fea62 ordered-map: got %zuse to compile and all tests to pass 2020-07-08 15:07:14 -04:00
Liam Fitzgerald
c139332a55 various: cleanup unnecessary sigpams 2020-07-08 11:37:15 +10:00
Liam Fitzgerald
76bc3d82e1 Merge branch 'release/next-userspace' into lf/groups-refactor 2020-07-08 10:04:02 +10:00
Logan Allen
24e0d597ba or-map: added get arm and tested it 2020-07-07 19:19:47 -04:00
Logan Allen
d272da0f57 or-map: added get function based off of +find-ducts in behn 2020-07-07 19:19:47 -04:00
Logan Allen
7cdc12ff4c lib: or-map test library 2020-07-07 19:19:47 -04:00
Logan Allen
233b61199d graph: improved type naming 2020-07-07 17:53:18 -04:00
Logan Allen
39933ca848 graph: hooks compile and higher-order mark implementation first-pass 2020-07-06 19:31:57 -04:00
Logan Allen
a7cbecc0e2 Merge branch 'lf/groups-refactor' into la/graph-store 2020-07-06 15:02:20 -04:00
Philip Monk
37b9f854fd
eyre: give all args to generators
fixes #3082
2020-07-02 14:42:26 -07:00
Liam Fitzgerald
93cf40a604 Merge branch 'release/next-userspace' into lf/groups-refactor 2020-07-02 12:38:12 +10:00
Liam Fitzgerald
bd2fbc2f9c groups: address review comments 2020-07-02 12:20:23 +10:00
Liam Fitzgerald
26c610f8d2 interface: update store + api + subscriptions for new groups 2020-07-02 12:19:32 +10:00
Logan Allen
299b54baa1 graph-view: fix front-end 2020-07-01 12:40:33 -04:00
Philip Monk
ba9e894580
trouble: report source of OTA instead of parent 2020-06-30 16:10:12 -07:00
Logan Allen
ee5e80cf44 graph-store: enforce that only logged-updates may be sent via %run-updates, and enforce that they only affect the intended resource 2020-06-30 14:08:22 -04:00
Logan Allen
849556491c graph-store: updated action-log to update-log and added timestamp to +update 2020-06-29 21:14:55 -04:00
Philip Monk
40db8ea580
kiln: make otas continue even if they failed to apply 2020-06-29 13:25:10 -07:00
Philip Monk
42de999024
kiln: don't implicitly create syncs
Also silence some spurious errors.
2020-06-26 19:21:09 -07:00
Liam Fitzgerald
9b61c5571b Merge branch 'ford-fusion' into lf/groups-refactor 2020-06-27 10:42:16 +10:00
Logan Allen
e4110c4d77 graph-hooks: stubbed out resubscribe on kick case 2020-06-26 20:29:22 -04:00
Logan Allen
df982177e5 graph-hooks: added initial sketch 2020-06-26 17:13:12 -04:00
Logan Allen
e055ba98ae graph-store+view: added a variety of query types for subset fetching, individual post fetching, child fetching, etc 2020-06-26 14:38:11 -04:00
Liam Fitzgerald
846fe8c048 groups: convert JSON encodings to camelcase 2020-06-26 17:02:51 +10:00
Ted Blackman
26ff47b93d Merge remote-tracking branch 'origin/release/next-userspace' into ford-fusion 2020-06-25 22:24:30 -04:00
Philip Monk
51c6faaa31
ford,kiln: nicer errors 2020-06-24 21:24:58 -07:00
Logan Allen
f1b10f2a07 graph-store: sort graph with most recent at left of graph (gth) 2020-06-24 14:13:15 -04:00
Liam Fitzgerald
47352a06ba groups: finalize state adapters 2020-06-24 10:28:57 +10:00