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
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
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
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
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
e2f40994e4
Merge lt.coffee
2016-02-25 09:03:00 -08: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
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
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
becad06750
Refactor ArticleEditView and PatchesView to use model endpoint functions
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
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
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
3390663486
Fix GuideView to use session.codeLanguage by default
2016-02-19 10:55:42 -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
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
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
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
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
Ihsara
a008597e35
Update vi.coffee
...
minor changes
2016-02-12 22:24:45 +02:00
Tran Anh Khoa
16a977103a
Update vi.coffee
2016-02-12 10:43:53 -06:00
Ihsara
6105ef7b16
Merge pull request #7 from khoa102/khoa102-patch-1
...
Update vi.coffee
2016-02-12 18:03:18 +02:00
Tran Anh Khoa
2fbbf33455
Merge pull request #8 from codecombat/master
...
Update from Original Fork
2016-02-12 09:30:41 -06:00
minwook shin
5b58e58b86
Always korean translate
...
313 : Are the words taken from the Wizard of Oz ? i dont know munckin. so, i translate munchkin -> 난쟁이(dwarf : short man)
317 : Padawan is (star wars)yoda's Padawan?? i translate padawan -> 파[pa]다[da]완[wan] (I wrote as sound .)
355 : car and carpet... korean naming, car = 차[:cha]. add (카)[car] (I wrote as sound .)
2016-02-12 21:55:32 +09:00
Tran Anh Khoa
e576202132
Update vi.coffee
2016-02-11 21:41:18 -06:00
Tran Anh Khoa
67abb47abe
Update vi.coffee
...
Fix bug on line 1150:
Line 1234: edit a few word
Line 665: thuê bao -> gói đăng ký
2016-02-11 09:08:24 -06:00
Imperadeiro98
6b7337ab3f
Merge pull request #3386 from sungame/patch-1
...
Update sv.coffee
2016-02-11 14:20:27 +00:00
Ihsara
99d7821f61
Update vi.coffee
...
contributors job description update
2016-02-11 15:18:46 +02:00
Ihsara
895d8f378d
Update vi.coffee
...
contributors update
2016-02-11 13:36:56 +02:00
Ihsara
489a3ccb64
Update vi.coffee
...
monor changes
2016-02-11 12:21:00 +02:00
Tran Anh Khoa
be7760c45e
Merge pull request #6 from codecombat/master
...
Update from Original
2016-02-10 19:57:41 -06:00
Tran Anh Khoa
27a48616f7
Update vi.coffee
2016-02-10 17:58:12 -06:00
Tran Anh Khoa
8c86e8be24
Merge pull request #5 from khoa102/Ihsara-patch-1.0viTrans
...
Update vi.coffee
2016-02-10 16:53:10 -06:00
Nick Winter
6800ea2ff7
Add picoCTFProblem field to levels
2016-02-10 14:16:54 -08:00
Ihsara
5079413059
Merge pull request #4 from khoa102/khoa102-patch-1-viTranslation
...
Update vi.coffee
2016-02-11 00:02:05 +02:00
Ihsara
506b6996c0
Update vi.coffee
...
minor
2016-02-10 23:58:38 +02:00
Tran Anh Khoa
f50371e14d
Update vi.coffee
...
Change a few tip into Vietnamese
2016-02-10 15:41:32 -06:00
Tran Anh Khoa
7ed371520f
Merge pull request #3 from khoa102/Ihsara-patch-1.0viTrans
...
Ihsara patch 1.0vi trans
2016-02-10 15:21:47 -06:00
Ihsara
35a9bb96a7
Update vi.coffee
2016-02-10 23:11:42 +02:00
Tran Anh Khoa
60796ca83f
Update vi.coffee
2016-02-10 13:30:27 -06:00
Ihsara
f54619607a
Update vi.coffee
2016-02-10 21:25:35 +02:00
Tran Anh Khoa
5d0235828b
Update vi.coffee
2016-02-10 11:04:05 -06:00
Tran Anh Khoa
e2abbc317a
Update vi.coffee
2016-02-10 10:53:44 -06:00
Matt Lott
06436a4bb7
Add levelID property to show subscription modal events
...
Allows us to consolidate analytics collection indexes and code someday.
2016-02-09 16:50:55 -08:00
Josh Callebaut
7db678e63f
Merge pull request #3380 from Zerrien/editorChanges
...
Style fixes and fixes level submission emails
2016-02-09 09:42:05 -08:00
Josh Callebaut
99955aa034
Corrects artisan guide modal subdomain
2016-02-09 09:37:09 -08:00
Nick Winter
0ef29ddb95
Restrict who counts as a teacher in analytics
2016-02-08 14:44:38 -08:00
Nick Winter
40d7c53cd0
Fix 435d5bb6
2016-02-08 14:34:29 -08:00
Nick Winter
435d5bb6d2
Improve getHomePageGroup and narrow to two variants
2016-02-08 14:20:30 -08:00
Scott Erickson
bb38c58903
Properly fix duplicate course instances
...
* Add script to merge existing course instances
* Have client only send one course instance creation
* Have server return existing course instance if one for the given classroom/course exists
* Remove bandaid code from ClassroomView
2016-02-08 12:48:29 -08:00
Robin Yang
3acb2a4c7a
Add View Classes link to Request Demo area
2016-02-08 10:30:59 -08:00
Matt Lott
bd9ca8ee5f
Add enrollments graph to analytics dashboard
2016-02-06 14:02:44 -08:00
sungame
9cbb5ad924
Update sv.coffee
...
Translated some english to swedish
2016-02-06 17:06:27 +01:00
Nick Winter
378ddccce7
Change loop concept to be specifically while loops
2016-02-05 18:11:27 -08:00
