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
Matt Lott
cac9a7463f
Dashboard monthly revenue counts, and tabs
2016-02-20 17:27:45 -08:00
Scott Erickson
16969e1d5a
Fix Travis tests
2016-02-19 13:58:21 -08:00
Scott Erickson
10402fa945
Make fix-arena-sessions script run across all classrooms
2016-02-19 13:13:45 -08:00
Scott Erickson
3390663486
Fix GuideView to use session.codeLanguage by default
2016-02-19 10:55:42 -08:00
Scott Erickson
cea1a70ab4
Merge branch 'adeeb1-master'
2016-02-19 10:07:52 -08:00
adeeb1
e71a4b71dc
Fixed GitHub authentication - #1764
2016-02-19 10:07:05 -08:00
Matt Lott
19d0e67002
Dashboard classroom vs campaign year chart
2016-02-19 09:32:17 -08:00
Matt Lott
8f216a6915
Fix analytics active users script
...
MAUs were not calculated correctly
Missing log data was not approximated correctly
2016-02-19 09:11:59 -08:00
Matt Lott
ce525e7d99
Add played definition to analytics dashboard
2016-02-18 09:14:36 -08:00
Imperadeiro98
92dc72cce1
Remove name from loadModel
2016-02-18 16:44:40 +00:00
Imperadeiro98
5353dcff3d
Merge pull request #3406 from Ikuyadeu/patch-1
...
Update ja.coffee
2016-02-18 14:53:23 +00:00
Yuki Ueda
f942816188
Update ja.coffee
2016-02-18 21:57:01 +09:00
Matt Lott
1f01b3ffbd
Update revenue analytics with payment.prepaidID
2016-02-17 13:01:09 -08:00
Scott Erickson
cf030146e8
Restrict request quote emails
...
* If logged in => repopulate and lock email (and name if available)
* If logged out => disallow using an email for an existing account and display a validation message + login link
2016-02-17 11:51:26 -08:00
Nick Winter
b5bb662ed2
Add picoCTF problem descriptions to levels; streamline picoCTF flows more
2016-02-17 11:33:56 -08:00
Scott Erickson
0905a378a0
Fix recent scrolling changes for Firefox
2016-02-17 11:21:43 -08:00
Scott Erickson
53eea0c236
Fix navigation from one page to the next
...
* Reset flying focus so it doesn't lengthen the page
* Scroll to the top of the page when switching views
2016-02-17 11:05:52 -08:00
Scott Erickson
c8551a6382
Make new home page responsive
2016-02-17 11:05:20 -08:00
Matt Lott
cb29d7068b
Add prepaids to payments
...
Closes #3402
2016-02-17 10:08:44 -08:00
Nick Winter
37fbd8ca21
Start to play picoCTF levels as course levels without hero selection
2016-02-17 09:53:45 -08:00
Nick Winter
fe351be32e
Start to rework CampaignView when we're in picoCTF mode
2016-02-16 20:39:59 -08:00
Rob
0aa3418e44
Add PicoCTF backend support.
2016-02-16 16:44:35 -08:00
Scott Erickson
c2f02ebbfb
Fix scrollToLink, including removing unneeded offset
2016-02-16 10:47:49 -08:00
Matt Lott
73657d5428
Update analytics dashboard
...
Splitting out classroom and campaign active users
Adding more detailed active users graphs
Patching up missing analytics log events for 2/2/16-2/9/16
2016-02-16 09:23:42 -08:00
Nick Winter
1f52329c7a
Merge pull request #3391 from khoa102/master
...
new update
2016-02-14 12:03:47 -06:00
Imperadeiro98
60e6d4add3
Merge pull request #3397 from minwook-shin/patch-4
...
korean translate continue...
2016-02-13 11:51:57 +00:00
minwook shin
a682bfffa2
korean translate continue...
...
parent = 부모
but korean manner is [Top people]+님(:nim)
so, 부모님=부모(parent)+님(:nim)xk
2016-02-13 11:15:40 +09:00
Tran Anh Khoa
ea6d68ce5b
Update vi.coffee
2016-02-12 14:32:02 -06:00
