Commit Graph

6697 Commits

Author SHA1 Message Date
Elliot Glaysher
9878c0d61b Merge remote-tracking branch 'upstream/master' into new-stdlib 2017-11-05 15:43:21 -08:00
Anton Dyudin
d7b2ddf87b fix *&foo to actually be invokable 2017-10-31 13:24:51 -07:00
Anton Dyudin
68ec996c1e Revert "Merge remote-tracking branch 'origin/automount'"
This reverts commit 29158d9397, reversing
changes made to 57006281f2.
2017-10-31 13:23:54 -07:00
Anton Dyudin
b07abebb6d minor gen/ fixes 2017-10-31 13:00:34 -07:00
C. Guy Yarvin
6734fbf58b Merge markdown properly. 2017-10-31 12:50:21 -07:00
C. Guy Yarvin
835a0f4050 Merge remote-tracking branch 'oHaitch/merge-nozap' 2017-10-31 12:34:23 -07:00
C. Guy Yarvin
9db8213ff3 Correctly merge ++cram. 2017-10-31 11:27:54 -07:00
C. Guy Yarvin
291f5f17c8 Merge branch 'master' of https://github.com/urbit/arvo 2017-10-31 11:18:17 -07:00
Anton Dyudin
90136af200 fix automount 2017-10-31 11:15:16 -07:00
C. Guy Yarvin
b7c6567449 Merge branch 'master' of https://github.com/urbit/arvo 2017-10-31 11:08:07 -07:00
C. Guy Yarvin
d2a33d4028 Rename ++hoon to ++hoon-version. 2017-10-31 11:07:42 -07:00
Anton Dyudin
c396584886 Merge branch 'nozap' 2017-10-30 18:13:06 -07:00
Anton Dyudin
29158d9397 Merge remote-tracking branch 'origin/automount' 2017-10-30 17:05:45 -07:00
Anton Dyudin
57006281f2 Merge remote-tracking branch 'urbit/maint-20170614' 2017-10-30 17:05:17 -07:00
C. Guy Yarvin
32278ff153 Clean up some memory-eating junk. 2017-10-30 15:12:38 -07:00
C. Guy Yarvin
2a1fd3f2fe Clear some debug settings. 2017-10-30 10:48:56 -07:00
C. Guy Yarvin
c83bc5f700 Merge remote-tracking branch 'belisarius222/sec-fixes' 2017-10-26 15:47:31 -07:00
C. Guy Yarvin
334ab6086f Merge branch 'master' of http://github.com/urbit/arvo 2017-10-26 15:39:14 -07:00
Ted Blackman
dd93a904ee app/ask.hoon: fixed syntax error 2017-10-26 15:10:30 -07:00
Ted Blackman
1b98a083dc twitter app compiles 2017-10-26 15:10:30 -07:00
Ted Blackman
cd3bb9b1e0 fixed gmail app and lib/http.hoon 2017-10-26 15:10:30 -07:00
Ted Blackman
b886374fef fixed init-oauth2-google 2017-10-26 15:10:30 -07:00
Ted Blackman
8ffdab7b0e twitter compiles now. gets error 32 2017-10-26 15:10:30 -07:00
Ted Blackman
06dd438f82 slack works 2017-10-26 15:10:30 -07:00
Ted Blackman
f2e9b31336 fixed instagram 2017-10-26 15:10:30 -07:00
Ted Blackman
6afca71390 Fixed googleapis 2017-10-26 15:10:30 -07:00
Ted Blackman
9eeb8ce659 ++iden alias in old zuse 2017-10-26 15:10:30 -07:00
Ted Blackman
f765689aba facebook oauth compiles now 2017-10-26 15:10:30 -07:00
Ted Blackman
fa8fc6688b fixed dropbox 2017-10-26 15:10:30 -07:00
Ted Blackman
395d661dba fixed digitalocean 2017-10-26 15:10:30 -07:00
Ted Blackman
cb0200e379 fixed asana 2017-10-26 15:10:30 -07:00
Ted Blackman
3efebb02dc fixed github auth 2017-10-26 15:04:37 -07:00
Ted Blackman
aae12cb0ab actually fix care 2017-10-26 15:04:37 -07:00
Ted Blackman
fe949b404f ^care -> care in lib/connector 2017-10-26 15:04:37 -07:00
Ted Blackman
7dc12eb66f app/ask: fixed syntax error 2017-10-26 15:04:37 -07:00
Ted Blackman
772e5d060a app/gh and lib/connector fixes 2017-10-26 15:04:37 -07:00
Anton Dyudin
fe19c8c975 Merge branch 'unjaelwomb' 2017-10-26 14:01:36 -07:00
Anton Dyudin
71550b0bfd Revert "Merge branch 'jaelwomb' into cc-release"
(jael doesn't exist yet)

This reverts commit 13bc8ea59f, reversing
changes made to c232f670be.
2017-10-26 13:59:49 -07:00
Anton Dyudin
a1a200d793 Merge branches 'tarpam' and 'eyreunlearn' 2017-10-25 17:47:54 -07:00
Anton Dyudin
bf344db2df add *&mark dojo example value syntax 2017-10-25 17:47:39 -07:00
Anton Dyudin
b041f70520 Revert "Merge branch 'eyrelearning' into cc-release"
This reverts commit 1365c178df, reversing
changes made to 278641b6c7.
2017-10-25 16:20:22 -07:00
C. Guy Yarvin
4ae6263c21 Merge remote-tracking branch 'origin/master' 2017-10-25 15:08:16 -07:00
cgyarvin
513ceb119f Merge pull request #446 from mattlevan/master
Added 'Accept: application/json' hiss header to lib/oauth2
2017-10-25 14:51:18 -07:00
Matthew Levan
ecffbb5df5 Added 'Accept: application/json' hiss header 2017-10-25 14:30:14 -07:00
C. Guy Yarvin
6390ea6464 Revert 143ization of %zuse. 2017-10-25 14:20:56 -07:00
C. Guy Yarvin
9f03be0e81 Remove redo printfs. 2017-10-25 14:20:43 -07:00
C. Guy Yarvin
507806edec Merge remote-tracking branch 'belisarius222/sec-fixes' 2017-10-24 19:10:57 -07:00
C. Guy Yarvin
7df058dd6f Reset %zuse pre 143. 2017-10-24 19:04:45 -07:00
Ted Blackman
df8aa3e53b app/ask.hoon: fixed syntax error 2017-10-24 17:40:09 -07:00
C. Guy Yarvin
7b016c9c4f Merge branch 'master' of http://github.com/urbit/arvo 2017-10-24 17:16:21 -07:00