Commit Graph

578 Commits

Author SHA1 Message Date
Anton Dyudin
c55e964f36 urbit/tree@857659d Navigate up two steps from fora 2016-07-29 12:31:07 -07:00
Fang
6d5288b79d Moved ++shortship to zuse, renamed to ++cite. 2016-07-29 14:53:42 +02:00
Fang
937438798d Dojo now uses the short ship name (ie ~todsel_lithex or ~torbyt^sogwyx) in the prompt. Dojo and talk now use dedicated function in lib/sole.hoon for ship name shortening. 2016-07-28 14:36:01 +02:00
Raymond Pasco
0685b38b43 Merge remote-tracking branch 'ohaitch/fora' into forum-deployment 2016-07-27 11:31:11 -07:00
Anton Dyudin
76495287da add {talk,write}-fora-post based off -comment
urbit/tree@ed3dcf0
2016-07-25 15:23:04 -07:00
Anton Dyudin
d515345a47 moved womb ++old-phon to lib/, pulling out parser 2016-07-25 11:57:03 -07:00
Joseph Bryan
a8f27de145 removes unused kiln molds 2016-07-19 23:12:50 -04:00
Joseph Bryan
07358c86c2 refactors kiln/|cp/|mv to use (unit toro) instead of a bogus one 2016-07-19 18:21:21 -04:00
Joseph Bryan
c800b7f489 moves |cp and |mv implementations back into the generators 2016-07-16 00:19:49 -04:00
Joseph Bryan
97a8aac322 adds error message for file-not-found on |cp, |mv, and |rm
also adds an error message for mark changes
2016-07-15 22:31:01 -04:00
Raymond Pasco
3a4441ce57 Merge remote-tracking branches 'joemfb/metadojo', 'ray/rep-rekey' and 'ohaitch/talk-resplit'
Add standard meta-key shell emacs key support to drum
Rekey ~rep due to compromised passphrase
Recompute talk message linebreaks on interior edits
2016-07-13 09:57:06 -07:00
Joseph Bryan
fe1ce4a3d2 implements a kill -ring, with support for meta-y and cumulative kills
includes state updates and adapters
2016-07-13 01:57:55 -04:00
Joseph Bryan
d37d836852 adds support for ctrl-w to drum 2016-07-13 01:57:55 -04:00
Joseph Bryan
a7907c3308 refactors meta utility gates 2016-07-13 01:57:55 -04:00
Joseph Bryan
2d6262fc53 removes trailing whitespace 2016-07-13 01:57:55 -04:00
Joseph Bryan
3114ba320f adds support for meta-r to drum 2016-07-13 01:57:55 -04:00
Joseph Bryan
a18701c282 simplifies case conversion, refactors meta shortcuts
... renaming ++alnm and tweaking style
2016-07-13 01:57:55 -04:00
Joseph Bryan
a3c13e28a4 adds support for meta-t to drum 2016-07-13 01:57:55 -04:00
Joseph Bryan
76261feed4 adds support for meta-c,u,l to drum 2016-07-13 01:57:55 -04:00
Joseph Bryan
3f35325068 fixes word-boundary bug, refactors meta shortcuts 2016-07-13 01:57:54 -04:00
Joseph Bryan
82c8358380 adds support for meta-. and meta-backspace to drum 2016-07-13 01:57:49 -04:00
Joseph Bryan
e6e9195d9c adds |syncs hood generator to print all active syncs 2016-07-08 14:15:19 -04:00
Anton Dyudin
010cc4c0f6 don't append invite code 2016-07-06 16:06:29 -07:00
Anton Dyudin
eb0bdd7a2c change title to "Your Urbit Invitation" 2016-07-06 15:43:08 -07:00
Anton Dyudin
6b0cb1de23 store womb balances hashed 2016-07-06 14:49:46 -07:00
Joseph Bryan
3f5a446678 adds support for meta-b,d,f to drum 2016-07-06 09:19:57 -04:00
Galen Wolfe-Pauly
41c50c2e6f styling 2016-07-05 23:57:25 -07:00
Anton Dyudin
4a313ad578 bump /+womb passcodes to 128 bits, @uvG -> @uvH
urbit/womb@d4ada85
2016-07-05 15:06:11 -07:00
Anton Dyudin
a6d6a88857 bad-invite error message 2016-07-05 13:18:08 -07:00
Anton Dyudin
8c963c06f1 switch over passcode to be @uv and not @p
urbit/womb@086a41
2016-07-05 13:17:03 -07:00
Anton Dyudin
6c983460ed get id directly from invite poke 2016-07-05 11:38:44 -07:00
Joseph Bryan
df8095e1a7 deduplicates dojo history (skips repeat entries and empty lines)
... while still resetting the position in history
2016-07-05 13:54:20 -04:00
Anton Dyudin
2f144b56ab change poke-email to use {title/tape body/wall}
And add a "Message from Urbit" title to womb messages
2016-07-01 15:48:10 -07:00
Anton Dyudin
1a9164ddb8 disable claiming ships and recycling tickets 2016-07-01 14:01:11 -07:00
Anton Dyudin
4f26894cfe encrypted jammed womb back-up 2016-07-01 10:44:35 -07:00
Philip C Monk
7caa16e318 Merge remote-tracking branch 'origin/master' into HEAD
Conflicts:
	web/tree/main.js
2016-06-30 14:39:47 -04:00
Joseph Bryan
a70c716b13 fixes "succesful" typo 2016-06-13 11:38:46 -04:00
Raymond Pasco
84734bf61d Merge remote-tracking branch 'galenwp/clock'
Conflicts:
	web/talk/main.js
	web/tree/main.js
	web/tree/~.main_urb.js

Comments, talk feed, &c
2016-06-06 14:21:21 -04:00
Raymond Pasco
70836c353b Merge remote-tracking branches 'philipcmonk/porcelain' and 'ohaitch/clay-tluc'
Better gh app, various (known broken code)
improve performance for writing files, rebuilding tree
2016-06-06 13:29:55 -04:00
Anton Dyudin
2c2c4137a2 Use simple @t .plan location field
Note: technically type-incompatible, might require people to recreate .plan files if they had already set a location
2016-06-02 16:04:01 -07:00
Anton Dyudin
a60f32a8cf add spur to &talk-comment to bypass |serve base
urbit/tree@51d9fe7
2016-05-23 17:45:57 -07:00
Anton Dyudin
71f29242e0 fix #125 2016-05-06 16:21:29 -07:00
Anton Dyudin
12dbb4bc15 added transaction id to %womb-invite 2016-05-06 15:11:58 -07:00
Anton Dyudin
3d38f08964 privelege "back up womb" operation 2016-05-06 14:26:13 -07:00
Anton Dyudin
b714f993b0 tweak womb-ticket-info output, separate "recycle"
step from "exchange ticket for new-style balance, use this balance to claim ships"
2016-05-04 14:40:20 -07:00
Philip C Monk
daf800165b textual representations of github issues 2016-05-04 15:59:10 -04:00
Anton Dyudin
6f91c91236 store old private keys for checking tickets 2016-05-04 11:48:43 -07:00
Anton Dyudin
c616cd68ed actually give out @pG
urbit/womb@e63c27a
2016-05-04 11:46:07 -07:00
Anton Dyudin
198e2b823e ticket reclaim skeleton 2016-05-04 10:58:35 -07:00
Philip C Monk
d33f8cf52a improvements for fuse 2016-05-03 19:26:52 -04:00
Anton Dyudin
deb687dcb4 fix replay flag 2016-05-02 13:03:33 -07:00
Anton Dyudin
651fb265e4 more refined drum send-to-sys-console 2016-05-02 11:56:00 -07:00
Anton Dyudin
fe0b9ff5c4 &womb-replay-log mark for lens usage 2016-04-29 17:19:39 -07:00
Anton Dyudin
b79e1fec4e send tickets back to the managing ship
instead of sending email directly from the ticketer
2016-04-29 17:07:47 -07:00
Anton Dyudin
fa28a0fbfb save (most) womb pokes via .urb/put 2016-04-29 16:18:59 -07:00
Anton Dyudin
dd0abaeb45 add |exit using ++se-blit-all, sending a blit to all console sessions
CC @cgyarvin there's gotta be a better way to do this
2016-04-29 14:41:55 -07:00
Anton Dyudin
9f155f7e8f added /womb/balance overview scry 2016-04-29 14:22:25 -07:00
Anton Dyudin
939ae10ea8 moved email sanitization to womb
That information might be useful non-publically though?
2016-04-27 15:52:18 -07:00
Anton Dyudin
f63336c22a only issue from ships we're in contact with 2016-04-27 15:44:10 -07:00
Anton Dyudin
f6cd262bc2 line comments 2016-04-27 15:38:01 -07:00
Anton Dyudin
ba9f00d5ba add ames cold/seen/live information to stat
urbit/womb@045565e
2016-04-27 15:37:10 -07:00
Anton Dyudin
d04f892d3e |release instructions 2016-04-27 15:19:07 -07:00
Anton Dyudin
91d6eccbaf /womb/balance scry endpoint, mark, frontend
urbit/womb@fd3a34d
2016-04-26 18:49:21 -07:00
Anton Dyudin
40686aec13 minor bugfixing 2016-04-26 18:15:51 -07:00
Anton Dyudin
1f7e55fb71 stat-all mark, src checking, frontend
urbit/womb@ad2ce14
2016-04-26 16:42:49 -07:00
Anton Dyudin
2384230781 added womb peer-scry 2016-04-26 16:42:49 -07:00
Anton Dyudin
573d3c3b37 Merge branch 'wombjael' into web-womb
Womb backend
2016-04-26 16:42:45 -07:00
Philip C Monk
f75d1e7ad6 Merge remote-tracking branch 'origin/master' into HEAD
Conflicts:
	arvo/eyre.hoon
	lib/twitter.hoon
2016-04-20 20:06:52 -04:00
Philip C Monk
c3b9cd93a7 various 2016-04-20 12:47:30 -04:00
Anton Dyudin
dbeed2d723 hood save/load mechanism 2016-04-18 15:15:35 -07:00
Anton Dyudin
79558a8466 fix ++neis off-by-one, generators, actually use app/gmail 2016-04-14 18:39:05 -07:00
Anton Dyudin
0c4846c7c5 abstract and fix email sending 2016-04-14 18:37:41 -07:00
Anton Dyudin
8d6666f9b1 issue real (old) tickets 2016-04-14 17:10:57 -07:00
Anton Dyudin
d0418c1f20 poke-manage save ship in office 2016-04-14 16:52:37 -07:00
Anton Dyudin
46e9ebc827 dumber reference logic 2016-04-14 16:38:25 -07:00
Anton Dyudin
5f46a600ae reference logic 2016-04-14 16:37:13 -07:00
Anton Dyudin
7a7da97aa6 misc types, pokes 2016-04-14 15:45:02 -07:00
Anton Dyudin
f08de427c8 invite flow 2016-04-14 14:46:53 -07:00
Raymond Pasco
dc58574c0f Fix type failures in lib/twitter.hoon
The type failures were introduced by the parent merge.
2016-04-14 17:46:37 -04:00
Raymond Pasco
d3711b53d9 Merge branch 'web-stream'
Conflicts:
	gen/twit/twitter-feed.hoon
	lib/oauth1.hoon
	lib/twitter.hoon
	mar/twit/post.hoon

Extensive nonbreaching web API changes from Anton and Philip's trees.

Retroactive commit message for d030cde553:
Grab fixes for busted ford caused by no-longer-busted ++lore
2016-04-14 14:10:56 -04:00
Philip C Monk
4d65df4eb6 Merge branch 'sec-names' into porcelain 2016-04-14 13:57:33 -04:00
Philip C Monk
a39a93834c Merge remote-tracking branch 'anton/web-stream' into porcelain 2016-04-14 13:57:20 -04:00
Anton Dyudin
3cb123470d Merge branch 'procedural-security-drivers' into web-stream
Conflicts:
 	gen/twit/twitter-feed.hoon
 	lib/oauth1.hoon
 	lib/twitter.hoon
 	mar/twit/post.hoon
2016-04-13 18:13:57 -07:00
Anton Dyudin
b8c55fdac0 Merge remote-tracking branch 'ault/asana' into web-stream
APIs, for simpler conflict resolution
2016-04-13 17:53:08 -07:00
Anton Dyudin
bb8f53fcea move +-get to ++fo 2016-04-13 16:16:23 -07:00
Anton Dyudin
a7f49e6d81 ship stats 2016-04-13 16:15:01 -07:00
Anton Dyudin
8db0ee93fc comments 2016-04-13 14:06:58 -07:00
Anton Dyudin
746831de1d cursors for office read/write 2016-04-13 13:32:45 -07:00
Anton Dyudin
5fd2317b88 add womb to hood, set up peek 2016-04-12 17:10:53 -07:00
Anton Dyudin
ce0a1af602 issuing ship wear leveling 2016-04-12 16:02:43 -07:00
Anton Dyudin
1d16b291f7 comment fixups 2016-04-12 16:02:43 -07:00
Anton Dyudin
7db423ce4e scoped foils 2016-04-12 16:02:43 -07:00
Anton Dyudin
321545b3cd galaxy and star releasing 2016-04-12 16:02:30 -07:00
Anton Dyudin
8aeed316b3 generalize cursor dynamics 2016-04-12 14:07:50 -07:00
Anton Dyudin
fdae0b85e0 convert ++office to per-class shape 2016-04-12 14:07:02 -07:00
Anton Dyudin
1a38b92165 womb compiles 2016-04-12 12:02:59 -07:00
Raymond Pasco
3eb7493671 Merge remote-tracking branches 'ault011/instagram', 'ohaitch/markdown-hax-url', 'ault011/digitalocean' and 'ohaitch/procedural-security-drivers'
Conflicts:
	sec/com/dropboxapi.hoon

Many security drivers in this merge. A small markdown fix also snuck
into one of the octopus' arms as parent 3.
2016-04-12 13:03:25 -04:00
C. Guy Yarvin
902fbdf95d Steps toward one-step bootstrap. 2016-04-10 19:23:29 -07:00
Philip C Monk
e83c60958c clean porcelain 2016-04-08 19:47:34 -04:00
Philip C Monk
180d76d913 connector library 2016-04-08 15:47:11 -04:00
Anton Dyudin
ff40159b38 commented oauth2 ++standard arms 2016-04-08 12:44:34 -07:00
C. Guy Yarvin
c04a34de62 Jael and womb. 2016-04-08 10:08:05 -07:00
Anton Dyudin
072619d446 macro-expanded lib/oauth2 examples 2016-04-07 20:00:58 -07:00
Anton Dyudin
a2f2a94c1b better name order
token-exchange -> exchange-token, token-request -> request-token
2016-04-07 19:50:48 -07:00
Anton Dyudin
3feb7f453e more consistent grab-*-token ordering 2016-04-07 18:30:52 -07:00
Anton Dyudin
6c39ca4739 converted @googleapis.com to ++standard-refreshing 2016-04-07 18:29:49 -07:00
Anton Dyudin
d90b71dde9 better type-checking 2016-04-07 17:46:34 -07:00
Anton Dyudin
97c200bf43 convert /+oauth2, @slack.com to ++standard form 2016-04-07 15:49:22 -07:00
Anton Dyudin
c433874ebb fix oauth1 oauth_callback, organization 2016-04-07 14:08:25 -07:00
Anton Dyudin
873840b0e8 factor out /+interpolate,hep-to-cab 2016-04-07 13:07:21 -07:00
Anton Dyudin
5b2a8ce009 inlined dbg-post 2016-04-07 12:51:11 -07:00
Anton Dyudin
c75d71cd18 add oauth1 driver examples 2016-04-07 12:34:32 -07:00
Anton Dyudin
f26446e150 resturcture /+oauth1,basic-auth so the ++standard magic is in one place
with sample usage in the comments
2016-04-07 10:37:28 -07:00
Anton Dyudin
a24c4da4b3 minimal basic-auth refactor 2016-04-06 13:43:32 -07:00
Anton Dyudin
0b683764a8 add # to unescaped characters in md hrefs 2016-04-06 11:52:06 -07:00
Anton Dyudin
18d11d25ea change %api speech to use ++purf 2016-03-31 17:53:57 -07:00
Anton Dyudin
8844933178 render talk feed as %api speeches 2016-03-31 16:15:10 -07:00
Anton Dyudin
934b06969d handle non-existent web.plan again 2016-03-30 17:27:18 -07:00
Anton Dyudin
933eb74336 write plan data from the web
urbit/tree@65b6df2
2016-03-30 15:43:27 -07:00
Anton Dyudin
a3781a4777 Merge branch 'twit-app' into dot-plan
Pull in working :twit and various fixes it depends on, to add write-plan-account logic to it
2016-03-29 17:32:42 -07:00
Anton Dyudin
dd4010eacc save github username to web.plan 2016-03-29 14:17:45 -07:00
Anton Dyudin
b886daf7c0 rename plan-data to plan-acct, add info to diffs 2016-03-28 16:24:25 -07:00
Anton Dyudin
6bd1850bc3 create web.plan if nonexistent 2016-03-24 17:15:12 -07:00
Anton Dyudin
80909f7978 write web.plan on gh startup 2016-03-24 16:31:37 -07:00
Anton Dyudin
c0f003d621 parse & in tweets 2016-03-24 11:13:38 -07:00
Anton Dyudin
067540d9ac move sur/twitter to "t-style" naming scheme 2016-03-23 16:19:56 -07:00
Anton Dyudin
1ced5c9c47 transition app/twit to serve /home instead of /user 2016-03-22 11:49:04 -07:00
Anton Dyudin
d248f431b9 rename twit-stat to twit-post 2016-03-21 13:36:42 -07:00
Anton Dyudin
e9d199cca3 route drum crashes through ~& for now, closing #584 2016-03-18 15:35:58 -07:00
Anton Dyudin
3500fc3ee8 add sanity checking wrt twitter usernames 2016-03-15 16:25:39 -07:00
Anton Dyudin
8441d6668f clearer %no-token error message 2016-03-15 15:29:12 -07:00
Anton Dyudin
ce7e970c68 151ification part 2: app/twit types 2016-03-14 18:03:43 -07:00
Anton Dyudin
0f22f85170 151ification part 1: app/twit syntax 2016-03-14 18:03:33 -07:00
Anton Dyudin
de6e230dd3 expose twitter req argument encoders as ++print 2016-03-11 17:48:58 -08:00
Anton Dyudin
2f494e6e2f type mar/twit-req, mar/twit-usel 2016-03-11 16:06:47 -08:00
Anton Dyudin
a241c526d7 add lib/httr-to-json
which is really the mark translation search's job. Created #67
2016-03-11 15:52:14 -08:00
Anton Dyudin
68f1903f6a move valid-request type to sur/twitter
As an actual ++endpoint type, instead of a list of arm names accepting arguments
Old: (stat-upda:request:twitter [%status 'foo']~ ~)
New: (request:twitter stat-upda+[%status 'foo']~ ~)
2016-03-11 14:54:29 -08:00
Anton Dyudin
dd5f670286 encrypt api keys written to clay
creates #66
2016-03-11 12:02:08 -08:00
Anton Dyudin
244639d9a6 include domain in "Run |init-" auth warnings 2016-03-11 11:49:36 -08:00
Anton Dyudin
2bedfb04e1 added |init-auth-basic, moved subdomain snip to /+write 2016-03-11 11:17:35 -08:00
Anton Dyudin
49d11b5270 remove auth from twitter library 2016-03-11 11:16:50 -08:00
Anton Dyudin
6c45cb1264 FIX byte-order bug
see previous commit, native ++hmac byte order was correct for short keys already
2016-03-11 11:16:09 -08:00
Anton Dyudin
bbe47f441c factor out token-response keyspec 2016-03-10 20:38:45 -08:00
Anton Dyudin
06e461b542 fix type issues 2016-03-10 20:38:45 -08:00
Anton Dyudin
9f289fd15f better grab-quay error reporting 2016-03-10 20:38:45 -08:00
Anton Dyudin
a8a092074a restructure lib/oauth1 to expose ++add-auth internals 2016-03-10 18:52:30 -08:00
Anton Dyudin
3aa1ceb8b4 better handling of query strings 2016-03-10 13:36:51 -08:00
Anton Dyudin
747f9d57a2 better names for things 2016-03-10 12:04:56 -08:00
Anton Dyudin
cf33f64f81 better token type 2016-03-10 11:47:21 -08:00
Anton Dyudin
302c004032 nicer grab-quay type 2016-03-10 11:45:46 -08:00
Anton Dyudin
f9b1581a28 moved core type, token to lib/oauth1 sample 2016-03-09 20:03:22 -08:00
Anton Dyudin
80eb1f5f06 refactor lib/oauth2 to be security-driver-library shaped,
implement 3-legged login flow(untested)
2016-03-09 18:37:34 -08:00
Anton Dyudin
738bd1946c Merge branch 'eyre-sec-fixes' into sec-com-twitter
2-layer domain change required to write a proper driver
2016-03-09 14:50:10 -08:00
Anton Dyudin
e6978f9305 refactor lib/oauth1 to filter a hiss 2016-03-09 14:35:37 -08:00
Anton Dyudin
8ad7321986 clearer naming 2016-03-08 20:32:45 -08:00
Anton Dyudin
c930eef283 clean up paramter handling 2016-03-08 20:25:44 -08:00
Anton Dyudin
d3e3190c51 clean up lib/oauth1 types 2016-03-08 19:49:58 -08:00
Anton Dyudin
50b8fb028b minor oauth1 tweaking 2016-03-08 18:50:14 -08:00
Anton Dyudin
2deeb00431 add path-interpolation functions 2016-03-08 18:44:43 -08:00
Anton Dyudin
228a3df700 lib/twitter compiles 2016-03-07 17:38:01 -08:00
Anton Dyudin
3a3bac2f1f 151ify syntax, clean up 2016-03-07 13:42:23 -08:00
Anton Dyudin
27aa5392e6 minor refactoring 2016-03-07 11:05:37 -08:00
Anton Dyudin
5f44ec53b3 partial(twitter) revert of bfd52f9e 'sweeping' 2016-03-07 10:42:05 -08:00
Anton Dyudin
f89646f139 better no-keys warning 2016-03-04 14:33:28 -08:00
Anton Dyudin
f9d9191cf1 simplify googleapis.com scope logic
allowing /+oauth2++endpoint to be removed
2016-03-04 13:11:45 -08:00
Anton Dyudin
fa78c332a6 better handling of 404 2016-03-04 13:09:13 -08:00
Anton Dyudin
cf96ef3ea6 Added raw-url support to lib/oauth2
Closes urbit/urbit#716, closes urbit/urbit#715
2016-03-04 13:09:07 -08:00
Anton Dyudin
886890d1f8 header information 2016-03-04 12:38:05 -08:00
Galen Wolfe-Pauly
0f4507a31b structure for comments written to %c 2016-03-03 16:36:39 -08:00
Raymond Pasco
a0358c17d9 Merge branches 'breach-20160302' and 'cgyarvin-teaching', remote-tracking branches 'ohaitch/talk-read-component', 'ohaitch/virtualize-pact-hoon' and 'ohaitch/eyre-sec'
Conflicts:
	arvo/eyre.hoon

Breaching changes for 2016-03-02
Language/dojo improvements for teaching.
add web/listen.hoon module for listening to comment changes
virtualize ++pact %hoon side-path
Eyre security drivers
2016-03-02 21:21:23 -05:00
Anton Dyudin
e0d0fb6504 better bad-key error 2016-03-02 16:47:49 -08:00
Raymond Pasco
e1480cb570 Merge remote-tracking branches 'philipcmonk/ford-fix', 'ray/lune-nule' and 'ohaitch/talk-comments'
Conflicts:
	mar/tree/comments.hoon

Fix off-by-one in marks that was removing the last byte of clay files
Add ++lune/++nule Unix textfile arms
Route .tree 'comments' input through talk
2016-02-29 17:11:50 -05:00
Anton Dyudin
1cf56bd06b added comment hash identifier 2016-02-25 18:41:29 -08:00
Philip C Monk
17d6fccced reset on initial pull 2016-02-25 18:19:44 -05:00
Anton Dyudin
d331391486 proxy tree comments through talk
urbit/tree@bdebe54
2016-02-25 12:38:00 -08:00
Henry Ault
8420037d74 better handling of refresh tokens, port numbers 2016-02-24 01:11:24 -08:00
Henry Ault
c71aa2d7c4 add +gmail-list, :gmail|send 2016-02-23 20:09:37 -08:00
Henry Ault
4c7fbe2a90 151ify driver 2016-02-23 19:50:30 -08:00
Henry Ault
c16488d6af 151 up and running baby 2016-02-22 17:50:21 -08:00
Philip C Monk
ec37ec2dd5 151ized gmail 2016-02-19 15:33:56 -05:00
Philip C Monk
d285cc5055 151ization complete
Conflicts:
	Makefile
2016-02-18 19:12:31 -05:00
Philip C Monk
7268164eba Merge remote-tracking branch 'arvo/master' into HEAD
Conflicts:
	app/hood.hoon
	arvo/ford.hoon
	gen/cat.hoon
	gen/ls.hoon
	gen/ls/subdir.hoon
2016-02-18 18:52:34 -05:00
Philip C Monk
67cc10f55a Merge tag 'hoon-151' of https://github.com/juped/urbit into transfer
Hoon 151 merge

%gh crashes on startup

Conflicts:
    urb/urbit.pill
    urb/zod/app/dojo.hoon
    urb/zod/app/hood.hoon
    urb/zod/arvo/eyre.hoon
    urb/zod/arvo/ford.hoon
    urb/zod/arvo/gall.hoon
    urb/zod/arvo/hoon.hoon
    urb/zod/arvo/zuse.hoon
    urb/zod/gen/cat.hoon
    urb/zod/gen/ls.hoon
    urb/zod/gen/ls/subdir.hoon
2016-02-18 18:31:26 -05:00
Raymond Pasco
f3651e40b5 Merge 2016-02-15 breach into scrambler 2016-02-18 04:46:06 -05:00
Raymond Pasco
259eb79cb8 Merge remote-tracking branches 'curtis/swaggle', 'anton/fix-init-no-data' and 'anton/fix-generators'
Conflicts:
	gen/hood/begin.hoon
	gen/moon.hoon

Fix ++swag electroplating-induced bug
Fix boot process for galaxies
Finish 151izing the source tree
2016-02-17 19:35:36 -05:00
Anton Dyudin
bf2164054d factor out map-to-json 2016-02-17 15:50:03 -08:00
Anton Dyudin
73bcc66007 remaining libraries 2016-02-17 15:36:43 -08:00
Raymond Pasco
84ae855cce Merge remote-tracking branch 'ohaitch/tree-apps'
The proverbial various fixes and improvements
2016-02-16 15:49:15 -05:00
Anton Dyudin
9b2ae7f460 fix lib/write 2016-02-11 16:33:22 -08:00
Anton Dyudin
8a6bb31ed0 151ify tree hooks 2016-02-11 16:33:22 -08:00
Anton Dyudin
fb3c53553f add missing /?s 2016-02-11 16:33:21 -08:00
Anton Dyudin
81297bc162 Merge branch 'hoon-151' into tree-comments
Merge hoon 151
2016-02-10 19:43:53 -08:00
Anton Dyudin
07bbbee2cc fix mis-translated / to + 2016-02-10 18:58:14 -08:00
Henry Ault
6268b5f6aa finally working google auth flow; do not delete! 2016-02-10 17:27:14 -08:00
Henry Ault
0e3a28ea5c Merge branch 'eyre-sec' of https://github.com/ohaitch/urbit into eyre-sec
wanted |init-oauth2
2016-02-10 15:21:10 -08:00
Raymond Pasco
73029e9aef Merge remote-tracking branch 'ohaitch/ford-wipe'
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/ford.hoon
	urb/zod/arvo/gall.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/gen/hood/overload.hoon
	urb/zod/lib/kiln.hoon

NB: Was briefly hotfixed to master, if you care about trivia
2016-02-10 18:12:24 -05:00
Anton Dyudin
e047aa6690 add %f %wipe cache-clear command, for |overload 2016-02-10 14:36:17 -08:00
Raymond Pasco
5daa7d2592 Merge tag 'hoon-151' into scrambler
Hoon 151 merge

Conflicts:
	urb/urbit.pill
	urb/zod/arvo/dill.hoon
	urb/zod/arvo/hoon.hoon

Slightly evil: had to remove a ~doznec from lib/helm.hoon
2016-02-10 15:10:18 -05:00
Raymond Pasco
309805f5e7 Merge in Hoon 151
Complicated merge of Hoon 151. This commit is a major sequence point.
2016-02-10 14:03:28 -05:00
Anton Dyudin
fbc5c6c21a html-entities newline 2016-02-09 21:15:53 -08:00
Anton Dyudin
bd143385c5 Merge branch 'data-dep' into tree-comments
handle chrome/data separation in an official manner
2016-02-09 21:15:52 -08:00
Anton Dyudin
71adc8fb50 first try at head-body separation 2016-02-09 21:15:38 -08:00
Anton Dyudin
5677254816 move /~date.comments-md to /comments/~date.md
when outputing tree comments
2016-02-09 11:55:43 -08:00
Raymond Pasco
d5e097e82a Merge remote-tracking branch 'galenwp/factor'
Conflicts:
	urb/urbit.pill
	urb/zod/ape/bit.hoon
	urb/zod/arvo/eyre.hoon
	urb/zod/mar/hook.hoon
	urb/zod/pub/bit/fab/hymn.hook
	urb/zod/pub/docs/dev/hoon/principles/1-twigs.md
	urb/zod/pub/docs/dev/hoon/principles/2-syntax.md
	urb/zod/pub/docs/dev/hoon/reference/odors.md
	urb/zod/pub/docs/dev/hoon/reference/pronunciation.md
	urb/zod/pub/docs/dev/hoon/runes/sg/sgcn.md
	urb/zod/pub/docs/dev/hoon/runes/sm.md
	urb/zod/pub/docs/dev/hoon/runes/sm/smsg.md
	urb/zod/pub/docs/dev/hoon/runes/sm/smzz.md
	urb/zod/pub/docs/dev/hoon/runes/ts/tssg.md
	urb/zod/pub/docs/dev/hoon/runes/wt/wthz.md
	urb/zod/pub/docs/dev/hoon/runes/wt/wtls.md
	urb/zod/pub/docs/dev/hoon/runes/zp/zpzp.md
	urb/zod/pub/docs/theory/whitepaper.md
	urb/zod/pub/docs/user/appliance.md
	urb/zod/pub/docs/user/intro.md
	urb/zod/pub/docs/user/talk.md

Merged Galen and Anton's web refactoring work
2016-02-08 16:14:03 -08:00
Anton Dyudin
c05e96c62f fix hoon location header information 2016-02-04 19:05:37 -08:00
Anton Dyudin
e1c1da92c2 standardize location-header structure 2016-02-04 18:57:44 -08:00
Galen Wolfe-Pauly
2a95c443ed Merge branch 'factor' of github.com:ohAitch/urbit into factor
Conflicts:
	urb/zod/web/tree/main.js

(had a newer main.js)

talk@26b0befe86
tree@621235bf52
2016-02-04 16:16:18 -08:00
Anton Dyudin
1a61fe4378 added |init-oauth2 secrets dialog 2016-02-04 15:03:51 -08:00
Philip C Monk
abf111fb91 Merge remote-tracking branch 'anton/eyre-sec' into eyre-sec 2016-02-04 15:11:05 -05:00
Galen Wolfe-Pauly
087911e581 sweeping with anton 2016-02-04 11:52:00 -08:00
C. Guy Yarvin
24b1e1c5d2 Convert $+ to $-. 2016-02-03 23:12:23 -08:00
Anton Dyudin
e77bda234e add comments to tree
https://github.com/urbit/tree/tree/0a9c5a0
2016-02-03 17:53:38 -08:00
Galen Wolfe-Pauly
bfd52f9e32 sweeping 2016-02-03 16:12:46 -08:00
Anton Dyudin
f1b3451c1d minor cleaning 2016-02-02 13:24:20 -08:00
Anton Dyudin
53006273ee Don't inject ;meta(urb_front) if frontmatter is empty/nonexistent 2016-02-01 11:53:25 -08:00
C. Guy Yarvin
049f1defb2 151 merge is double solid. 2016-01-31 22:16:26 -08:00
C. Guy Yarvin
25d791e2a4 Merge remote-tracking branch 'upstream/master' into newdeal 2016-01-31 20:37:49 -08:00
C. Guy Yarvin
761f588cc6 Fix various marks, etc. 2016-01-30 19:37:03 -08:00
C. Guy Yarvin
4c7a8e6f32 Removed %work. 2016-01-30 15:52:55 -08:00
C. Guy Yarvin
6c71b1cdf3 Fix oct*. Check in %work to delete it. 2016-01-30 15:44:22 -08:00
C. Guy Yarvin
8edc8d4361 Sigh. 2016-01-30 14:32:49 -08:00
C. Guy Yarvin
b4469d0aa3 Fix some shit code in lib/tree.hoon. 2016-01-29 20:40:01 -08:00
C. Guy Yarvin
e987337bfb In the middle of internal merge. 2016-01-29 18:25:52 -08:00
Anton Dyudin
d1e6db156d Merge branch 'eyre-root-beam' into ford-ren - requested for glen/factor merge 2016-01-29 14:41:19 -08:00
Anton Dyudin
f18227a697 moved auth url structure to ~/ac/domain/~.usr/in
from ~/ac/domain/~.usr, which recognized the usr as an extension.
2016-01-28 14:33:03 -08:00
Philip C Monk
66c5a99b6e cleanup 2016-01-27 16:50:06 -05:00
Anton Dyudin
9125a0003e move refresh token logic to lib/oauth2 2016-01-26 17:44:14 -08:00
Anton Dyudin
88401dacf2 factored out basic-auth library 2016-01-26 13:40:10 -08:00
Anton Dyudin
3ae2b73a98 restructure lib/oauth2 for more convenient token extension 2016-01-26 13:27:58 -08:00
Anton Dyudin
db981d4db3 default to identity in url path, extend facebook tokens 2016-01-26 12:32:52 -08:00
Philip C Monk
c7196a689c Merge branch 'eyre-sec' of https://github.com/ohAitch/urbit into eyre-sec
Conflicts:
	urb/urbit.pill
	urb/zod/ape/gh.hoon
2016-01-25 21:02:41 -05:00
Philip C Monk
4a1420d301 initial webhook reading for github 2016-01-25 20:13:08 -05:00
C. Guy Yarvin
fc1068dfae Revert "Stripdown part 2."
This reverts commit afcc1cb9a80db3a687d7a2a1dc3bf1be38df5b68.
2016-01-25 16:52:58 -08:00
C. Guy Yarvin
a0a2cdf64f Revert "Cleanup commit #1; revert this when ready to merge."
This reverts commit c12823babc63665e30fe4e3935ccda80601d6cf8.
2016-01-25 16:49:09 -08:00
C. Guy Yarvin
0231d41cb6 .^ fully transitioned. 2016-01-25 16:47:58 -08:00
Anton Dyudin
963ad9799b convert slack to lib/oauth2 2016-01-25 14:49:38 -08:00
Anton Dyudin
8fedb7d119 Don't inject ;meta(urb_front) if frontmatter is empty/nonexistent 2016-01-25 13:53:12 -08:00
C. Guy Yarvin
fdc328e71a Enforce type sanity on .=. 2016-01-24 19:37:41 -08:00
Anton Dyudin
dcb4f98ddf move fb oauth code to lib/oauth 2016-01-22 19:06:46 -08:00
Philip C Monk
b793d72121 Merge remote-tracking branches 'ray/fixlore', 'my/loremark', 'my/fancy-autoreload' and 'my/fixmerge' 2016-01-13 16:22:51 -05:00
Philip C Monk
d369819b1d default case correctly in |merge
also, get rid of extra ~& in kiln
2016-01-13 15:11:25 -05:00
Philip C Monk
c48f26ce7d autoreload sanely 2016-01-12 16:20:57 -05:00
Raymond Pasco
cde64c834d Merge remote-tracking branch 'philipcmonk/cy-without-hash'
Conflicts:
	urb/urbit.pill

Clay arcana (%cy to faster %cz)
2016-01-11 10:57:30 -05:00
Philip C Monk
9725cf492a forgot a urb/zod/lib/kiln.hoony -> urb/zod/lib/kiln.hoonz 2016-01-09 18:41:05 -05:00
Philip C Monk
0bbae7e679 split %cy hash out into %cz 2016-01-07 18:54:42 -05:00
C. Guy Yarvin
d538089239 Retreated from ++hail:ap. 2016-01-06 23:08:09 -08:00
Philip C Monk
368d07de77 add |track and case option for |merge 2016-01-06 17:16:26 -05:00
C. Guy Yarvin
1a28e52405 Both in one event. 2016-01-04 07:13:22 -08:00
C. Guy Yarvin
b9cd49600c Ready for complex boot sequence. 2016-01-04 06:27:35 -08:00
C. Guy Yarvin
86022c41d8 %moat is fully vanquished; %atom constants still vestigial. 2015-12-27 16:36:49 -05:00