Commit graph

11936 commits

Author SHA1 Message Date
Rob
3485abd413 Don't show indent guides for incorrect python indention. 2016-06-02 18:46:47 -07:00
Matt Lott
51a37d9edc Update licenses contact us form email routing 2016-06-02 15:32:54 -07:00
phoenixeliot
ae3b8057f7 Detect URL classCode in createAccountModal 2016-06-02 12:51:05 -07:00
Matt Lott
50ee20d3ae Send teacher contact us form emails through Close.io 2016-06-02 11:13:52 -07:00
Scott Erickson
13ca4a6174 Fix intermittent CreateAccountModal error
AuthModal spec was loading the G+ API during tests, which
caused G+ to get unhappy when CreateAccountModal mocked it.
2016-06-02 10:59:45 -07:00
Duy Trần
3c2e3e37d4 Vi translation (#3703)
* Translate into Vietnamese

* Translate and edit some Vietnamese strings

* update Vietnamese translate

* try to fix some error

* fix bugs with tab character

* update vi.coffee: play_level

* Update vi.coffee

* update vi.coffee

* update text on Home page

* Vietnamese: update legal

* vi.coffee: edit community page

* vi.coffee: update user's page

* vi.coffee: about page

* update vi.coffee

* update vi.coffee

* vi.coffee: invoices

* vi.coffee: account_prepaid

* update vi.coffee

* vi.coffee: error strings

* Update vi.coffee

* update vi.coffee

* vi.coffee: update contact form

* vi.coffee: minor update

* vi.coffee: update about page, modify some strings

* update vi.coffee

* vi.coffee: minor update

* no message

* Update vi strings, fix minor bug in page /community

* vi.coffee: update Adventure and Artisan

* vi.coffee: update Adventurer

* vi.coffee: reverse changes

* vi.coffee: reverse changes

* vi.coffee: update some strings

* vi.cofffe: update Diplomat

* vi.coffee: update Diplomat

* vi.coffee: update descriptions of classes

* vi.coffee: update Ambassador

* remove .cleafix div, will fix in another branch

* refactor ClansView #3138 #3488

* use initialize() in ClansView #3138 #3488

* update vi.coffee

* update vi.coffee

* exclude changes on ClansView

* vi.coffee: update play screen

* vi.coffee: update some strings

* vi.coffee: update createClass form

* vi.coffee: modify some strings on home page and teachers page

* minor fix

* vi.coffee: update some strings
2016-06-02 18:58:29 +01:00
phoenixeliot
18138ec6ae Fix typo 2016-06-02 10:55:48 -07:00
phoenixeliot
7dc490bbcb Add Create Account button to student-only pages 2016-06-02 10:28:10 -07:00
Scott Erickson
5e8b402c3d Switch POST /db/classroom/:id/invite-members to refactored version 2016-06-02 10:27:20 -07:00
Scott Erickson
6e48d700bc Merge branch 'update-invite-to-classroom'
Work was duplicated. Merging in changes from branch, but leaving
the master version as is in this commit.
2016-06-02 10:20:19 -07:00
Scott Erickson
bd64764b6c Merge pull request #3704 from duybkict/refactor-MainLadderView
refactor MainLadderView
2016-06-02 10:08:20 -07:00
duybkict
a9d9a67383 refactor LadderView 2016-06-02 15:44:19 +07:00
duybkict
215ff1faaf refactor MainLadderView 2016-06-02 14:54:00 +07:00
Rob
c20ee729ca Merge branch 'bug-smash' 2016-06-01 16:45:01 -07:00
Rob
bd57121f63 Fix algolia-autocomplete.js version 2016-06-01 15:11:19 -07:00
Scott Erickson
1f3eed9a4e Remove focus 2016-06-01 10:01:41 -07:00
Scott Erickson
b143d552ce Write test, verifying removeFromClassrooms handles sessionless requests 2016-06-01 10:01:05 -07:00
Scott Erickson
ee0195ab21 Require req.user in all /db routes 2016-06-01 09:53:28 -07:00
Rob
c08d426c6b Use cloudflare for analytics so we get the correct SSL cert. 2016-05-31 19:56:37 -07:00
phoenixeliot
e053ad5c61 Only show progress dot for assigned courses (TeacherClassesView) 2016-05-31 17:51:45 -07:00
Nick Winter
790c0375f1 Increase name label background opacity as per Robin's suggestion 2016-05-31 17:22:37 -07:00
phoenixeliot
81b550aeb3 Fix extra scrolling space on right of page 2016-05-31 17:03:55 -07:00
Josh Callebaut
13b69d15f2 Display auto-complete box even after adding a new line 2016-05-31 16:50:22 -07:00
phoenixeliot
9f9590a223 Fix Select All text 2016-05-31 16:42:25 -07:00
phoenixeliot
9bea73b199 Use course invite template v3 2016-05-31 16:14:24 -07:00
Scott Erickson
dfd4602553 AuthModal handles empty fields, fix #3587 2016-05-31 15:54:28 -07:00
Scott Erickson
f684708a94 Fix Level indentation 2016-05-31 15:47:31 -07:00
Scott Erickson
634cc1fb15 Fix anchor links on /about 2016-05-31 15:37:30 -07:00
Nick Winter
e7f79ab721 Several fixes for level editor update speed--should be faster for making changes on complex levels 2016-05-31 15:32:32 -07:00
phoenixeliot
ebc94e6e4b Show something reasonable when class has no students 2016-05-31 15:12:10 -07:00
Scott Erickson
cf76434943 Add script for removing anonymous users from classrooms 2016-05-31 15:09:26 -07:00
Scott Erickson
d4c5d418ff Improve CampaignEditor saving, particularly level order
* Do not cache campaign
* Instead have an on leave message if there are unsaved changes
* Propagate campaignIndex values to campaign and levels so that they signal a change in order

 The save modal seems to have a lot of issues with identifying what models have
 changed. I tried using different methods, but none were consistent. Moving on
 to other bugs.
2016-05-31 15:09:26 -07:00
Scott Erickson
d36908f8c1 Grant admins access to teacher and student only pages 2016-05-31 15:09:26 -07:00
phoenixeliot
826c9c9de0 Trim 'Course: ' from course level names (pt 2) 2016-05-31 15:01:34 -07:00
Matt Lott
59608a5bc2 🐛Fix clan page loads for a really long time
Fixes #3336
2016-05-31 14:54:40 -07:00
phoenixeliot
d0251d20bf Trim 'Course: ' from course level names 2016-05-31 14:48:53 -07:00
Matt Lott
794f4aadc9 🐛Contact Us emails must be sent from approved email 2016-05-31 14:33:49 -07:00
Matt Lott
bf6f3f53af Delay MailChimp subscribing after account creation by 30min 2016-05-31 14:18:50 -07:00
phoenixeliot
41d8346c1e Don't show teacher warning to students who own classrooms 2016-05-31 13:56:06 -07:00
Scott Erickson
249255e4dc AuthModal and CreateAccountModal load gplus and facebook on init
On Windows/Chrome, the first click of the g+ button shows a popup
blocked warning, because the action is deferred while loading the
gplus library. Have the modals load the library first, and enable the
buttons when they're ready.
2016-05-31 12:39:30 -07:00
Matt Lott
abc42298c6 Delay MailChimp subscribing after account creation by 30min 2016-05-31 12:30:36 -07:00
Imperadeiro98
9f4861bbaa Fix note in #3636 2016-05-31 19:29:55 +01:00
Josh Callebaut
50df5cc33f Merge branch 'bug-smash' of https://github.com/codecombat/codecombat into bug-smash 2016-05-31 11:24:06 -07:00
Josh Callebaut
fd43e09abc Fix #3350 2016-05-31 11:23:28 -07:00
phoenixeliot
f067337635 Fix classroom student count 2016-05-31 11:22:42 -07:00
Nick Winter
da90ab980e Fix some failing tests 2016-05-31 10:59:06 -07:00
Nick Winter
5ff1c4b700 Fix #3427: allow language-specific images in Markdown articles 2016-05-31 10:48:23 -07:00
Matt Lott
fd8f65cadc Help button should open "Overview" (Guide) by default 2016-05-31 10:37:30 -07:00
Matt Lott
ffcd89d327 Turn off video tutorials for course levels 2016-05-31 10:12:22 -07:00
duybkict
4f369a1e2f #3138 #3488 refactor UserView, MainUserView 2016-05-31 09:56:55 -07:00