Commit graph

2564 commits

Author SHA1 Message Date
Alper ALIN
a2ebcc6433 Update tr.coffee
a few changes
2014-04-09 12:31:25 +03:00
1c7
56c18441e4 use youku for Chinese Version 2014-04-09 13:50:13 +08:00
Scott Erickson
721648dadf Merge branch 'master' into feature/jsondiffpatch
Conflicts:
	bower.json
2014-04-08 19:29:43 -07:00
Scott Erickson
315ef7f7b8 Added jsondiffpatch to the client. Bower update everyone! 2014-04-08 19:26:34 -07:00
Scott Erickson
2f988ba485 Made the server side of the patch system. 2014-04-08 19:26:19 -07:00
Scott Erickson
ff73aecf08 Turned off sendwithus API during testing. 2014-04-08 19:08:33 -07:00
Glen De Cauwsemaecker
8362ddc1bb Git remote configuratin added and replaced setup root file by installer exe with icon 2014-04-09 02:59:06 +02:00
Nick Winter
c226835ff2 Fixed a couple bugs in custom TreemaNodes. 2014-04-08 17:13:05 -07:00
Glen De Cauwsemaecker
3bfced33d9 Merge https://github.com/codecombat/codecombat 2014-04-09 01:59:59 +02:00
Glen De Cauwsemaecker
d045e3a513 more updates for version 2.1 2014-04-09 01:59:52 +02:00
Glen De Cauwsemaecker
d01d9924a2 Localisation update and automatic script generation fix 2014-04-09 01:29:42 +02:00
Nick Winter
54cceb4311 Merge pull request #796 from adi2412/master
Moved nanoscroller to bower components
2014-04-08 15:59:28 -07:00
Nick Winter
3325c55c3f Fixed #759. 2014-04-08 14:58:34 -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
Glen De Cauwsemaecker
4bd058d1be Merge branch 'master' of https://github.com/1c7/codecombat 2014-04-08 16:25:29 +02:00
1c7
102c707fa9 Chinese Translate(zh-HANS.coffee) 2014-04-08 22:17:40 +08:00
Glen De Cauwsemaecker
e02087f4ed Merge pull request #798 from endrilian/patch-1
Update uk.coffee
2014-04-08 15:15:58 +02:00
Alexei Nikitin
33f26c3da0 Sync i18n 2014-04-08 12:23:16 +04:00
Glen De Cauwsemaecker
afbfa08416 fixed errors made in last contribution to the Turkish translation. 2014-04-08 09:06:11 +02:00
Glen De Cauwsemaecker
9c757213ca Merge branch 'patch-1' of https://github.com/ilisyus/codecombat 2014-04-08 09:00:42 +02:00
Alexei Nikitin
f8d6857633 Fix crlf 2014-04-08 10:50:58 +04:00
Glen De Cauwsemaecker
fabaa416ce Windows installer v2.0 2014-04-08 03:55:21 +02:00
Nick Winter
b96bca8c18 Finished most of basic features for job profiles. 2014-04-07 17:58:02 -07:00
Alex
f798142b87 Update uk.coffee 2014-04-08 01:51:40 +03:00
Alexei Nikitin
e87c0c4b91 Work on thang tab 2014-04-08 02:49:27 +04:00
Nick Winter
9af6694054 More work on the job profiles. 2014-04-07 15:21:05 -07:00
Alper ALIN
51847c77ce Update tr.coffee 2014-04-08 00:40:25 +03:00
Alexei Nikitin
5f062ad25c Work on revert, save modal 2014-04-08 01:38:46 +04:00
Aditya Raisinghani
89670526ba Removed nanoscroller code from main.html 2014-04-08 03:08:16 +05:30
Aditya Raisinghani
7cc9d22254 Moved nanoscroller to bower components and related fixes. 2014-04-08 03:04:36 +05:30
Alexei Nikitin
d64690e8d9 Work on fork modal 2014-04-08 00:29:40 +04:00
Alexei Nikitin
69406df0ed Work on create_new modal 2014-04-07 23:27:42 +04:00
Alexei Nikitin
630c44135a Work on wizard settings 2014-04-07 21:44:47 +04:00
Michael Schmatz
17c1bb7344 Fixed transactional mail auth and added 2 week email 2014-04-07 09:51:32 -07:00
Alexei Nikitin
9dab4b39e6 Update ru.coffee 2014-04-07 19:46:01 +04:00
Alexei Nikitin
6175a2af22 Update article model 2014-04-07 19:15:49 +04:00
OlenaGapak
780541ea58 Update uk.coffee
ukrainian localization
2014-04-07 15:35:09 +03:00
Nick Winter
1b79de0d86 Loading active candidate profiles from the database into a table for employers. 2014-04-06 17:01:56 -07:00
Nick Winter
4ae8927d09 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-06 15:08:27 -07:00
Nick Winter
d8999fb4f3 Got rid of the css of antiscroll in favor of nanoscroller. 2014-04-06 15:08:13 -07:00
Nick Winter
13f34341b2 Merge branch 'doubleScrollbars' of git://github.com/adi2412/codecombat 2014-04-06 14:55:14 -07:00
Nick Winter
4070aab48a Merge pull request #777 from Digot/patch-1
Update de.coffee
2014-04-06 14:37:43 -07:00
Nick Winter
06d846ccbf Fixed bugs with some i18n from #793; copied new i18n tags over. 2014-04-06 14:35:40 -07:00
Nick Winter
8f1ef4e3bb Merge pull request #793 from kinez/patch-4
Update hu.coffee
2014-04-06 14:26:06 -07:00
Nick Winter
31a170bf67 Merge pull request #771 from kinez/patch-2
Update hu.coffee
2014-04-06 14:24:38 -07:00
Nick Winter
69ba442261 Merge pull request #770 from kinez/patch-1
Update hu.coffee
2014-04-06 14:24:32 -07:00
Aditya Raisinghani
634ed82938 Fixed the background for spectate view 2014-04-07 01:00:35 +05:30
Inez KEMENES
7d3b7de8b4 Update hu.coffee 2014-04-06 16:49:00 +02:00
Glen De Cauwsemaecker
3feb694756 Merge pull request #788 from 1c7/master
Chinese translate for windows automatic tool
2014-04-06 12:17:01 +02:00
Glen De Cauwsemaecker
9ea8282b89 Merge pull request #790 from zloysmiertniy/patch-1
Update es-419.coffee
2014-04-06 12:12:44 +02:00