ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-09-23 08:28:26 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,407 Commits 6 Branches 0 Tags 164 MiB
3d791048e8
Commit Graph

7407 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fang
122362e732 Fixed syntax error introduced into hood.hoon. 2017-12-06 00:19:56 +01:00
Fang
a167fe94c9 Merge commit 'bd76ab5da4043b19867dbf74938497e588e4b4f5' into remaint-merge-talk 2017-12-06 00:05:01 +01:00
Ted Blackman
bd76ab5da4
Merge pull request #451 from urbit/Fang--patch-2 
Fix small issue in ++op:dejs-soft:format when calling ++my:nl
 2017-12-05 13:47:00 -08:00
Fang
07885a3c98 Removed version requirements from hall and talk. 
Also small comment cleanup.
 2017-12-05 22:32:55 +01:00
Fang
41098a2121 Merge commit '8bf726fdb1ecaf072d72ec795948f842ff7ea2e7' into remaint-merge-talk 2017-12-05 22:31:00 +01:00
Anton Dyudin
f24f2190a5 Merge branch 'master' into cleaner-deco 
Conflicts:
	gen/deco.hoon
	sys/hoon.hoon
 2017-12-05 12:24:06 -08:00
Ted Blackman
8bf726fdb1
Merge pull request #463 from ohAitch/fix-sso 
recover SSO code from history
 2017-12-05 12:20:30 -08:00
Ted Blackman
780b278547
Merge pull request #461 from ohAitch/org-libs 
reorganize generator and :hood libraries
 2017-12-05 12:19:34 -08:00
Anton Dyudin
2eac6be25d Merge branch 'org-libs' into master 2017-12-05 12:07:33 -08:00
Ted Blackman
c31dbeff69
Merge pull request #460 from ohAitch/trivia 
misc cleaning
 2017-12-05 11:51:45 -08:00
Ted Blackman
76ec2db3b5
Merge pull request #465 from ohAitch/womb-fixes 
Pull in off-mainline womb fixes, make |invite usable
 2017-12-05 11:45:34 -08:00
Ted Blackman
a0120e7bd2
Merge pull request #464 from ohAitch/travis 
enable Travis CI, base test "does dojo run"
 2017-12-05 11:27:16 -08:00
Anton Dyudin
71be9e32ba reword, use more official bin/urbit release url 2017-12-04 16:09:15 -08:00
Anton Dyudin
112d9ce70b re-enable parent pier pin 2017-12-04 12:09:08 -08:00
Fang
4b49445481 Merge commit '87e658a765549e9674377d9beeafc3dc6529322b' into remaint-merge-talk 2017-12-03 19:41:24 +01:00
Fang
98689327da Merge commit '3c86ea262abf192942eea3610f76bb7163a65b06' into remaint-merge-talk 2017-12-03 19:29:25 +01:00
C. Guy Yarvin
87e658a765 Remove $% duplicate detection, which broke something. 2017-12-02 05:33:08 -08:00
Anton Dyudin
b2817f804f don't copy in files for fresh pier 2017-12-01 22:09:25 -08:00
Anton Dyudin
cf41b01e42 fix boolean semantics, safety 2017-12-01 21:55:19 -08:00
Anton Dyudin
d70d81d98f test pill autobuild code 2017-12-01 21:23:34 -08:00
Anton Dyudin
4bf0155b60 add "build from only pill" fallback 2017-12-01 21:23:33 -08:00
Anton Dyudin
6fa4df59ab node version, "before_deploy" duplication workaround 2017-12-01 21:22:27 -08:00
Anton Dyudin
d3e91d9153 tweak unchecked commit message, hopefully fix pilling code 2017-12-01 20:49:15 -08:00
Anton Dyudin
4a60ec2aa0 bash typos, use properly snapshotted base pier 2017-12-01 20:09:32 -08:00
Anton Dyudin
649f5418e6 stub out "current commit" check 2017-12-01 19:57:11 -08:00
Anton Dyudin
d501cc0b4e Merge branch 'master' into travis 
test pill creation code
 2017-12-01 19:53:14 -08:00
Anton Dyudin
88caba537d proxy escape code 2017-12-01 19:52:35 -08:00
Anton Dyudin
e7b6a365da build pill if none yet uploaded 2017-12-01 19:40:35 -08:00
C. Guy Yarvin
1b47073c11 Manually complete prior integrations. 2017-12-01 19:02:46 -08:00
Anton Dyudin
2eb5349802 add base path, =dub arguments to +solid 2017-12-01 18:23:33 -08:00
Anton Dyudin
a4dd3f1cd5 should not have been left on 2017-12-01 16:58:02 -08:00
prod
dc64215c6c fix &womb-claim to not show up as @u 
(cherry picked from commit 36d2e9dc84b4007d97c4fb5dccf85c317907cb72)
 2017-12-01 16:37:37 -08:00
Anton Dyudin
70c431f8c9 Merge branch 'fix-womb-invite' into womb-fixes 2017-12-01 16:37:37 -08:00
Anton Dyudin
aa3512b0cf Merge commit '9472770e' into womb-fixes 
hella womb fixes from production that hadn't been pulled in
 2017-12-01 16:32:09 -08:00
C. Guy Yarvin
37ca298f88 Correctly hand-merge e3e0a7f. 2017-12-01 15:54:50 -08:00
C. Guy Yarvin
db4a6008be Revert a bad merge. 2017-12-01 15:53:40 -08:00
C. Guy Yarvin
60e3381bd0 Revert "Fixed bad merge." 
This reverts commit 16b84c0ce7.
 2017-12-01 15:52:15 -08:00
C. Guy Yarvin
16b84c0ce7 Fixed bad merge. 2017-12-01 15:50:09 -08:00
C. Guy Yarvin
299558f245 Merge commit 'd6c5912' into master-pulls 2017-12-01 15:48:28 -08:00
C. Guy Yarvin
b40e976862 Merge commit '3740378' into master-pulls 2017-12-01 15:48:08 -08:00
C. Guy Yarvin
ca36e63bfe Merge commit 'c46740d' into master-pulls 2017-12-01 15:47:55 -08:00
C. Guy Yarvin
c009427372 Merge commit 'e3e0a7f' into master-pulls 2017-12-01 15:30:19 -08:00
C. Guy Yarvin
bac4ad847c Merge commit 'a5cede6' into master-pulls 2017-12-01 15:23:39 -08:00
C. Guy Yarvin
ddcde42454 Merge commit '4e66af4' into master-pulls 2017-12-01 15:23:29 -08:00
C. Guy Yarvin
f6502a2de5 Merge commit '6037fbd' into master-pulls 2017-12-01 15:15:32 -08:00
C. Guy Yarvin
ec6e4cda7a Merge commit 'fe7c9cc' into master-pulls 2017-12-01 15:13:39 -08:00
Anton Dyudin
d1f41c30a7 fix |transfer 2017-12-01 14:27:06 -08:00
Joseph Bryan
b21db93729 restructures ++sign:able:xmas to avoid duplicate tag 2017-12-01 14:05:57 -08:00
Joseph Bryan
cc605d0e5e updates ++boil:ap to crash if a book has pages with the same tag 2017-12-01 14:05:57 -08:00
Max
942d595fa9 Comment typo 2017-12-01 14:05:57 -08:00