Ted Blackman
8db97cd3b7
fix merge problems; turned off +test-vale-error until type system is fixed
2018-08-20 11:19:14 -07:00
Ted Blackman
6ba2cb46fd
Merge remote-tracking branch 'cgy/ford-turbo-original' into ford-turbo
2018-08-20 10:32:44 -07:00
Curtis Yarvin
3c45fc55de
Smoke-test boots with full ford-turbo merge.
2018-08-19 16:06:19 -07:00
Elliot Glaysher
7d3ae8902a
WIP: Rename and 80 char.
2018-08-17 16:54:43 -07:00
Ted Blackman
85d55cef9d
typo
2018-08-17 15:30:13 -07:00
Ted Blackman
dfcbd29697
killed several TODOs
2018-08-17 15:27:47 -07:00
Curtis Yarvin
0bceb27dbe
Merge remote-tracking branch 'origin/ford-turbo' into ford-turbo-original
2018-08-17 15:26:51 -07:00
Curtis Yarvin
d062445ffb
Merge commit '89a0a' into ford-turbo-original
2018-08-17 15:04:31 -07:00
Curtis Yarvin
d2cfa0d78e
Remove debug.
2018-08-17 11:30:23 -07:00
Elliot Glaysher
3b8d2a4a9c
Fix test error strings.
2018-08-16 16:00:33 -07:00
Curtis Yarvin
8f45f30afa
Almost back to working.
2018-08-16 14:39:39 -07:00
Elliot Glaysher
e123410f03
General error message cleanup.
2018-08-16 14:38:50 -07:00
Elliot Glaysher
5d2f6f5885
Don't crash on incorrect +grab product type in marks.
2018-08-15 16:54:41 -07:00
Curtis Yarvin
fa9c4636f9
Merge branch 'research-tome' into ford-turbo-original
2018-08-15 16:48:37 -07:00
Elliot Glaysher
781e7e3add
Add jet hints, %hood caching, and a jab.
2018-08-15 16:39:25 -07:00
Elliot Glaysher
e804d0ff59
Create +jab:by which does +put and +get as mutation.
2018-08-15 14:06:24 -07:00
Elliot Glaysher
a6a78cea65
%keep in ford.
2018-08-15 13:48:41 -07:00
Elliot Glaysher
100cda2678
%wipe percentage
2018-08-15 13:07:39 -07:00
Elliot Glaysher
4a081f0fbd
Fix |mass
2018-08-15 10:47:15 -07:00
Elliot Glaysher
f09da3f962
Cleanup: remove , 80 chars, comments.
2018-08-14 16:39:23 -07:00
Elliot Glaysher
adfa3b25cd
Cache works. Tests pass. Boots.
2018-08-14 13:17:33 -07:00
Elliot Glaysher
c62b9f6655
First working cache; tests don't work yet.
2018-08-14 13:05:18 -07:00
Elliot Glaysher
dcedf1c8d9
WIP: Clock algorithm
2018-08-13 16:55:12 -07:00
Elliot Glaysher
35afbeeb07
Clean up +scry-blocks
2018-08-13 15:58:18 -07:00
Elliot Glaysher
e33c8e02bf
Stub +access-cache with +cache-key
2018-08-13 15:43:02 -07:00
Elliot Glaysher
91b0b59317
Cleanup of +make types in preperation for additional field.
2018-08-13 14:51:20 -07:00
Elliot Glaysher
dded51f0cd
Start %collections on startup, too.
2018-08-09 16:06:14 -07:00
Elliot Glaysher
11cb648399
Trying to get collections working
2018-08-09 14:59:33 -07:00
Elliot Glaysher
89a0a91c57
Boots without old ford.
2018-08-09 11:22:37 -07:00
Elliot Glaysher
81bd72ee21
WIP: Commiting so I can get the ~+ patch.
2018-08-08 14:47:01 -07:00
Elliot Glaysher
4363163319
Merge remote-tracking branch 'origin/collections-redesign' into ford-turbo-eyre-sec
...
Note: This ignores changes to clay for expediency, these may need to
be hand merged later.
2018-07-31 10:11:10 -07:00
Elliot Glaysher
7ebf6f262f
Make |mass work
2018-07-24 11:08:57 -07:00
Joe Bryan
9d72b8f92b
Merge branch 'collections' into collections-merge
...
* collections: (127 commits)
Revert "cross-ship permissions works now"
deleted more unused files, updated json arm of collections mark
removed unused index file (was used for debug)
cross-ship permissions works now
rendered MVE css and js 272af56804f822c23efa645aafcf1d5d8a8bfdff
simplified latest alias
new 'latest' page in colls
deleted a swp file
mve updates f83035d162dd60107b45798117cf924437070798
isaac's eyre changes to polling parameters as requested by Logan
rendered MVE f0a44584883e8789ec5bab9c80334ae0ee251e02
source new circle to inbox in collections app
relative href
removed topic text from collection json
patch back in realnet ames (was testnet ames in xship-wrap
collections now sends invites to whitelist
aded fascen to pass along fasbuc params
add x-htm wrappers for &htm
rename default eyre mark to x-urb, do xhsip on x- prefix requests
updated json endpoints in accordance with logan's requests
...
2018-06-19 20:51:22 -04:00
Curtis Yarvin
2c2a680c57
Introduced +$ notation.
2018-06-01 14:31:10 -07:00
Curtis Yarvin
2c6aeb1ac2
Enforce chapter titles.
2018-05-29 00:00:07 -07:00
Curtis Yarvin
3c3130c37d
Chapters with stub names.
2018-05-28 22:21:44 -07:00
Curtis Yarvin
bcd76e4caa
More renaming.
2018-05-27 13:01:04 -07:00
Curtis Yarvin
a29b22357d
Some renaming and stuff.
2018-05-27 12:15:15 -07:00
Curtis Yarvin
b9dd94cfc1
No comment.
2018-05-26 15:22:20 -07:00
Curtis Yarvin
a26105370b
Old help totally cleaned out.
2018-05-24 15:39:56 -07:00
Curtis Yarvin
d54462885b
Various fixes and improvements.
2018-05-22 23:43:56 -07:00
Curtis Yarvin
3fc02131c6
Partly removed cruft from +tome.
2018-05-20 16:59:29 -07:00
Curtis Yarvin
ac996f7335
Now ignoring ash/elm in foot.
2018-05-20 16:06:53 -07:00
Curtis Yarvin
7caa1f86e1
Eliminate chapters in +coil.
2018-05-16 14:51:20 -07:00
Curtis Yarvin
7c5b00a653
Removed help from cores; fixed +solid double
2018-05-10 17:35:26 -07:00
Curtis Yarvin
447a510ef8
Adjust vanes for research changes.
2018-05-03 17:59:10 -07:00
Curtis Yarvin
07fd6faab9
Merge branch 'master' into research-merge; broken
2018-05-03 10:51:39 -07:00
Fang
d681c5964c
Update existing usage of clay %w to take new result type into account.
2018-05-03 00:06:19 +02:00
C. Guy Yarvin
3ffa56cbbd
Fix previous commit.
2018-03-19 10:43:25 -07:00
C. Guy Yarvin
3afa0876d3
Stop using obsolete $~ syntax.
2018-03-18 21:18:20 -07:00
