codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 16:17:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
10801 commits 27 branches 0 tags 134 MiB
Commit graph

10801 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Erickson
fde11d8f0d Add fill defaults button to solutions treema node in level editor 2016-01-06 13:50:06 -08:00
Rob
86d9b081c1 Merge branch 'cashew' 2016-01-06 12:03:49 -08:00
Scott Erickson
d1e7055b1a Add code highlighting to solution treema nodes in level editor 2016-01-06 09:58:04 -08:00
Imperadeiro98
9b2cfeafb1 Merge pull request #3300 from xavismeh/master 
Enhanced french translation
 2016-01-06 14:30:48 +00:00
Imperadeiro98
a8d4d68da8 Remove duplicate key from LevelSystem.coffee 2016-01-06 14:24:22 +00:00
Xavier Coureau
f309f5dad3 Merge remote-tracking branch 'upstream/master' 2016-01-06 00:45:44 +01:00
Nick Winter
7864d3708b Change traditional Chinese label to be in traditional Chinese 2016-01-05 15:20:22 -08:00
Nick Winter
568f04ac39 Merge pull request #3296 from taptapdan/fix-issue-3264 
Fix isSilhouettedItem
 2016-01-05 14:20:23 -08:00
Nick Winter
c15b67f654 Merge pull request #3297 from taptapdan/fix-issue-3294 
Fix Earned Achievements Check
 2016-01-05 14:16:42 -08:00
ryang217
c29db142a1 Add locale keys for Robin About Page entry 
Adding onto 57ed2fa.
 2016-01-05 14:02:08 -08:00
ryang217
57ed2fae67 Added Robin to About page 2016-01-05 13:04:02 -08:00
Imperadeiro98
34cc8c07dd Merge pull request #3298 from Goby-Wan/master 
Updates FR locale file
 2016-01-05 17:06:39 +00:00
GOBY Alexandre
86af16cead Merge pull request #1 from Goby-Wan/Goby-Wan-patch-1 
Update fr.coffee
 2016-01-05 17:40:52 +01:00
GOBY Alexandre
061509dfb3 Update fr.coffee 2016-01-05 17:35:57 +01:00
Xavier Coureau
87741c6e93 Enhanced french translation 2016-01-05 16:19:54 +01:00
Daniel Fiore
a215c2e01c Fix Earned Achievements Check 2016-01-04 19:23:14 -08:00
Rob
3b4433e312 Use hero instead of this. Also use published aether package. 2016-01-04 17:23:58 -08:00
Rob
3baea9683c Additional java support. 2016-01-04 16:41:24 -08:00
Scott Erickson
220c124780 Remove enum from user gender string 
Fixes a bug where when logging in with G+ with profile gender 'other', login doesn't fail silently.
 2016-01-04 16:34:50 -08:00
CodeCombat
41a532cb50 WIP - cashew integration 2016-01-04 16:27:27 -08:00
Daniel Fiore
9ccb0dd3cb Fix isSilhouettedItem 
This fixes #3264. Checks were failing in cases where no gold amount was
set and tier was 0. Checks are now using existential operator to ensure
null/undefined.
 2016-01-02 16:10:03 -08:00
Imperadeiro98
20c9d3fca2 Merge pull request #3293 from Ikuyadeu/patch-1 
Update ja.coffee
 2016-01-01 22:37:14 +00:00
Yuki Ueda
9159ee3490 Update ja.coffee 2016-01-01 19:05:03 +09:00
Imperadeiro98
e19e997126 Merge pull request #3287 from JurianLock/patch-2 
Update nl-NL.coffee
 2015-12-29 15:03:54 +00:00
Imperadeiro98
c27c4e100a Merge pull request #3286 from JurianLock/patch-1 
Update nl-NL.coffee
 2015-12-29 14:53:27 +00:00
Rob Blanckaert
0fe700b6bf Add healthcheck route 2015-12-29 00:03:43 -05:00
JurianLock
2ab3033e21 Update nl-NL.coffee 2015-12-29 02:34:39 +01:00
JurianLock
b9239503f9 Update nl-NL.coffee 2015-12-29 00:33:05 +01:00
Nick Winter
187a6f87a9 Include course info in contact message session links 2015-12-28 08:15:48 -08:00
Imperadeiro98
f369c73b2a Remove unnecessary sound 2015-12-28 16:11:09 +00:00
Nick Winter
972243ae50 Merge pull request #3283 from Imperadeiro98/master 
Use view in template
 2015-12-28 06:37:29 -08:00
Imperadeiro98
bf6601c3cc Fix for GenerateTerrainModal 2015-12-26 21:56:05 +00:00
Imperadeiro98
b7ba677b00 Use view in template 2015-12-26 14:21:06 +00:00
Imperadeiro98
bfeee90f51 Merge pull request #3282 from Nainufar/patch-6 
Update ca.coffee
 2015-12-26 12:27:00 +00:00
Nainufar
718d546354 Update ca.coffee 
more translations :)
 2015-12-26 12:37:24 +01:00
Nick Winter
208073ffdb Fix saving levels from #3276 refactoring 2015-12-24 11:21:12 -08:00
Nick Winter
e9e7416c8f Merge branch 'zxcpoiu-master' 2015-12-24 06:37:47 -08:00
Nick Winter
35a18eadb4 Merge zh-HAN*.coffee 2015-12-24 06:37:40 -08:00
Nick Winter
c0d58c3786 Tweak style and add i18n for #3280 2015-12-24 06:34:54 -08:00
Nick Winter
00fe5a6c0c Merge pull request #3280 from thepulkitagarwal/master 
Add level to user profile page
 2015-12-24 06:32:38 -08:00
Pulkit Agarwal
357e8c0bcd Add level to user profile page 2015-12-24 15:52:30 +05:30
Imperadeiro98
325c774b90 Update pt-PT.coffee 2015-12-23 23:22:54 +00:00
Nick Winter
71fc8d5230 Don't risk destruction of level unlock links 2015-12-23 12:08:09 -08:00
Nick Winter
55f7b4a115 Fix config refactoring 2015-12-23 12:08:07 -08:00
Nick Winter
d56ba6e1e8 Try upgrading webworker-threads 2015-12-23 10:34:01 -08:00
Nick Winter
40da26f99c Remove misc typo. Fix NewModelModal name field focus while at it. 2015-12-23 10:33:55 -08:00
Nick Winter
08f983db59 Propagate i18n 2015-12-23 10:07:32 -08:00
Nick Winter
a82f80bacb Fix client test LevelLoader Thang URLs 2015-12-23 09:34:27 -08:00
Nick Winter
8fb358425d Merge pull request #3270 from sasha-bichkov/master 
Refactor Level.coffee
 2015-12-23 08:56:00 -08:00
Nick Winter
130b67d6ce Merge pull request #3273 from codecombat/clean-i18n 
Remove unused i18n strings
 2015-12-23 08:52:47 -08:00