urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-16 23:04:16 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,878 Commits 768 Branches 10 Tags 215 MiB
f19891d488
Commit Graph

252 Commits

Author SHA1 Message Date
Anton Dyudin
7195fceee8 mar/womb-claim, finer-grained control over urb.wall 
urbit/womb@cd9938f
 2016-04-27 12:32:44 -07:00
Anton Dyudin
a359940afb mar/womb/ships json conversion 
urbit/womb@1ea2133
 2016-04-27 11:46:42 -07:00
Anton Dyudin
91d6eccbaf /womb/balance scry endpoint, mark, frontend 
urbit/womb@fd3a34d
 2016-04-26 18:49:21 -07:00
Anton Dyudin
1f7e55fb71 stat-all mark, src checking, frontend 
urbit/womb@ad2ce14
 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
Anton Dyudin
097f74f762 Revert "remove gmail and some other bs" 
Pre-merge: gmail is modified/used by %womb to email tickets
This reverts commit 8239c777ab.
 2016-04-26 16:42:15 -07:00
Anton Dyudin
42926b7bb4 womb-part mark for backups 2016-04-18 15:01:18 -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
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
a39a93834c Merge remote-tracking branch 'anton/web-stream' into porcelain 2016-04-14 13:57:20 -04: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
Philip C Monk
e83c60958c clean porcelain 2016-04-08 19:47:34 -04:00
Anton Dyudin
fbec9c0c7f mass header-comment fixup 2016-04-07 19:16:04 -07:00
Henry Ault
c19a1a0761 dropbox security driver and minor supporting changes 2016-04-05 15:25:02 -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
6ff26fc0b6 :gh parser and error tweaks 2016-03-31 16:13:12 -07:00
Anton Dyudin
492718f5db Merge branch 'pipe' into web-stream 
pull :pipe event->talk multiplexer
 2016-03-31 15:02:35 -07:00
Anton Dyudin
4e12caea2d move ->lens-json conversion to mar/sole-effect, 
lens ack logic inside ++ix
 2016-03-31 14:23:23 -07:00
Anton Dyudin
6470dbb912 add .^(json %gx /=twit=/cred) login information 2016-03-30 17:04:22 -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
730af1b93f add json translation for frontend use 2016-03-28 16:24:31 -07:00
Anton Dyudin
b886daf7c0 rename plan-data to plan-acct, add info to diffs 2016-03-28 16:24:25 -07:00
Philip C Monk
39f1bfc01a reworked api speech type 2016-03-25 20:47:22 -04:00
Anton Dyudin
583d1838f0 naming tweaks 2016-03-25 16:27:17 -07:00
Anton Dyudin
34d79c797e add name and location metadata 2016-03-25 16:19:48 -07:00
Anton Dyudin
bb32965d2f add optional url to .plan 2016-03-25 15:40:39 -07:00
Anton Dyudin
6bd1850bc3 create web.plan if nonexistent 2016-03-24 17:15:12 -07:00
Philip C Monk
402361d9c5 refactor into generators 2016-03-24 19:55:10 -04:00
Philip C Monk
3e85a67267 added :pipe 2016-03-24 18:42:39 -04:00
Anton Dyudin
1f83b56fb1 merge .plan files 2016-03-24 14:34:19 -07:00
Anton Dyudin
ccc01741a3 init .plan mark 2016-03-24 13:57:05 -07:00
Anton Dyudin
985f9c89d5 add mar/recoverable-error for httr errors 2016-03-22 16:12:42 -07:00
Galen Wolfe-Pauly
8239c777ab remove gmail and some other bs 2016-03-21 16:01:54 -07:00
Anton Dyudin
d248f431b9 rename twit-stat to twit-post 2016-03-21 13:36:42 -07:00
Philip C Monk
d030cde553 Merge branch 'master' into api-doc 
Conflicts:
	arvo/eyre.hoon
	arvo/ford.hoon
 2016-03-16 16:38:08 -04:00
Anton Dyudin
b6ef9f6d40 add twit-feed, twit-status 2016-03-14 15:17:47 -07:00
Philip C Monk
4144a1a8c8 %lens-command fix 2016-03-11 19:37:11 -05:00
Anton Dyudin
2f494e6e2f type mar/twit-req, mar/twit-usel 2016-03-11 16:06:47 -08:00
Anton Dyudin
70dd18ac7d added trivial mar/twit/req 
usage :curl &twit-req *acco-veri:main:twitter
 2016-03-11 12:38:41 -08:00
Philip C Monk
3454ca9c72 dojo.hoon has most all functionality 2016-03-08 20:19:28 -05:00
Philip C Monk
a8910dea96 waypoint 2016-03-07 17:06:17 -05: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
Philip C Monk
c0c67969f3 checkpoint, w/lens protocl 2016-02-26 20:13:00 -05:00
Anton Dyudin
1cf56bd06b added comment hash identifier 2016-02-25 18:41:29 -08:00
Anton Dyudin
a5a058d7da move tree-comments to separate renderer 
Cherry-pick of a2cc5d5
 2016-02-25 18:27:45 -08:00
Anton Dyudin
d331391486 proxy tree comments through talk 
urbit/tree@bdebe54
 2016-02-25 12:38:00 -08:00
Henry Ault
6910910333 dojo change for +http and an atom diff 2016-02-24 13:39:45 -08:00
Philip C Monk
d146f1d9e4 151ization 2016-02-19 17:47:09 -05:00
Anton Dyudin
a2cc5d5333 move tree-comments to separate renderer 2016-02-19 12:01:52 -08: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
Anton Dyudin
bf2164054d factor out map-to-json 2016-02-17 15:50:03 -08:00
Anton Dyudin
11341be6d7 fix rss renderer 2016-02-17 15:17:46 -08:00
Anton Dyudin
e874ce237a verified mark code 2016-02-17 15:00:12 -08:00
Anton Dyudin
6db85fe1ac more tree 151ization 2016-02-11 16:33:22 -08:00
Anton Dyudin
fb3c53553f add missing /?s 2016-02-11 16:33:21 -08:00
Anton Dyudin
2fbeee9243 more header-comment normalization 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
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
c95bd7af46 wasp-data debug mode urb.verb 2016-02-09 21:15:53 -08:00
Anton Dyudin
71adc8fb50 first try at head-body separation 2016-02-09 21:15:38 -08:00
Anton Dyudin
263730193c type-check ;html:(head body) 2016-02-09 17:24:30 -08:00
Anton Dyudin
8504d823c6 moved ~/on/<dep>.js injection to mar/urb 
The script itself remains in eyre, for usage by error messages.
 2016-02-09 17:09:33 -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
Anton Dyudin
83af2347c4 :talk &foo ~.channel now :talk|foo ~.channel 2016-02-04 18:12:48 -08:00
Anton Dyudin
268d62cfe5 moved some tree-combine logic to marks 2016-02-04 16:27:55 -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
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
Anton Dyudin
065bc10999 Merge branch 'factor' of https://github.com/galenwp/urbit into factor 
Conflict: paste fixed in factor, deleted in glen/factor
 2016-02-03 17:52:42 -08:00
Galen Wolfe-Pauly
bfd52f9e32 sweeping 2016-02-03 16:12:46 -08:00
Anton Dyudin
dd2aff37a8 fix metadata reading 2016-02-03 14:43:40 -08:00
Philip C Monk
e5d5d2fb82 gh looks pretty good 2016-02-02 18:41:04 -05:00
Anton Dyudin
a2081a7482 transfered /@ to "include by date", /& now "cast to mark" 2016-02-01 15:58:48 -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
e987337bfb In the middle of internal merge. 2016-01-29 18:25:52 -08:00
Anton Dyudin
4cc89df474 fix hoon source not rendering in tree 2016-01-29 17:36:37 -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
Philip C Monk
66c5a99b6e cleanup 2016-01-27 16:50:06 -05:00
Philip C Monk
4a1420d301 initial webhook reading for github 2016-01-25 20:13:08 -05: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
Philip C Monk
0f0d08356c fix marks for new lore/role 2016-01-13 16:19:09 -05:00
Anton Dyudin
5f87a2d997 classic garb 2016-01-06 13:49:13 -08:00
Anton Dyudin
0c473d2083 fix examples, remove mdy, react marks 2016-01-06 12:58:26 -08:00
Anton Dyudin
ca1502ed77 no more hook files! 
- index factored into index ren
- paste json assigned new %paste-new mark
- /!mark/ horn added to execute hoon as generating said mark
  + app front pages moved accordingly
- 404 moved to md
 2016-01-05 19:15:43 -08:00
C. Guy Yarvin
84a0846379 Double-solid before devulcanization transition attempt. 2016-01-03 16:23:19 -08:00
C. Guy Yarvin
ddae003feb Devulcanization artifacts out of vanes. 2016-01-03 01:22:57 -08:00
C. Guy Yarvin
836bda4995 Now satisfied with casual containers. 2016-01-01 16:19:06 -08:00