Commit Graph

7576 Commits

Author SHA1 Message Date
Fang
a114dc7e06 Fix off-by-one error when updating old messages. 2017-12-11 01:00:26 +01:00
Ted Blackman
c663b95bfb
Merge pull request #476 from Fang-/talk-web-unbind
Webtalk now drops unused subscriptions.
2017-12-09 14:40:22 -08:00
Ted Blackman
7aa8150639
Merge pull request #475 from Fang-/talk-fix-present
Fix erroneous presence handling
2017-12-09 14:39:01 -08:00
Fang
82307e2842 Webtalk now drops unused subscriptions.
Matches urbit/talk#40
2017-12-09 22:08:45 +01:00
Ted Blackman
570feee8c5
Merge pull request #474 from Fang-/talk-fix-gramless
Fix backlog loading/eyre dig over issue with webtalk
2017-12-09 12:30:28 -08:00
Fang
60d9bdd0e0 Updated talk/main.js in accordance with updates to urbit/talk#38 2017-12-09 21:28:46 +01:00
Fang
b8109d5b95 Ignore %status and %config diffs that wouldn't actually change anything. 2017-12-09 17:45:43 +01:00
Fang
66f87e1fab Ignore %present commands that wouldn't actually change anything. 2017-12-09 17:33:36 +01:00
Fang
3e0a681c2b A %remove status diff now *actually* removes the status. 2017-12-09 17:17:57 +01:00
Fang
24720da81b Include main.js for webtalk from urbit/talk#38 2017-12-09 15:01:23 +01:00
Fang
100f0cb431 Don't put any grams into the prize if they weren't requested. 2017-12-09 14:59:29 +01:00
Anton Dyudin
9ca88b9a06 move .deb download to .travis so it doesn't get synced in 2017-12-08 16:08:29 -08:00
Anton Dyudin
5a412016db use github .deb release instead of pinned CI binary 2017-12-08 16:02:30 -08:00
Ted Blackman
211045abdd
Merge pull request #471 from Fang-/talk-hotfix-count
[hotfix] Reload message counts that got out of sync
2017-12-08 14:53:02 -08:00
Fang
6a162cd5d9 Reset stories' count to be equal to (lent grams) in ++prep. 2017-12-08 23:05:47 +01:00
Ted Blackman
a5fee17a3a
Merge pull request #470 from Fang-/talk-hotfix-2-of-2
[HOTFIX] Talk: clean up transitionary hotfix code
2017-12-08 10:21:32 -08:00
Ted Blackman
c5ced61d15
Merge pull request #469 from Fang-/talk-hotfix-1-of-2
[HOTFIX] Talk: implement ++quit arms
2017-12-08 10:18:00 -08:00
Fang
97a09f4214 Clean up transitionary code for the talk ++quit fix. 2017-12-08 16:00:40 +01:00
Fang
21f0f55d25 Implements ++quit arms for talk, so that it can recover from losing connection to hall. 2017-12-08 15:58:58 +01:00
Anton Dyudin
2fb9ce78d5 fix |reset trying to pull /===/sys/ovra 2017-12-07 17:43:16 -08:00
Anton Dyudin
beaa8ec4c5 Merge branch 'newmodel' 2017-12-07 13:04:32 -08:00
Anton Dyudin
ccaffc55e6 [ci] update pinned vere binary 2017-12-07 13:00:01 -08:00
Keaton Dunsford
81d22528c0 Ames protocol version 7 2017-12-07 11:56:09 -08:00
Ted Blackman
60cffd62ce
Merge pull request #452 from Fang-/remaint-merge-talk
Hall (New Talk): the PR
2017-12-07 11:14:58 -08:00
C. Guy Yarvin
7d4a6d808f Fix compiler error. 2017-12-07 11:07:30 -08:00
C. Guy Yarvin
2ce5e27447 Rename ovra to arvo. 2017-12-07 10:13:34 -08:00
C. Guy Yarvin
7d4b35c86b Remove non-shipping code. 2017-12-07 09:56:45 -08:00
C. Guy Yarvin
befec1ddc0 Adjust spacing. 2017-12-07 08:48:06 -08:00
C. Guy Yarvin
2d30ac17a4 Conservative commit without time increase. 2017-12-06 22:01:38 -08:00
C. Guy Yarvin
caa44d977f Temporarily revert ++musk expansion. 2017-12-06 21:30:05 -08:00
C. Guy Yarvin
98a6ea3707 Easiest things first. 2017-12-06 21:28:11 -08:00
C. Guy Yarvin
c282baaf51 Update for repainting. 2017-12-06 21:27:29 -08:00
C. Guy Yarvin
2eff9cab87 Merge remote-tracking branch 'origin/master' into newmodel 2017-12-06 17:53:44 -08:00
C. Guy Yarvin
40645b0a19 Hand patch. 2017-12-06 17:53:17 -08:00
C. Guy Yarvin
732c7803c8 Unrevert. 2017-12-06 17:51:26 -08:00
Anton Dyudin
67034edf14 fix single +solid 2017-12-06 17:31:28 -08:00
C. Guy Yarvin
9d2d8710eb Revert broken solid. 2017-12-06 17:13:26 -08:00
C. Guy Yarvin
cc324f5db7 Minor cleanups. 2017-12-06 16:30:29 -08:00
C. Guy Yarvin
bb62dfe35d Instrumented and disabled ++aq; ^% hard blows. 2017-12-06 16:19:10 -08:00
C. Guy Yarvin
95ba547327 Seems to work but with performance/overflow issues. 2017-12-06 16:19:10 -08:00
C. Guy Yarvin
797d40d6ff New ++ax seems almost working. 2017-12-06 16:19:10 -08:00
C. Guy Yarvin
f421c2e057 New ++al (++ax in h.h) passes smoke test. 2017-12-06 16:19:10 -08:00
C. Guy Yarvin
a4c9bdc69f Move %wtts to %fits; clean up %xray. 2017-12-06 16:19:10 -08:00
C. Guy Yarvin
98e0fa51f6 Initial commit of new model system. 2017-12-06 16:19:10 -08:00
Anton Dyudin
c4fd65de92 fix /+ old-zuse for move-json merge 2017-12-06 14:49:26 -08:00
Fang
c46f1e0ccb
Merge pull request #1 from belisarius222/remaint-merge-talk
fix fora import
2017-12-06 23:27:48 +01:00
Ted Blackman
33ef3928dd fix fora import 2017-12-06 14:24:24 -08:00
cgyarvin
540ba66506
Merge pull request #458 from ohAitch/move-json
move ++json and other above-arvo types to zuse
2017-12-06 13:25:44 -08:00
cgyarvin
ca0ad49ef1
Merge pull request #456 from ohAitch/cleaner-deco
clean up / improve coverage of :> :< implementation
2017-12-06 12:59:15 -08:00
Anton Dyudin
25809f120e fix conflict-resolution for new twig type 2017-12-06 12:12:06 -08:00