Commit graph

11078 commits

Author SHA1 Message Date
Zeldaretter
84f28b15c2 Update de-DEcoffee
New lines and some typos fixed
2016-02-29 19:49:05 +01:00
Imperadeiro98
7586395fc1 Merge pull request #3434 from MarioCatuogno/master
Update it.coffee
2016-02-29 13:20:34 +00:00
Mario Catuogno
b9379c9984 Update it.coffee 2016-02-29 13:56:37 +01:00
Imperadeiro98
4b20258cef Merge pull request #3432 from MarioCatuogno/patch-1
Update it.coffee
2016-02-29 12:44:53 +00:00
Imperadeiro98
5f74bef303 Merge pull request #3431 from mqrelly/master
Update hu.coffee
2016-02-29 12:39:11 +00:00
Mario Catuogno
bddf849f1e Update it.coffee
Tried to translate some new lines to help.
2016-02-29 02:18:10 +01:00
Matt Lott
d9a52c62f1 🐛Fix analytics revenue payment.created 2016-02-28 15:36:52 -08:00
Matt Lott
e56efe5921 Fix analytics MAUs and campaign paid users 2016-02-28 15:24:35 -08:00
Szabadkia Márk
e81fc634b2 Update hu.coffee 2016-02-28 21:58:17 +01:00
Imperadeiro98
a8f1ca7c7e Fix build 2016-02-28 18:11:59 +00:00
Imperadeiro98
1a861c6cdc Merge pull request #3430 from Zeldaretter/patch-1
Update de-DEcoffee
2016-02-28 18:11:07 +00:00
Zeldaretter
1fabe3224e Update de-DEcoffee
New strings translated into german. Please add this strings soon. Thanks a lot
2016-02-28 18:41:52 +01:00
Nick Winter
859e127e14 Merge pull request #3422 from blorente/master
Added some lines for #710
2016-02-27 16:58:47 -08:00
Imperadeiro98
5c4f9b6947 Small fixes to new-home-view.jade 2016-02-27 08:25:57 +00:00
Imperadeiro98
027bc0c16d Merge pull request #3428 from codecombat/pr/3424
Merge pull request #3424
2016-02-27 08:12:32 +00:00
Imperadeiro98
02a91642fc Merge master 2016-02-27 08:07:59 +00:00
Maikel Langezaal
b2aef32699 Trailling spaces removed, typo fixed and added 1 tag 2016-02-26 23:28:39 +01:00
Nick Winter
a6333cf739 Propagate SpriteParser's auto-insignificant-tween skipping fix to SpriteBuilder too 2016-02-26 11:42:32 -08:00
Matt Lott
1f7489970e Remove auto-refresh from subs dashboard 2016-02-26 10:36:04 -08:00
Scott Erickson
17c7f599ba Merge branch 'Imperadeiro98-master' 2016-02-26 09:46:51 -08:00
Scott Erickson
b64a212a17 Merge branch 'master' of https://github.com/Imperadeiro98/codecombat into Imperadeiro98-master 2016-02-26 09:38:09 -08:00
Matt Lott
7bd0936c93 Import approved trial requests into Close.io 2016-02-26 06:21:31 -08:00
Imperadeiro98
449ded5083 Merge pull request #3423 from minwook-shin/patch-1
2/26 ko update.
2016-02-26 12:46:05 +00:00
Maikel Langezaal
40ed5618b8 Added i18n tags for new HomePage Issue #3413 2016-02-26 11:43:38 +01:00
minwook shin
d816b4388f 2/26 ko update. 2016-02-26 11:59:44 +09:00
Scott Erickson
e7366040f3 Add full screen button to tutorial videos in Safari 2016-02-25 17:13:42 -08:00
Scott Erickson
2a69ca3774 Fix lesson time estimate dropdown in NewHomeView 2016-02-25 16:49:26 -08:00
Scott Erickson
3f8652d9a9 Add showNotyNetworkError to app/core/errors 2016-02-25 15:50:53 -08:00
Scott Erickson
bd20536046 Add validateEmail to forms 2016-02-25 15:28:04 -08:00
Scott Erickson
1c4a84dee6 Handle when a SomethingResource fails, show Unknown Error 2016-02-25 15:15:39 -08:00
Scott Erickson
43a659ea80 Add styling for modal-base-flat 2016-02-25 15:15:15 -08:00
Scott Erickson
946436083c Add updateSelects to forms
So that in forms you don't have to find the equality for each option. Instead,
just set the select value and, afterRender, call updateSelects, the options that
matches the value will become selected.
2016-02-25 15:14:48 -08:00
blorente
ef8ed4b6ed Added some lines for #710 2016-02-25 23:41:27 +01:00
phoenixeliot
10e03c87c1 Fix style-flat color, .text-h1/2/etc style 2016-02-25 13:22:41 -08:00
Maikel Langezaal
be25889e02 Merge remote-tracking branch 'refs/remotes/codecombat/master' into i18nTags-new-homepage 2016-02-25 21:16:12 +01:00
Scott Erickson
78d221fe4c Refactor AdministerUserModal to use new flat style instead of legacy plain style 2016-02-25 11:49:34 -08:00
Scott Erickson
8b22b78f74 Add style-flat base
To create a modal with the flat style, just use modal-base-flat instead of modal-base
2016-02-25 11:40:27 -08:00
Scott Erickson
ad78f64b31 Add mongoose require to named middleware 2016-02-25 10:39:10 -08:00
Imperadeiro98
b5bbe85836 Revert jobs i18n 2016-02-25 18:28:45 +00:00
Matt Lott
6a48fbb3aa Add courses to progress-reset warning 2016-02-25 10:08:16 -08:00
Matt Lott
8d1c39e714 Merge pull request #3421 from codecombat/AboutPageFixes
Improve responsiveness on fixed nav
2016-02-25 09:36:03 -08:00
phoenixeliot
401c185108 Improve responsiveness on fixed nav 2016-02-25 09:25:13 -08:00
Nick Winter
0514b385e0 Merge branch 'ignaloidas-patch-1' 2016-02-25 09:03:09 -08:00
Nick Winter
e2f40994e4 Merge lt.coffee 2016-02-25 09:03:00 -08:00
Imperadeiro98
3fb8d8067a Remove unused declarations from CocoModel.spec.coffee 2016-02-25 15:55:55 +00:00
Imperadeiro98
62c5b34a96 Update About page i18n
Also fixed some images
2016-02-25 15:48:29 +00:00
Scott Erickson
fc800935aa Fix screenshot carousel when focused on the carousel control and pressing arrow keys 2016-02-24 16:55:18 -08:00
phoenixeliot
f1b046b50e Refactor Request Quote page to flat-style 2016-02-24 16:23:21 -08:00
phoenixeliot
4b02f120e2 Add new About page and refactor out flat-style 2016-02-24 16:22:06 -08:00
Scott Erickson
06d838a54e Merge pull request #3408 from Imperadeiro98/master
Looks good! Tests pass, and I also manually tested the changes did not break any of the changed views. 👍
2016-02-24 13:01:51 -08:00