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
Ting-Kuan
974e5e1b24
remove debugging msg.
2014-04-19 13:09:50 -04:00
Ting-Kuan
7321052c18
Fix supermodel with resource value and fix ladder view under supermodel resource management.
2014-04-19 13:06:47 -04:00
Ting-Kuan
375aca2c0a
Fix: Some level systems load forever.
2014-04-19 12:08:40 -04: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
Ting-Kuan
692693c181
Merge branch 'master' into feature/loading-views
...
Conflicts:
app/locale/en.coffee
app/views/editor/level/edit.coffee
app/views/kinds/CocoView.coffee
app/views/play/ladder/ladder_tab.coffee
app/views/play/ladder_view.coffee
app/views/play/level/level_loading_view.coffee
2014-04-19 01:15:04 -04:00
Ting-Kuan
b72a4ebd1a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-18 23:45:23 -04:00
Nick Winter
7186b414cf
Merge pull request #861 from onion7878/patch-1
...
Update zh-HANS.coffee
2014-04-18 17:49:55 -07:00
Nick Winter
bff71800b7
Added script to send out initial recruitment intro email.
2014-04-18 17:17:41 -07:00
Nick Winter
67112399a6
Merge branch 'master' into production
2014-04-18 15:28:42 -07:00
Michael Schmatz
a7867e5e2d
Added background linting
...
Background hasChangedSignificantly is soon!
2014-04-18 14:59:08 -07:00
dpen2000
75b759b1dc
Add system names into delta messages
2014-04-18 17:25:25 -04:00
dpen2000
b20f8fd260
Refactor getNameById to use mongo db's $in instead of parallel and use a new generic method in Handler.coffee
2014-04-18 21:06:57 +01:00
George Saines
fced3e821a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-18 13:02:11 -07:00
George Saines
71ee31ef49
styling the community page
2014-04-18 13:02:07 -07:00
Nick Winter
f38d17c64f
Protected candidates from view by employers they work(ed) at.
2014-04-18 12:48:13 -07:00
Pablo Guijarro Ramirez
0ef50ccdb7
Traducido varios textos del fichero es-ES.coffe al español de España
2014-04-18 20:04:26 +02:00
Nick Winter
a88089b7fc
Sass don't like that.
2014-04-18 09:54:27 -07:00
Nick Winter
848ebf2ffe
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-18 09:53:34 -07:00
Nick Winter
844c1391ca
Reworked top nav. Many improvements to job profile form.
2014-04-18 09:53:28 -07:00
Jasper D'haene
e94d5ef0ad
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-18 17:23:15 +02:00
Ting-Kuan
75224e0cd9
hideLoading on ThangEditView and ComponentConfigView.
2014-04-17 22:41:07 -04:00
Ting-Kuan
64f986c286
Remove dependency management in supermodel.
2014-04-17 22:16:29 -04:00
Scott Erickson
8adca4a1da
Added a transactional email for when changes are made, to notify watchers.
2014-04-17 17:30:55 -07:00
Scott Erickson
ed0c7e1412
Creators of documents are automatically added as watchers. Added a patch creation email for watchers.
2014-04-17 17:09:01 -07:00
Ting-Kuan
69fe4428e4
Before merge to master.
2014-04-17 19:52:09 -04:00
Ting-Kuan
a5e2069d60
Move onLoaded logic from CocoView to ChildrenView. Prevent level_loading_view being unveiled before game starts.
2014-04-17 19:37:31 -04:00
Ting-Kuan
1c1cf2f189
Fix loading of Level.
2014-04-17 19:23:35 -04:00
Scott Erickson
21e8d7b26f
Fixed patches denormalization.
2014-04-17 15:44:19 -07:00
Scott Erickson
7ccaa8c843
Fixed a bug, colored a badge.
2014-04-17 14:39:52 -07:00
Scott Erickson
cdaf2ebfaf
Set up the tabs and views in the level editor to reload so that when patches are applied, their changes are visible.
2014-04-17 14:23:33 -07:00
Ting-Kuan
b7439ed1ca
Fix loading bar and retry block in ladder_view, #857 .
2014-04-17 16:54:26 -04:00
Scott Erickson
781a8ec913
Fixed the play and save buttons.
2014-04-17 13:37:08 -07:00
Scott Erickson
07afba01df
Merge branch 'master' into feature/jsondiffpatch
...
Conflicts:
app/views/editor/level/thangs_tab_view.coffee
2014-04-17 13:25:42 -07:00
