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
3601 commits 27 branches 0 tags 134 MiB
Commit graph

3601 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tery Lim
cb8a2b36c6 Fix typo (missing e) 2014-06-09 00:35:59 +08:00
Tery Lim
4036532680 Fix indentation 2014-06-09 00:35:35 +08:00
Nick Winter
21a6dbdcaa Merge branch 'master' into production 2014-06-07 22:19:54 -06:00
Scott Erickson
1b166028c6 Turned off Backbone.Mediator validation for tests. 2014-06-07 19:08:38 -07:00
Nick Winter
cefeb1df14 Fixed backwards Approved button and candidate time sort. 2014-06-07 19:58:33 -06:00
Scott Erickson
3aaf02446d Another stab at fixing TravisCI, which tried to run karma through /node_modules/.bin and failed. 2014-06-07 18:36:56 -07:00
Scott Erickson
ac488eb196 A stab at fixing TravisCI, which choked on npm installing karma 0.10. 2014-06-07 18:27:04 -07:00
Scott Erickson
01c20f4065 Fixed karma tests. 2014-06-07 18:15:57 -07:00
Scott Erickson
5104f0a1e7 Fixed source maps for when test files error out. See https://github.com/brunch/brunch/issues/842 2014-06-07 16:41:19 -07:00
Scott Erickson
2cbc33d66d Fixed jasmine-ajax setup/reset. 2014-06-07 16:41:19 -07:00
Nick Winter
63a3aa9074 Fixes for browsing profiles by username. 2014-06-07 17:33:14 -06:00
Michael Schmatz
4072c1b969 Basic functionality done, needs validation error handling 
As well as formatting
 2014-06-07 11:45:49 -07:00
Nick Winter
1df653eb8d Merge branch 'master' into production 2014-06-07 00:33:50 -06:00
Nick Winter
67b10474e8 Suggested improvements to profile pages. 2014-06-07 00:33:18 -06:00
Scott Erickson
f0cdf6b2e2 Fixed #1111. 2014-06-06 16:47:48 -07:00
Nick Winter
d00c4c2af3 Propagate i18n. Merged in good stuff from 6b675f from kinez for hu.coffee. 2014-06-06 15:39:03 -06:00
Michael Schmatz
0c0084dd4b Make single game simulate another task if error 2014-06-06 13:26:15 -07:00
Michael Schmatz
31bb9c8807 Fixed error handling for results with no taskID 2014-06-06 12:47:10 -07:00
Michael Schmatz
1486f31c37 Stop headless simulator from exiting if error 2014-06-06 12:26:28 -07:00
Michael Schmatz
24452026d1 Minor fix for simulator logic 2014-06-06 12:18:02 -07:00
Michael Schmatz
1e0e5b0b77 Merge pull request #1131 from codecombat/master 
Master into production
 2014-06-06 09:57:59 -07:00
Nick Winter
51f7aa1743 Merge pull request #1130 from Nichiatu/patch-1 
Updates to norwegian translation
 2014-06-06 10:17:19 -06:00
Michael Schmatz
281b6968d6 Make level session selection random 
Rather than weighted random on submission time
 2014-06-05 17:14:26 -07:00
Scott Erickson
49c9c6bfc9 Built the client test view (rebased from feature/testclient). 2014-06-05 16:56:29 -07:00
Michael Schmatz
435ec1b6aa Various improvements to transpire script 2014-06-05 16:48:31 -07:00
Nichlas Torgersen
657182c8c0 Updates to norwegian translation 
I noticed there were some misspellings and grammar errors which I corrected. Especially the sign in-message, it went along the lines in norwegian as: "Draw yourself in", that doesn't make sense now does it.

Also removed some unneeded capitalizations, norwegian grammar is all about that and how you build a word. Most words can be combined into one, like in english: "Door handle" would be "Doorhandle" if english was using norwegian grammar rules.
 2014-06-06 01:44:05 +02:00
Michael Schmatz
eba3f36f0b Fixed headless client and transpile script 
Really need to reactor the worker worlds to one script.
 2014-06-05 14:06:32 -07:00
Nick Winter
cfe8394440 Merge branch 'master' into production 2014-06-05 12:44:18 -06:00
Nick Winter
b5d52dac17 Removed finished ChallengePost banner. 2014-06-05 12:44:02 -06:00
Nick Winter
694b0c9397 Merge branch 'ChrisLightman-patch-4' 2014-06-05 10:28:44 -06:00
Nick Winter
47b99adddf Uncommented some fr.coffee section headers to go with the new translations. 2014-06-05 10:28:40 -06:00
Clement
9895432dd2 Syntax Update and Traduction Update 2014-06-05 18:03:33 +02:00
Nick Winter
2f30b1b365 Merge pull request #1128 from ChrisLightman/patch-3 
Big Update /// Syntax Correction and Traduction
 2014-06-05 08:10:44 -06:00
Clement
a7d0b540cd Big Update /// Syntax Correction and Traduction 2014-06-05 13:35:03 +02:00
Nick Winter
0b2d5c251d A bit more Worker hardening. 2014-06-04 15:47:09 -06:00
Nick Winter
f493f407c2 Fixed some bugs on job profile initialization. 2014-06-04 15:38:57 -06:00
Michael Schmatz
cd4d618f42 Merge pull request #1126 from codecombat/master 
Master into production
 2014-06-03 12:40:04 -07:00
Scott Erickson
8f6187125d Fixed saving new settings for a level. 2014-06-03 12:27:53 -07:00
Nick Winter
143597dc0f Merge pull request #1124 from ChrisLightman/patch-2 
Update Line 723-734 : Full Traduction
 2014-06-03 08:26:54 -07:00
Nick Winter
bebb200090 Merge pull request #1122 from ChrisLightman/patch-1 
Update fr.coffee
 2014-06-03 08:26:44 -07:00
Scott Erickson
f114d71d9d Merge branch 'rubenvereecken-achievements_production' 2014-06-02 13:16:03 -07:00
Ruben Vereecken
ed44ab5f7d Improved logging (winston) and admin-only'd the achievement editor 2014-06-02 21:07:23 +02:00
ChrisLightman
12da959550 Update Line 723-734 : Full Traduction 2014-06-02 20:52:49 +02:00
Ruben Vereecken
8d2c62ba84 Got repeatables working flawlessly and improved the achievement popup by a great deal 2014-06-02 20:34:05 +02:00
Ruben Vereecken
bb57756cd9 Processed Scott's feedback. Db endpoint slightly safer, some refactorings. 2014-06-02 20:33:01 +02:00