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
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
phoenixeliot
10e03c87c1
Fix style-flat color, .text-h1/2/etc style
2016-02-25 13:22:41 -08: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
Imperadeiro98
42f84de394
Merge master branch
2016-02-24 19:40:21 +00:00
Imperadeiro98
9c12f6c957
Revert changes to LevelLoader and SuperModel
2016-02-24 19:32:28 +00:00
Matt Lott
e74a77342c
Update admin trial requests page
...
Add role and phone number
Move notes to separate line
Display last 1000 reviewed instead of 100
2016-02-24 10:22:55 -08:00
Nick Winter
9a344d1a61
Sort a few name categories; remove a log.
2016-02-24 08:49:39 -08:00
Nick Winter
cac20fd39c
Merge pull request #3416 from delftswa2016/additional-thang-names
...
Some additions to Ogre and Horse names
2016-02-24 08:46:49 -08:00
Matt Lott
609884eb51
Update furthest course dashboard tables
...
Adding a second table, setting range to be 60 and 365 days.
Updating teacher columns to prioritize student paid status over
furthest student course.
2016-02-24 06:25:01 -08:00
Matt Lott
dd603a0436
Add school sales table to dashboard
2016-02-24 06:25:01 -08:00
Matt Lott
0d68953808
Add end date to active users analytics script
2016-02-24 06:25:01 -08:00
Matt Lott
e471d652e5
Add more year long dashboard graphs
2016-02-24 06:25:01 -08:00
Maikel Langezaal
8882ff8d46
Some additions to Ogre and Horse names
2016-02-24 12:56:02 +01:00
Scott Erickson
e2feeb8330
Prevent didReappear from setting up shortcuts twice for RootViews
2016-02-23 12:00:07 -08:00
Scott Erickson
7749f9cc0a
Refactor out promisifyAll, use Mongoose's promises and promisify
2016-02-22 16:03:21 -08:00
Scott Erickson
becad06750
Refactor ArticleEditView and PatchesView to use model endpoint functions
2016-02-22 16:03:21 -08:00
Scott Erickson
7fb08f343a
Refactor /db/article to use generators
2016-02-22 16:03:21 -08:00
Robin Yang
1d57199707
Add new buttons for email templates
...
Used in Request Quote Confirmation email.
2016-02-22 14:29:05 -08:00
Scott Erickson
8829e26f11
Turn off the redeem-many-people-at-once test
...
User generation is causing errors. Putting this test on the list to refactor.
2016-02-22 14:10:30 -08:00
Nick Winter
f16dbcd63c
Merge pull request #3379 from jamesvdh/patch-1
...
Update nl-BE.coffee
2016-02-22 13:22:51 -08:00
Nick Winter
99acf2d40e
Properly skip tweens for shadows we removed during sprite parsing
2016-02-22 13:11:46 -08:00
Nick Winter
956f9dc43d
Handle updated CreateJS exports in SpriteParser
2016-02-22 12:57:35 -08:00
Scott Erickson
3c3db79ac1
Fix #3388
...
Overflow: hidden was cutting of info in the play view. Without it in the new home page, though,
infinite banners would expand the size of the page. Tried figuring out a way to not make the new
page require hiding overflow but found no obvious solution. Pages with infinite banners will
just need to be set to overflow: hidden individually.
2016-02-22 11:12:19 -08:00
Scott Erickson
9f3b177574
Fix getting a document by slug or id and projecting it without its permissions
2016-02-22 09:30:36 -08:00
