codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-29 18:45:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
3646 commits 27 branches 0 tags 134 MiB
Commit graph

3646 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
c1948ab083 Merge branch 'master' into production 2014-06-11 19:38:59 -07:00
Nick Winter
77920b5416 Improvements to profile views. Added links to players' code. 2014-06-11 19:38:47 -07:00
Scott Erickson
8a728cbb64 More switching of user objects from save to patch. 2014-06-11 14:17:31 -07: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
Jayant Jain
ed95206868 Enables moving around the map while an addThang is selected 2014-06-12 01:50:24 +05:30
Scott Erickson
6d15b5e631 Working on User patching. 2014-06-11 13:16:17 -07:00
Scott Erickson
7fd87f2605 Merge branch 'rubenvereecken-server-test-fix' 2014-06-11 11:40:50 -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
d2de39076d Another attempt at fixing travis server tests. 2014-06-11 11:38:08 -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
eb433c6591 Having another go at getting travis to run server tests. 2014-06-11 10:06:28 -07:00
Lucas Castro
60a0a6ee80 Update pt-BR.coffee 2014-06-11 14:04:19 -03:00
Lucas Castro
fe9e584767 Update pt-BR.coffee 2014-06-11 14:00:52 -03:00
Scott Erickson
d0ac09122f Forcing the server to return 200 rather than 304 to requests for the main html file, hopefully fixing some authentication/caching issues. 2014-06-11 09:53:32 -07:00
Nick Winter
cb378c13e2 Fixed employer list template typo. 2014-06-11 09:15:41 -07:00
Nick Winter
a9356fdc93 Merge pull request #1142 from Xercoy/patch-1 
Added more names for #53
 2014-06-11 07:24:55 -07:00
Jayant Jain
d5d20377a2 Removes panning upon right click in editor 2014-06-11 15:05:59 +05:30
barbuddha
d361ab5809 Update ru.coffee 2014-06-11 09:56:15 +04: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
Nick Winter
0527ca7229 Merge branch 'master' into production 2014-06-10 16:51:46 -07:00
Nick Winter
69fc378930 Final tournament update blurb. 2014-06-10 16:51:36 -07:00
Nick Winter
f3d18efa90 Added employer_list and activity tracking. 2014-06-10 16:30:13 -07:00
Scott Erickson
9c1213d3c4 Removed the migration plugins. 2014-06-10 15:04:48 -07:00
Michael Schmatz
6d7864c415 Removed some superfluous code 2014-06-10 14:34:16 -07:00
Scott Erickson
b414886878 Merge branch 'master' into production 2014-06-10 13:21:19 -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
Corey Prak
8448061f7b Added more names for #53 2014-06-10 12:52:06 -04:00
Nick Winter
86223167af Re-added significant trailing whitespace. 2014-06-10 07:46:43 -07:00
Lucas Castro
132a7b62f1 Update pt-BR.coffee 2014-06-10 11:04:02 -03:00
Nick Winter
482558bfe0 Merge branch 'master' into production 2014-06-09 22:18:26 -07:00
Nick Winter
22ca9507d0 Upgrades to employer's candidate indexing. 2014-06-09 22:17:53 -07:00
Nick Winter
6703f7a1fc Merge branch 'master' into production 2014-06-09 21:12:12 -07:00
Nick Winter
dd2c7fab60 Updated Danger Minefield icon. 2014-06-09 21:11:59 -07:00
Nick Winter
481666d65f Merge pull request #1139 from Darredevil/patch-8 
Added new level
 2014-06-09 21:02:07 -07:00
Scott Erickson
7211a82d2c Attempting to get TravisCI set up to run server tests by having it install mongodb. 2014-06-09 17:04:51 -07:00
Scott Erickson
3a8b01b058 Attempting to get TravisCI set up to run server tests. 2014-06-09 15:07:39 -07:00
Darredevil
82f33a35de Fixed id 2014-06-09 22:37:34 +03:00
Darredevil
da1d0e5361 Added new level 
Added a new prime-sieve level
 2014-06-09 22:29:02 +03:00
Nick Winter
991721eb90 Merge branch 'master' into production 2014-06-08 23:37:12 -06:00
Michael Schmatz
693da57f13 Merge branch 'feature/linkedin-profile-import' 
Conflicts:
	app/templates/account/profile.jade
	app/views/account/profile_view.coffee
 2014-06-08 18:37:33 -07:00
Michael Schmatz
ad80fcf229 Removed linkedIn callback, disabled autosave 2014-06-08 18:21:56 -07:00
Michael Schmatz
f29a41f108 Add linkedIn link, field of study support to LinkedIn import 2014-06-08 18:15:18 -07:00
Nick Winter
bb5d23e6ba Wrapped LinkedIn button in a .btn. 2014-06-08 18:51:45 -06:00
Michael Schmatz
7ec3910e36 Make LinkedIn import more robust 2014-06-08 17:38:02 -07:00
Nick Winter
dde45262b0 Merge branch 'master' into production 2014-06-08 11:52:32 -06:00
Nick Winter
6597b687eb Only start profiles in edit mode if they are yours. 2014-06-08 11:52:16 -06:00
Nick Winter
89888b0502 Merge pull request #1135 from kumabotz/fix-indentation-and-typo 
Fix indentation and typo
 2014-06-08 11:16:01 -06:00