Commit graph

11724 commits

Author SHA1 Message Date
phoenixeliot
0aac07cb37 Use new template for course invite email
This uses a new template for the version with the course code added, so that
I don't have to sync up changes to the template with deploying the code to
production, and so I can test it separately in staging beforehand.
2016-05-12 13:14:20 -07:00
Rob
9bf118962f Disable Clojure and IO 2016-05-12 11:36:10 -07:00
phoenixeliot
b2cfaf3b13 Add non-URL join code to classroom invite emails 2016-05-12 11:19:05 -07:00
Matt Lott
a208a514d2 🐛Add null check to sub_sponsor endpoint
Causes exception when sponsor has deleted their account.
2016-05-12 11:03:35 -07:00
Matt Lott
bc928253a5 Add site origin to demo requests admin page 2016-05-12 11:03:35 -07:00
Matt Lott
b8dd0f0a45 Filter out low priority sales leads on initial import 2016-05-12 11:03:35 -07:00
duybkict
672c89e0bc Update Vagrant setup scripts
install nodejs using nvm
fix issues with Windows/Linux new line characters
update auto-reload-brunch
drop bless-brunch
resolve related issue #3588
2016-05-12 09:46:34 -07:00
Scott Erickson
0770a61534 Merge pull request #3608 from duybkict/fix-1874
fix issue #1874
2016-05-12 09:11:39 -07:00
duybkict
2a5968e001 no message 2016-05-12 09:10:54 +07:00
phoenixeliot
05ae7057db Fix class joining when entering it in the signup field 2016-05-11 14:53:05 -07:00
phoenixeliot
35d0352a92 Autofill class code from URL in signup modal 2016-05-11 14:53:05 -07:00
Matt Lott
8e6293824b 🐛Fix admin demo requests 7-day average 2016-05-11 11:55:46 -07:00
Matt Lott
8bc9cd5ee6 Admin teacher demo requests page
Incoming rates table
Student counts table
2016-05-11 11:52:32 -07:00
Olha Horobets
ea6d5e4867 Add some more translations (#3618)
Found a better word for 'engaging'
Added more translations
2016-05-11 19:32:28 +01:00
Matt Lott
deb4117a9c Add Close.io NCES lead data to custom fields 2016-05-11 10:21:56 -07:00
Scott Erickson
8328d955a8 Merge pull request #3616 from duybkict/fix-3158
Fix issue #3158: remove unused sass files
2016-05-11 09:58:28 -07:00
korytsya
0c62e9310d Changed slogan (#3617)
* Changed slogan

* Uncomment line
2016-05-11 15:37:22 +01:00
Imperadeiro98
acee9d7331 Correct indentation in nl-BE.coffee 2016-05-11 15:36:53 +01:00
JurianLock
225d610fbe Update nl-BE.coffee (#3614) 2016-05-11 15:35:46 +01:00
Matt Lott
ef8b11601f Move worker died to eng channel 2016-05-11 05:57:04 -07:00
duybkict
8deb172b63 remove unused sass files 2016-05-11 16:49:09 +07:00
duybkict
48b58b5348 Fix issue with i18n strings 2016-05-11 09:39:35 +07:00
duybkict
2db37c7556 Merge branch 'master' into fix-1874 2016-05-11 09:18:02 +07:00
Rob
913565397b Allow passing languages into verifier. 2016-05-10 15:21:02 -07:00
Matt Lott
b604060bc7 Add call tasks to inbound leads after 3 days 2016-05-10 14:40:48 -07:00
Matt Lott
7982188e30 Script to find users with incorrect role based on classrooms 2016-05-10 14:40:48 -07:00
Rob
c6392e0f74 Turn on esper 2016-05-10 14:12:35 -07:00
Cat Sync
50c8588231 Default to using hero unless self/this is present in the player's code.
This affects the autocomplete and spell palette api docs.
2016-05-09 12:49:25 -04:00
Scott Erickson
c707129b5e Disable esper, LevelSession.state.dateFirstCompleted schema restriction 2016-05-09 09:32:51 -07:00
Cat Sync
0edd8af1db Merge remote-tracking branch 'codecombat/master' 2016-05-09 09:40:53 -04:00
Nick Winter
2faca0419b Fix another error I saw in the logs 2016-05-08 20:59:58 -07:00
Nick Winter
d0be5c1f22 Handle a couple errors I saw in the logs 2016-05-08 10:05:26 -07:00
Duy Trần
4172f03fad Vi translation (#3609)
* 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
2016-05-07 10:16:39 +01:00
phoenixeliot
ec8bce9f70 Put back clobbered pt-PT code translations 2016-05-06 15:26:21 -07:00
duybkict
dedc13f749 fix issue #1874 2016-05-07 04:12:54 +07:00
phoenixeliot
8223122a6b Refactor and update teacher-dashboard
This updates TeacherClassView and ActivateLicensesModal to use the
new state-based rendering system, making it much snappier and less clunky
feeling, and improving data consistency.

Features also included in this:
- Hover details for progress dots in TeacherClassView
- ActivateLicensesModal has an "All Students" option and better handling
  when you switch classrooms in the dropdown
- Unenrolled/Unassigned students are shown separately in Course Progress and
  can be enrolled/assigned from there.

Add Back to Classes button on demo-request submitted view

Delete temporary patch file

Show unenrolled students separately in Course Progress (incomplete)

Migrate TeacherClassView to use orchestrator-style events, add unassigned students section, replace bootstrap tabs with state-based tabs

Convert missed instance variables to be in @state

Fix merge errors

(in progress) Convert a bunch of stuff to use state and events (removing student needs fixing)

Fix up modal interactions, some bugs

Switch state to be a Model, sync up course dropdowns

Convert student sorting to use state model

Add hover tooltips to TeacherClassView Students tab

Don't keep tooltip open when you mouse into it

Add dateFirstCompleted and Course Progress tooltips

Course Overview progress tooltips

Refactor ActivateLicensesModal

Refactors:
Uses state object for view state
Passes back the updated users in 'redeem-users' event instead of modifying given collection

Features:
Add 'All Students' dropdown option
Don't forget checked students if you change classroom from dropdown,
  but only enroll the ones visible when you click "Enroll (n) Students"

Separate enrolled students; improve style

Rearrange error text

Disable enroll-students button when none are selected

Remove console.logs

Move style-flat variables to another file

This prevents .style-flat from being copied in multiple times to the resulting CSS.

Show Unarchive button when on the page for an archived class

Move text to en.coffee

Only sort students on first classroom sync

Fix merge error

Handle sessions missing completion date in view logic instead of migration script

Listen to classroom sync more than once in case it gets unarchived
2016-05-06 13:13:11 -07:00
Scott Erickson
0ed99565d3 Make delighted profiles for teachers only, instead of all users 2016-05-06 12:45:11 -07:00
Scott Erickson
0e96b4b250 Merge branch 'master' of https://github.com/codecombat/codecombat 2016-05-06 12:12:50 -07:00
Scott Erickson
c1886f3003 Merge branch 'dutch-localization-update' 2016-05-06 12:07:55 -07:00
Scott Erickson
fffe5f995d Merge branch 'master' of https://github.com/Marvellanius/codecombat into dutch-localization-update 2016-05-06 12:03:34 -07:00
Nick Winter
578ef34bdf Propagate i18n 2016-05-06 11:56:22 -07:00
Scott Erickson
3ad395ecb8 Lightweight invoice purchases show description on PaymentsView 2016-05-06 11:43:54 -07:00
Matt Lott
6916de6c8b Update enroll students copy 2016-05-05 17:15:52 -07:00
Nick Winter
32f74531e4 Enable Esper by default in certain cases; improve verifier a bit; misc cleanup 2016-05-05 16:56:58 -07:00
Nick Winter
e4c904463c No more transpiledCode 2016-05-05 13:22:30 -07:00
Scott Erickson
93f940e196 Refactor, spec and fix GET /healthcheck
For #3469
2016-05-05 13:11:39 -07:00
Scott Erickson
b125f9b2fa Refactor rest of /db/campaign routes
For #3469
2016-05-05 13:11:39 -07:00
Matt Lott
4827dc57e7 Add MDR position to /about 2016-05-05 13:04:27 -07:00
Imperadeiro98
b61b676333 Update pt-PT (#3606)
Also update some repeated and missing i18n
2016-05-05 20:07:43 +01:00
Scott Erickson
63a11a75f4 Refactor client tests to use factories instead of fixtures 2016-05-05 11:24:29 -07:00