Commit Graph

661 Commits

Author SHA1 Message Date
Matthew Levan
ec6c932396 Added lore and nule 2017-11-03 17:31:28 -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
C. Guy Yarvin
835a0f4050 Merge remote-tracking branch 'oHaitch/merge-nozap' 2017-10-31 12:34:23 -07:00
Anton Dyudin
90136af200 fix automount 2017-10-31 11:15:16 -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
Ted Blackman
cd3bb9b1e0 fixed gmail app and lib/http.hoon 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
9eeb8ce659 ++iden alias in old zuse 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
fe949b404f ^care -> care in lib/connector 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
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
Matthew Levan
ecffbb5df5 Added 'Accept: application/json' hiss header 2017-10-25 14:30:14 -07:00
Anton Dyudin
dbc802a99b oauth2 names 2017-10-23 15:09:26 -07:00
C. Guy Yarvin
ab5fb62484 Various fixes and imprevements. 2017-10-22 15:46:07 -07:00
Ted Blackman
76d03eb394 Merge branch 'master' of github.com:belisarius222/arvo 2017-10-19 16:53:08 -07:00
C. Guy Yarvin
84f50dea0e Revert "Fixed compilation error in /lib/helm"
This reverts commit 46d67620bf.
2017-10-19 16:50:07 -07:00
Ted Blackman
267c87d651 partial fixes for gh app 2017-10-19 16:43:37 -07:00
Fang
46d67620bf Fixed compilation error in /lib/helm 2017-10-20 00:07:02 +02:00
C. Guy Yarvin
640632279f Merge branch 'master' of http://github.com/urbit/arvo 2017-10-19 10:37:09 -07:00
C. Guy Yarvin
8b727d48ca Fix |reset. 2017-10-19 10:36:53 -07:00
Anton Dyudin
5018e466b8 fix frontend 2017-10-18 15:06:03 -07:00
C. Guy Yarvin
5c3fd13cc9 Ticketing works. 2017-10-11 17:00:21 -07:00
C. Guy Yarvin
e0cb33b815 Fix some boot issues. 2017-10-09 22:22:47 -07:00
C. Guy Yarvin
068cbb34d9 Fix old-zuse lib; make hi failure work 2017-10-09 20:39:08 -07:00
Fang
ae72b8f10f Merge pull request #437 from joemfb/plan-serv-cc
forwardport #436
2017-10-07 13:31:28 +02:00
Joseph Bryan
e6f52193d5 writes web/plan to whichever desk has been |served 2017-10-06 19:59:28 -04:00
Joseph Bryan
94d6b3ccfa writes web/plan to whichever desk has been |served 2017-10-06 19:48:59 -04:00
C. Guy Yarvin
f2a7257f8a Mostly merged. 2017-10-02 21:36:34 -07:00
C. Guy Yarvin
5a74064080 Merge branch 'remaint' into remaint-merge 2017-10-01 18:50:19 -07:00
C. Guy Yarvin
dc25979f59 Merge remote-tracking branch 'origin/master' into piaf-runes 2017-09-21 18:45:27 -07:00
C. Guy Yarvin
f8349b1aa7 Correct ^ conversion. 2017-09-19 17:35:45 -07:00
C. Guy Yarvin
bf3b8432b3 About working. But very slow. 2017-09-07 16:47:49 -07:00
Ted Blackman
62fec03d96 Fixed code block at start of blockquote 2017-08-29 18:05:44 -07:00
Anton Dyudin
6c271563ef <br/> from trailing \ 2017-08-28 17:52:18 -07:00
Ted Blackman
5ab0a794b1 Fix header in blockquote 2017-08-28 15:11:09 -07:00
Ted Blackman
6a05cf158c fixed list outdent parsing; moved list closing to ++line 2017-08-25 18:12:05 -07:00
Ted Blackman
1176fe0f3d consolidated outdent parsing 2017-08-25 17:29:50 -07:00
Anton Dyudin
0cd98d9c2c get rid of bal par copy, restrict read-line mutation 2017-08-24 20:31:37 -07:00
Anton Dyudin
d3f9ecb667 move code unrelated to opening items out of ++open-item 2017-08-24 20:05:31 -07:00
Anton Dyudin
54105e7fd0 formalize %poem as an indent-based style 2017-08-24 19:51:16 -07:00
Anton Dyudin
0fcf16898e formalize %dent parsing 2017-08-24 19:13:49 -07:00
Anton Dyudin
fa2b9a0eea use read-one for --- <hr> parsing
instead of counting it as a container "item"
2017-08-24 18:10:22 -07:00
Anton Dyudin
7cbaffcbed refactor fenced-code postprocessing into ++parse 2017-08-24 17:49:23 -07:00
Ted Blackman
9a72aa2147 whitespace 2017-08-24 17:02:02 -07:00
Ted Blackman
7c2a56b929 markdown in sail 2017-08-24 16:32:45 -07:00
Ted Blackman
fd022172c9 parse empty div; changed indent representation 2017-08-24 15:04:24 -07:00