Imperadeiro98
d2f0f3d1fc
Update pt-PT.coffee
2015-02-06 20:49:51 +00:00
Nick Winter
0f7b7c7a9c
Propagated i18n. Fixed #2253 .
2015-02-06 12:08:31 -08:00
Imperadeiro98
b30de2bfa8
Small fix to last commit
2015-02-06 20:04:44 +00:00
Imperadeiro98
5b04bdcaba
Merge pull request #2252 from JulR43/patch-3
...
Update fr.coffee
2015-02-06 20:04:14 +00:00
Nick Winter
2bd7c86638
Added bottom footer background texture.
2015-02-06 11:17:48 -08:00
Nick Winter
3da36ccc5d
Added new level loading bar art. Using illustrated Start Level button.
2015-02-06 10:26:38 -08:00
JulR43
ef2f610ba2
Update fr.coffee
...
Translations
2015-02-06 19:06:10 +01:00
Matt Lott
f6bcc94bf8
Fix oneTimes email schema
...
Changing ‘targetEmail’ field to ‘email’.
2015-02-06 09:47:06 -08:00
Matt Lott
771437abb5
Turn off parent email hipchat messages
2015-02-06 09:11:49 -08:00
Imperadeiro98
b3d432d3ae
Some fixes to last commit
2015-02-06 15:19:05 +00:00
Imperadeiro98
cb74fc603e
Merge pull request #2249 from ArthurLu/master
...
Update zh-HANT.coffee
2015-02-06 15:17:24 +00:00
newmilktea
5e0c266094
Update zh-HANT.coffee
2015-02-06 22:14:15 +08:00
newmilktea
5e4a1ba4c8
Update zh-HANT.coffee
2015-02-06 22:08:26 +08:00
newmilktea
cf5b14e2c5
Update zh-HANT.coffee
2015-02-06 21:13:06 +08:00
newmilktea
6f4897da4d
Update zh-HANT.coffee
2015-02-06 21:08:39 +08:00
newmilktea
1752f12b32
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
app/locale/zh-HANT.coffee
2015-02-06 20:52:02 +08:00
newmilktea
cee95397fa
Update zh-HANT.coffee
2015-02-06 20:49:09 +08:00
Nick Winter
860868c285
Stopped preloading sessions for now, since it's buggy.
2015-02-05 16:14:32 -08:00
Nick Winter
3cbf11d404
Added a back button to hit campaign selector view.
2015-02-05 15:40:45 -08:00
Scott Erickson
097dbd11dd
Added a script for getting some subscription data more easily.
2015-02-05 15:32:15 -08:00
Nick Winter
1d8f91c42f
Added campaign world selector portal screen for half of players.
2015-02-05 15:05:33 -08:00
Scott Erickson
b686a7f4a1
Fixed running tests with karma.
2015-02-05 13:58:07 -08:00
Martin005
d7592018a8
Update cs.coffee
...
Translated almost all new strings. Just want to save it and then will finish by translating rest of "teachers" strings.
2015-02-05 21:35:55 +01:00
Scott Erickson
f9ee100e73
Made Achievements and Campaigns patchable.
2015-02-05 12:01:19 -08:00
Scott Erickson
eafecaf492
Addressing #2173 , part 1. It should now be possible to submit changes for non-versioned documents like Campaigns and Achievements.
2015-02-05 11:47:27 -08:00
h3yduck
a3b0a11c94
Update site-chrome.sass
2015-02-05 20:01:18 +01:00
h3yduck
15c6d32639
Update base.jade
2015-02-05 20:00:02 +01:00
Scott Erickson
f7403a6b77
Fixing #1866
2015-02-05 10:56:58 -08:00
Imperadeiro98
b92a029a04
Removed unused strings
2015-02-05 18:48:22 +00:00
Imperadeiro98
2dd90874da
Update subscribe-modal.jade
2015-02-05 18:44:07 +00:00
Nick Winter
45dd6fa9a6
Option to choose between ground and floating layer for AOE circles. Fixed cleave AOEs.
2015-02-05 09:36:11 -08:00
h3yduck
3221f71527
Fix bug: cannot upload profile picture
...
In the code before, onInputChanged function was called manually, but the parameter was not passed. I think it's better to trigger the event, than calling the callback function of the event.
2015-02-05 17:56:51 +01:00
Imperadeiro98
ca3573653a
Merge pull request #2245 from JulR43/patch-2
...
Update de-DE.coffee
2015-02-05 16:23:04 +00:00
JulR43
1ca3a8d7e1
Update de-DE.coffee
...
A few translations
2015-02-05 16:16:55 +00:00
h3yduck
29f5307cfd
Fix bug: can't upload profile photo
...
The onInputChanged callback is using the event parameter to get the target DOM element. On #L72 the callback function was called manually, but no parameter was passed. I pass in an object that has a target attribute, so it can get the DOM element.
2015-02-05 07:00:12 -08:00
Imperadeiro98
7433e7a5ca
Update pt-PT.coffee
2015-02-05 14:57:21 +00:00
Imperadeiro98
230d2ce727
Merge pull request #2243 from JulR43/patch-1
...
Update fr.coffee
2015-02-05 14:44:49 +00:00
Imperadeiro98
f9e730ac30
Some fixes to last merge
2015-02-05 14:44:09 +00:00
Imperadeiro98
3ae135ac70
Merge pull request #2242 from Pammer/patch-2
...
Update ru.coffee
2015-02-05 14:42:50 +00:00
Imperadeiro98
c92caf8fc9
Small fix for last merge
2015-02-05 14:38:55 +00:00
Imperadeiro98
8c849aad18
Merge pull request #2241 from emmanuel-z/patch-2
...
Update es-419.coffee
2015-02-05 14:37:46 +00:00
Imperadeiro98
461ffecd4f
Merge pull request #2240 from emmanuel-z/patch-1
...
Update es-419.coffee
2015-02-05 14:36:21 +00:00
JulR43
e4553ac5a3
Update fr.coffee
...
Correction
2015-02-05 08:33:26 +00:00
JulR43
5e1d8f9623
Update fr.coffee
...
Some translations
2015-02-05 08:31:49 +00:00
Pammer
dc4f1c0142
Update ru.coffee
...
"scores" + new part of "subcribe" + "parent_email"
2015-02-05 12:43:05 +09:00
Matt Lott
349e975142
Update hipchat parent email msg
2015-02-04 16:41:59 -08:00
Nick Winter
df68c3c108
Propagated i18n.
2015-02-04 16:19:13 -08:00
Emmanuel Zarzosa
fed29c6890
Update es-419.coffee
2015-02-04 21:18:13 -03:00
Nick Winter
239b9e3285
Merge branch 'master' of https://github.com/codecombat/codecombat
2015-02-04 16:18:01 -08:00
Nick Winter
a189e32948
Refactored sending of HipChat room messages.
2015-02-04 16:17:53 -08:00