Commit Graph

431 Commits

Author SHA1 Message Date
C. Guy Yarvin
0c6fef08f9 Change ship to shop in scry. 2016-09-04 16:35:37 -07:00
C. Guy Yarvin
8bdeb902d4 Fix bad merge previous. 2016-09-03 22:56:02 -07:00
C. Guy Yarvin
6945a2cfa2 Merge commit '0ec6f47' into relearning 2016-09-03 14:48:33 -07:00
C. Guy Yarvin
c88b969a3a Merge commit '3cecb28' into relearning 2016-09-03 14:47:51 -07:00
C. Guy Yarvin
b3b15b33f8 Merge commit 'ba6ecf2' into relearning 2016-09-03 14:47:12 -07:00
C. Guy Yarvin
d20707365d Merge commit '4c8e014' into relearning 2016-09-03 14:46:54 -07:00
C. Guy Yarvin
23b9e661dd Merge commit '4645368' into relearning 2016-09-02 15:27:23 -07:00
Anton Dyudin
0ec6f47642 Absolute path for login CSS 2016-08-25 14:54:48 -07:00
Anton Dyudin
3cecb280fd print "pump blocked" on sequentialized sec/ requests 2016-08-19 10:17:38 -07:00
Anton Dyudin
f47db234e4 re-enable sec/ pump on all http responses 2016-08-12 13:31:14 -07:00
Raymond Pasco
786bce0a79 Merge branches 'breaching-inception' and 'womb' into staging 2016-08-11 19:40:06 -07:00
Anton Dyudin
0a1340e6d9 serialize outbound sec/ requests 2016-08-11 17:07:55 -07:00
Anton Dyudin
ba9d32a705 Continue on failed sec/ http requests 2016-08-11 17:07:55 -07:00
Anton Dyudin
09c037079d better made-* naming in ++vi 2016-08-11 17:07:55 -07:00
Anton Dyudin
46453684fb fix double-spaced eyre stack trace rendering 2016-08-05 17:10:38 -07:00
C. Guy Yarvin
57f0abc3dd Merge remote-tracking branch 'cgyarvin/neoames' into learning 2016-08-05 12:59:19 -07:00
C. Guy Yarvin
7660fb46bc neoames boots. 2016-07-24 14:23:28 -07:00
Anton Dyudin
ba6ecf24f9 Allow robots instead of denying them 2016-07-07 11:16:14 -07:00
Anton Dyudin
eceaab80bb Revert "move robots.txt out of %eyre"
This reverts commit a0485c6d30.
2016-07-07 11:14:24 -07:00
Raymond Pasco
26c674e9ae Merge remote-tracking branches 'ray/nonbreaching-crypto', 'ohaitch/tree-8c94e48', 'joemfb/indx', 'joemfb/dedupe-history', 'ohaitch/userspace-robots-txt', 'philipcmonk/sso-fix', 'dhaffey/da-parser' and 'galenwp/prs'
Conflicts:
	web/talk/main.js

Add ++aes to zuse, and ++crub frontend (unrelated to previous ++crub)
Superseded tree update, merged for historical purposes
Library gates to search lists
Deduplication of dojo history
robots.txt no longer hardcoded in eyre
Fix crash caused by bad eyre cookie
Fix @da parser crash
talk@2ba76c1, tree@ca059b5
2016-07-06 05:42:14 -04:00
Philip C Monk
9628a46861 fix sso crash 2016-06-30 18:04:23 -04:00
Anton Dyudin
a0485c6d30 move robots.txt out of %eyre 2016-06-30 10:56:19 -07:00
Raymond Pasco
5d4c1484b3 Merge remote-tracking branch 'galenwp/eyre-fix'
Conflicts:
	arvo/eyre.hoon

Change placeholder text in eyre login page
2016-06-06 14:28:16 -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
Galen Wolfe-Pauly
aa39d1d214 planet -> your-urbit 2016-06-04 16:45:49 -07:00
Anton Dyudin
7aaf59edca always set cookies when serving oryx, "anon" user 2016-05-17 13:28:32 -07:00
Anton Dyudin
dc0a041ab6 generate anonymous identifier per session 2016-05-17 13:01:24 -07:00
Anton Dyudin
ea232adfa0 eyre performance 2016-05-16 11:16:13 -07:00
Anton Dyudin
0b08848dbc better ~/at inject for concatenation 2016-05-03 13:49:54 -07:00
Philip C Monk
383b21c951 checkpoint of marked gall scry 2016-04-28 19:37:02 -04:00
Raymond Pasco
298cb1fa21 Merge remote-tracking branches 'ohaitch/examples-ping-send', 'galenwp/style' and 'ohaitch/ford-fixes'
Generalize ++fame to to /ify all path elements
Plan css, stacking css, fix nav overlap
Ford fixes: closes #34, closes #39, closes #99, closes #114
2016-04-19 22:35:54 -04:00
Galen Wolfe-Pauly
d645e98183 more plan 2016-04-18 18:59:08 -04:00
Galen Wolfe-Pauly
9da1a14fe5 panel bar 2016-04-18 18:59:08 -04:00
Raymond Pasco
fbb8c542b8 Merge branch 'web-stream-r', remote-tracking branches 'ohaitch/eyre-absolutish-paths', 'ohaitch/sorted-pick-dole', 'rsaarelm/fix-mug-hoon', 'cgyarvin/bugfix' and 'ray/sec-names'
Fixed web-stream branch (see that branch for details)
Minor eyre tweaks for more liberal url resolution
Sort clauses of $fork type pretty-printing
Return 31-bit value for pair mug
Fix type-fail in ;;
Rename security driver arms
2016-04-14 17:52:57 -04:00
Philip C Monk
247b0b6c84 renamed security driver arms (nonbreaching version) 2016-04-14 16:41:44 -04:00
C. Guy Yarvin
dbf8c5536c Merge branch 'wombjael' into learning
Conflicts:
	arvo/zuse.hoon
2016-04-09 10:59:39 -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
3aa4baaf39 state adapter 2016-03-31 14:08:36 -07:00
Anton Dyudin
856ce75707 split %chis IPC-request back out of %this
urbit/urbit@3d05538
2016-03-31 14:05:40 -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
bf87021aa9 added urb.sein, tree-json.beak 2016-03-29 15:29:22 -07:00
Anton Dyudin
98c1ada2a0 use ++vast parser more extensively for /=home/2/web/bar.md to work as a url 2016-03-23 14:50:57 -07:00
Anton Dyudin
3de9731d3f reorder url special-case parsing to allow /1a.md
as a vanilla "spur" url
2016-03-23 14:50:44 -07:00
Anton Dyudin
985f9c89d5 add mar/recoverable-error for httr errors 2016-03-22 16:12: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
Philip C Monk
841a32a3c1 improvements to match urb 2016-03-16 15:26:02 -04:00
Anton Dyudin
3500fc3ee8 add sanity checking wrt twitter usernames 2016-03-15 16:25:39 -07:00
Raymond Pasco
a1df9b2a59 Merge branch 'passcode-code', remote-tracking branches 'galenwp/clean', 'ohaitch/mo-not-running' and 'ohaitch/mar-twitter-request'
Move eyre auth code to +code
Remove nonexistent vane stubs
Add a printf somewhere
Twitter auth and requests
2016-03-14 19:43:32 -04:00