Scott Erickson
9c8841e838
Merge remote-tracking branch 'origin/master'
2014-04-22 16:42:50 -07:00
Scott Erickson
5921575a02
Hack to fix a bug with the components view in the thang editor.
2014-04-22 16:42:41 -07:00
Glen De Cauwsemaecker
afc447e596
Removed double got_questions i18n tag in en.coffee from commit e439e3f
2014-04-22 23:47:11 +02:00
Glen De Cauwsemaecker
7da89e8b00
Merge branch 'master' of https://github.com/JasperDhaene/codecombat into jasper-master
2014-04-22 23:44:50 +02:00
Michael Schmatz
7419b269f1
Merge pull request #894 from codecombat/feature/worker-lint
...
Background linting/transpilation/hasChangedSignificantly
2014-04-22 12:05:03 -07:00
Michael Schmatz
6122d31e28
Removed web worker logging listener
2014-04-22 12:03:33 -07:00
Michael Schmatz
3110e6e56a
Renamed test_worker to aether_worker
2014-04-22 11:58:27 -07:00
Michael Schmatz
392dbb9f8d
Removed superfluous comment
2014-04-22 11:51:51 -07:00
Michael Schmatz
3bbedbc100
Added background transpile
2014-04-22 11:46:17 -07:00
Nick Winter
ab77176ed0
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-22 11:11:10 -07:00
Nick Winter
675db1b76f
Don't require CocoModel instantiation before schemas are included. Reload neutral spells on reload. Fix for adding Components to Thangs. Surface background: darkness, no parents.
2014-04-22 11:11:08 -07:00
Michael Schmatz
e0f8d1343e
Fixed race condition
2014-04-22 11:04:56 -07:00
Scott Erickson
5294bad097
Archiving the script I used to migrate emailSubscriptions to emails.
2014-04-22 11:03:33 -07:00
Scott Erickson
bb0cbf1151
Removed some old code that didn't work out.
2014-04-22 10:43:08 -07:00
Scott Erickson
e8da248302
Made the level editor not break when using units that are incomplete.
2014-04-22 10:39:15 -07:00
Michael Schmatz
81809956b8
hasChangedSignificantly async refactor
...
Still checking for bugs
2014-04-22 08:54:35 -07:00
Scott Erickson
684c76194d
Merge branch 'master' into production
2014-04-21 18:23:22 -07:00
Scott Erickson
f57be1ae52
Migrated to the new email system, along with a setting for recruit notifications.
2014-04-21 16:15:23 -07:00
Michael Schmatz
0f435b41ae
Merge pull request #885 from codecombat/master
...
Merge master into worker-lint
2014-04-21 14:13:43 -07:00
Scott Erickson
1e50ef36ce
Merge branch 'RefactorAndDeltaSystemNaming' of https://github.com/dpen2000/codecombat into dpen2000-RefactorAndDeltaSystemNaming
2014-04-21 12:53:11 -07:00
Michael Schmatz
605b309e8b
Merge pull request #883 from codecombat/master
...
Master into production
2014-04-21 10:57:42 -07:00
Michael Schmatz
69ef951dba
Merge pull request #874 from dpen2000/FixSystemsListDeltaIssue
...
Fix deltas referring to last system saved
2014-04-21 10:56:53 -07:00
JasperDhaene
e439e3fec8
added missing i18n tag
2014-04-21 19:56:38 +02:00
JasperDhaene
c49dc9457d
fixed some lines to fit proper context
2014-04-21 19:54:14 +02:00
JasperDhaene
4d7e6ba849
fixed some lines to fit proper context
2014-04-21 19:52:27 +02:00
JasperDhaene
6a1d43435a
fixed some lines to fit proper context
2014-04-21 19:50:43 +02:00
Michael Schmatz
486d1b75ff
Changed moar to More
2014-04-21 10:40:22 -07:00
Nick Winter
7b03483476
Merge pull request #879 from DanielRodriguezRivero/patch-4
...
Update es-ES.coffee
2014-04-21 10:36:11 -07:00
Daniel
baff84f0ae
Update es-ES.coffee
...
Hi!
I have translated the remaining lines. I have not tested all the text yet in order to remove overflowing or cut off texts (I had to modify two lines to avoid a couple of linguistic bugs) but I hope to do it soon.
Cheers!
2014-04-21 01:13:34 +02:00
Nick Winter
5e2f3ac7cb
Merge pull request #878 from JasperDhaene/master
...
Update Dutch locale
2014-04-20 13:21:07 -07:00
JasperDhaene
ef9ee024e1
update nl-NL.coffee
2014-04-20 21:34:43 +02:00
JasperDhaene
ad212d428c
update nl-BE.coffee
2014-04-20 21:33:19 +02:00
JasperDhaene
6a03ddad74
Update nl.coffee
2014-04-20 21:31:11 +02:00
Nick Winter
6fa3d81fa1
Merged, fixed conflicts, restored rest of file.
2014-04-20 11:44:44 -07:00
Nick Winter
a829f3a537
Merge branch 'patch-2' of git://github.com/kinez/codecombat
2014-04-20 11:42:05 -07:00
Jasper D'haene
62ef17c776
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-20 20:33:16 +02:00
Nick Winter
baca3876ca
Merge pull request #869 from treby/improve_ja_resources
...
Updated for Japanese(ja).
2014-04-20 11:20:46 -07:00
Inez KEMENES
4a2bcc2030
Update hu.coffee
2014-04-20 19:04:07 +02:00
Nick Winter
05dfa21a93
Fixed #872 . Removed permissions check on old versions of document for version history, because we're not selecting any sensitive fields anyway.
2014-04-19 17:52:17 -07:00
Nick Winter
f281aa8e2d
Fixed quotes.
2014-04-19 17:43:01 -07:00
Nick Winter
b806436232
Merge branch 'patch-3' of git://github.com/julycoolwind/codecombat into julycoolwind-patch-3
2014-04-19 17:40:58 -07:00
Nick Winter
0787349d32
Merge pull request #873 from dpen2000/patch-1
...
Modify links on community page
2014-04-19 17:38:20 -07:00
Nick Winter
4249ddce15
Merge pull request #868 from M-r-A/i18n
...
Update ru
2014-04-19 17:34:34 -07:00
dpen2000
de69f740e4
Fix deltas referring to last system saved
...
If a system is added, it is added to treema at the end of the list of systems. Treema then raises it's changed event resulting in this order being set on the level. The next time a system is added, the first system is in it's correct position and so the delta shows it as moving. This changes ensures we save the correct order in the first instance.
2014-04-19 19:59:21 -04:00
dpen2000
c241b06f76
Modify links on community page
2014-04-19 20:03:22 +01:00
Scott Erickson
6641e60f2d
Merge branch 'master' into production
2014-04-19 10:28:57 -07:00
Scott Erickson
044556e5a4
Fixed a bug with the level editor that prevented selecting thangs to add.
2014-04-19 10:27:14 -07:00
林鑫
984f2c2cc4
Translate some items under common,account_settions,employers,play_level.
2014-04-19 23:22:03 +08:00
Alexei Nikitin
ac47a88c39
Update ru
2014-04-19 13:54:51 +04:00
treby
fb2bf865cd
Added some translation for Japanese.
2014-04-19 16:42:34 +09:00
