Commit Graph

1406 Commits

Author SHA1 Message Date
Anton Dyudin
d49569ac21 Merge branch 'exec' into test
Conflicts:
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/terminal/core.hook
2015-01-25 21:29:21 -08:00
Anton Dyudin
ad63f76568 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-01-25 20:49:39 -08:00
C. Guy Yarvin
4e72941101 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-01-25 17:39:37 -08:00
Anton Dyudin
d444e244af Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-01-22 14:16:19 -08:00
C. Guy Yarvin
2b06b7f497 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-01-22 14:01:39 -08:00
Anton Dyudin
f081dd273f Twitter daemon v1: auth, tweeting 2015-01-21 19:31:40 -08:00
Anton Dyudin
c622ac2513 Revert "Tile %smsm, replaced instance in ames with ++hard call"
Kept the %ames part.
This reverts commit 3dcf69e125a12518e6d0d30a50e3ef79d8819048.

Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
	urb/zod/main/app/bang/core.hook
	urb/zod/main/app/cat/core.hook
2015-01-17 13:57:55 -08:00
Anton Dyudin
e45aa0ff83 Merge branch 'master' into exec 2015-01-15 12:05:36 -08:00
C. Guy Yarvin
fb2afb4417 Merge branch 'radio'
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
	urb/zod/main/app/talk/core.hook
2015-01-15 12:02:28 -08:00
C. Guy Yarvin
8a4ab744eb Memory and other optimizations. 2015-01-15 11:10:29 -08:00
Anton Dyudin
58680f441d Merge branch 'auth', by extension pony2 and all associated refactoring.
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
2015-01-14 19:47:05 -08:00
Anton Dyudin
413a1be805 Further ~? tweaking 2015-01-14 15:18:03 -08:00
Anton Dyudin
8f3ca6d4e3 sgbr was broken due to nonconforming jet 2015-01-13 22:22:39 -08:00
Anton Dyudin
d50d625efa Sidestream sgwt 2015-01-13 14:13:08 -08:00
C. Guy Yarvin
b2dc513d6a Add cache to ++song, etc. 2015-01-12 17:49:31 -08:00
cgyarvin
456a743a2c Merge pull request #239 from mrdomino/master
Fix de:aesc jet
2015-01-11 15:36:23 -08:00
Steven Dee
0ed41f88a3 Fix de:aesc jet 2015-01-10 00:21:50 -05:00
Anton Dyudin
f84ace5c8a Tile %smsm, replaced instance in ames with ++hard call 2015-01-08 16:10:31 -08:00
C. Guy Yarvin
7a61f3aaa8 About to do some performance testing. 2015-01-07 13:26:05 -08:00
C. Guy Yarvin
d603e9f310 Various fixes and improvements. 2015-01-06 17:27:02 -08:00
C. Guy Yarvin
e3ae2b038c Don't assert on crude delivery fail. 2014-12-30 16:58:34 -05:00
Galen Wolfe-Pauly
0d80cccec9 back to :chat for now 2014-12-28 13:08:15 -08:00
vere
d64783232b Merge branch 'master' of https://github.com/urbit/urbit 2014-12-20 02:46:06 +00:00
vere
b4b3d24070 Merge branch 'master' of https://github.com/urbit/urbit 2014-12-20 02:40:19 +00:00
cgyarvin
3836af7c45 Merge pull request #226 from alecbrick/master
Fixed unsigned integers in mug
2014-12-19 11:47:09 -08:00
Alec Brickner
473a68966a Fixed unsigned integers in mug 2014-12-19 11:41:57 -08:00
C. Guy Yarvin
cfd061f366 Merge branch 'master' of https://github.com/urbit/urbit 2014-12-19 11:25:40 -08:00
C. Guy Yarvin
a239e9a786 Unconfuse linux compiler. 2014-12-19 11:25:28 -08:00
vere
8e7d79d3b5 Unbreak linux build. 2014-12-19 19:14:19 +00:00
cgyarvin
d76faab39f Merge pull request #224 from gkelly/no-error-unused-result
Ignore unused return values for functions that care.
2014-12-19 11:09:27 -08:00
Galen Wolfe-Pauly
4605a635d5 Merge branch 'master' of github.com:urbit/urbit-new 2014-12-19 11:09:17 -08:00
Galen Wolfe-Pauly
70cae9b7ef chat -> talk 2014-12-19 11:09:07 -08:00
Garret Kelly
06323bab3c Ignore unused return values for functions that care. 2014-12-19 19:08:05 +00:00
C. Guy Yarvin
ac95c203d0 CORRECT AND FINAL approach to missing field initializers :-) 2014-12-19 10:22:56 -08:00
Philip C Monk
f014b29b4a Merge branch 'radio'
Conflicts:
	Makefile
2014-12-18 21:15:27 -05:00
Philip Monk
34213f607c Merge pull request #222 from gkelly/cide-everywhere
Make short-lived apps %cide.
2014-12-18 18:08:07 -08:00
Philip Monk
2db16b7163 Merge pull request #221 from gkelly/remove-werror
Remove -Werror from Makefile.
2014-12-18 18:08:00 -08:00
Philip C Monk
3c3e1ce516 cleanup 2014-12-18 20:33:21 -05:00
Philip C Monk
3f988d6b97 Merge branch 'radio' of https://github.com/urbit/urbit into radio 2014-12-18 18:02:12 -05:00
Garret Kelly
eb92f8c3d0 Remove -Werror from Makefile. 2014-12-18 22:59:19 +00:00
C. Guy Yarvin
50870185ec Fix reset. 2014-12-18 14:34:02 -08:00
C. Guy Yarvin
1e584723dc Merge branch 'master' into radio 2014-12-18 11:10:09 -08:00
C. Guy Yarvin
05efcc3623 Merge branch 'master' into radio
Conflicts:
	urb/urbit.pill
2014-12-18 11:04:23 -08:00
cgyarvin
f4cac30e29 Merge pull request #219 from bugbane1/master
Add a checkpoint save before exiting
2014-12-15 16:43:48 -08:00
bugbane1
f80099278a Add a checkpoint save before exiting 2014-12-15 19:30:23 -05:00
cgyarvin
caa4b2730e Merge pull request #215 from gkelly/begin-cleanup
Drop unused assignment from poke-begin-args.
2014-12-15 08:50:02 -08:00
cgyarvin
7746716e21 Merge pull request #217 from mrdomino/master
unsigned integer literal in mug
2014-12-15 08:49:01 -08:00
Steven Dee
41ae6df7d7 unsigned integer literal in mug 2014-12-15 09:30:28 -05:00
cgyarvin
45332c2ca2 Merge pull request #212 from mrdomino/master
screw around with the warnings, fixing some, introducing others
2014-12-11 19:37:08 -08:00
Steven Dee
44d0079f9a Introduce some more warnings
Actually this only causes a few missing field initializer warnings to
show up in the jet code. I disabled sign-compare and unused-parameter
outright because they were too noisy.
2014-12-11 19:02:53 -05:00