Scott Erickson
f2d21b960f
Added a delta subview for displaying deltas of schema'd data.
2014-04-09 16:09:35 -07: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
Nick Winter
c226835ff2
Fixed a couple bugs in custom TreemaNodes.
2014-04-08 17:13:05 -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
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
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
Glen De Cauwsemaecker
fabaa416ce
Windows installer v2.0
2014-04-08 03:55:21 +02:00
Alex
f798142b87
Update uk.coffee
2014-04-08 01:51:40 +03:00
Alper ALIN
51847c77ce
Update tr.coffee
2014-04-08 00:40:25 +03: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
Michael Schmatz
17c1bb7344
Fixed transactional mail auth and added 2 week email
2014-04-07 09:51:32 -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
Glen De Cauwsemaecker
9cc15bb233
Merge pull request #791 from Vindurrin/patch-1
...
Update es-ES.coffee
2014-04-06 12:04:22 +02:00
1c7
13cfba91a8
add myself into diplomat.jade
2014-04-06 11:56:25 +08:00
Vindurrin
7a8f3849a6
Update es-ES.coffee
...
Line #231 , “Atajos de teclado” means “Keyboard Shortcuts” — let me know if this isn’t close enough to what is meant by “Key Bindings”: the reason that I chose this phrase is because I don’t know of an exact or approximate translation of “key bindings” into Spanish, but several other software platforms have used the phrase “atajos de teclado” to express this meaning.
2014-04-05 21:09:10 -04:00
Evelyn Solorzano
af887fd4b8
Update es-419.coffee
...
Translated some commented lines up to play: category
2014-04-05 18:21:05 -05:00
Scott Erickson
8fe568d3a4
Fixed schema loading.
2014-04-05 11:48:21 -07:00
1c7
51142627d4
translate app/locale/zh-HANS.coffee
2014-04-05 14:34:21 +08:00
1c7
0911556c39
Chinese translate for windows automatic tool
2014-04-05 14:10:47 +08:00
Scott Erickson
abaf32fc7a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-04 14:57:55 -07:00
Michael Schmatz
2411269f2b
Added rank/number of sessions text
2014-04-04 14:55:55 -07:00
Michael Schmatz
0684bcff9c
Improved styling on graphs
2014-04-04 14:22:30 -07:00
Scott Erickson
2093049f5c
Fixed a bug with the profile view caused by the new page loading system.
2014-04-04 13:59:40 -07:00
Michael Schmatz
06f164525f
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
app/views/play/ladder/ladder_tab.coffee
2014-04-04 13:48:39 -07:00
Michael Schmatz
7019bb6dea
Added score histogram to ladder tab
2014-04-04 13:38:36 -07:00
Scott Erickson
1971ddcefb
Moved somethingLoaded calls until after calls that would register more to load. A probably suboptimal way of making sure the progress numerator never reaches the progress denominator until it's actually time.
2014-04-04 10:12:22 -07:00
