Tery Lim
9090ce7714
Merge master into branch
2014-07-04 22:37:16 +08:00
Scott Erickson
2855d2a402
Made the deltas lib conflict identifying library able to handle many-to-many conflicts.
...
Made conflict finding a bit more liberal, in that any messing with arrays (adding, removing or moving things inside) will conflict with any other such change.
2014-07-03 17:41:58 -07:00
Tery Lim
618ade4946
Clean up mixed quotes
2014-07-01 12:23:22 +08:00
Scott Erickson
d651885524
Maybe fixing the toggleModal system once and for all.
2014-06-18 12:04:38 -04:00
Scott Erickson
a3af0d2ea5
Got the PatchView demo working.
2014-06-16 11:40:09 -07:00
Scott Erickson
4932317982
Finally got the demo view working (mostly). Need to turn off third party ajax requests.
2014-06-16 11:40:08 -07:00
Scott Erickson
1786eab09d
Initial work on a demo view. But brunch won't build demo-app.js for some reason.
2014-06-16 11:40:08 -07:00
Scott Erickson
a1dd9a714e
Fixed #1153 .
2014-06-13 13:35:57 -07:00
Scott Erickson
8ab69cf833
Merge pull request #1138 from rubenvereecken/search-endpoint
...
Search endpoint is now without the /search prefix
2014-06-12 11:33:28 -07:00
Ruben Vereecken
fddca03417
Worked on achievement tests
2014-06-12 19:44:55 +02:00
Ruben Vereecken
925594ffe9
Took a detour to write tests for BadMethod. Queue's tests not working yet.
2014-06-12 19:42:36 +02:00
Ruben Vereecken
b66f4984c3
Finished basic functional tests for achievement
2014-06-12 19:42:30 +02:00
Ruben Vereecken
509be067c3
Added support for the operator in LocalMongo
2014-06-12 19:41:00 +02:00
Ruben Vereecken
fef72d8273
Finished Article tests to demonstrate search functionality
2014-06-12 19:19:34 +02:00
Ruben Vereecken
0751581113
Search endpoint is now without the /search prefix
...
Intermediate commit for search refactoring
2014-06-12 19:19:30 +02:00
Scott Erickson
4ecbc73c1c
Fixed client side testing on karma/travis with the new FacebookHandler tests.
2014-06-11 13:43:07 -07:00
Scott Erickson
08dde3623c
Disabling file server tests because currently they choke Travis.
2014-06-11 13:38:01 -07:00
Scott Erickson
ea06bb3d52
Fixed server tests to exit when they are finished. jasmine-node will never exit unless all connections are closed.
...
This helped:
https://github.com/mhevery/jasmine-node/issues/318#issuecomment-43914090
2014-06-11 13:21:11 -07:00
Scott Erickson
6d15b5e631
Working on User patching.
2014-06-11 13:16:17 -07:00
Scott Erickson
b81daabaf8
Merge branch 'server-test-fix' of https://github.com/rubenvereecken/codecombat into rubenvereecken-server-test-fix
2014-06-11 11:39:58 -07:00
Scott Erickson
e6dc896bab
Reworking some code to use the new CocoModel.patch method.
2014-06-11 11:34:52 -07:00
Ruben Vereecken
8e33b6b534
Fixed all server-sided tests
...
NEVER. AGAIN
2014-06-11 20:17:27 +02:00
Scott Erickson
389d530eaa
Built a new 'patch' method for CocoModel, which saves only changed values to the server.
2014-06-10 20:59:37 -07:00
Scott Erickson
f0ff8c242e
Migrating language to codeLanguage on systems and components because they conflict with the search system.
2014-06-10 13:20:14 -07:00
Scott Erickson
f0cdf6b2e2
Fixed #1111 .
2014-06-06 16:47:48 -07:00
Scott Erickson
49c9c6bfc9
Built the client test view (rebased from feature/testclient).
2014-06-05 16:56:29 -07:00
Ruben Vereecken
699aa506f2
Added Local Mongo support for nested documents. Totally forgot those
2014-06-02 20:29:11 +02:00
Ruben Vereecken
e177912a5a
Added '$or' and '$and' to Local Mongo
2014-06-02 20:29:11 +02:00
Ruben Vereecken
b3bddbd785
Finished regular query selectors of Local Mongo
2014-06-02 20:29:11 +02:00
Ruben Vereecken
f2f4fef1e0
Wrote tests for the local mongo querier
2014-06-02 20:29:11 +02:00
dpen2000
64f91861ef
Refactor: Remove unused parameters in camera.spec and extend previous fix to ignored tests
2014-05-24 16:05:19 +01:00
dpen2000
b09bd8c5ce
Fix camera.spec.coffee tests after constructor change in ae64032739 and ignore one test still failing
2014-05-24 16:05:18 +01:00
Scott Erickson
f1927dcf35
Added a regressive test for e87592059b
2014-05-08 13:56:54 -07:00
Scott Erickson
1869bbe859
Merge branch 'tests' of https://github.com/adi2412/codecombat into adi2412-anonNameCollide
2014-05-05 16:49:15 -07:00
Scott Erickson
ed556f50be
Added reserved word checking for names.
2014-04-28 14:09:29 -07:00
Aditya Raisinghani
0cd5d0f4af
Added jasmine spec reporter and tests for anonymous name collisions.
2014-04-28 15:16:43 +05:30
Scott Erickson
20541f5520
Added another check to the recruit unsubscribe test, to make sure it doesn't affect other subscriptions.
2014-04-23 09:53:46 -07:00
Scott Erickson
b390b38054
Fixed a couple bugs and tests.
2014-04-23 09:19:07 -07:00
Scott Erickson
f7035d4220
Added an unsubscribe url for recruit notifications.
2014-04-22 19:27:39 -07:00
Scott Erickson
f57be1ae52
Migrated to the new email system, along with a setting for recruit notifications.
2014-04-21 16:15:23 -07:00
Scott Erickson
8adca4a1da
Added a transactional email for when changes are made, to notify watchers.
2014-04-17 17:30:55 -07:00
Scott Erickson
ed0c7e1412
Creators of documents are automatically added as watchers. Added a patch creation email for watchers.
2014-04-17 17:09:01 -07:00
Scott Erickson
c395a3414e
Merge branch 'master' into feature/jsondiffpatch
2014-04-15 15:18:57 -07:00
Scott Erickson
58b1019934
Switched listen to watch (would have been confusing with eye-con, and listenTo function in Backbone). Added watch button and patch badge to level editor.
2014-04-15 15:09:36 -07:00
Scott Erickson
06a61d214e
Fixed server tests.
2014-04-15 09:01:51 -07:00
Scott Erickson
94e75b852c
Removed a log.
2014-04-12 10:51:31 -07:00
Scott Erickson
30f785f7cf
Moved the model schemas into a models folder.
2014-04-12 10:51:02 -07:00
Scott Erickson
a3951b0fa7
Extended the save version modal to allow submitting patches.
2014-04-10 13:09:44 -07:00
Scott Erickson
2f988ba485
Made the server side of the patch system.
2014-04-08 19:26:19 -07:00
Scott Erickson
c382889748
Bunch of server changes, mainly adding all the JSON schema validation and fixing tests.
2014-04-08 14:10:50 -07:00
