codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 16:17:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
12188 commits 27 branches 0 tags 134 MiB
Commit graph

2322 commits

Author SHA1 Message Date
phoenixeliot
02d833639b Make LevelComponent names translatable, show spell name translations in doc tooltips 2016-04-26 16:37:06 -07:00
Rob
4e630362ce - Switch to flat modal 
- Diffuse test time bomb
 2016-04-26 14:35:07 -07:00
Rob
5bd8f7a1cb COPPA tests. 2016-04-26 14:01:03 -07:00
Rob
4183764b61 Add birthday field to user that rejects users under 13 on signup. 2016-04-26 14:00:49 -07:00
Matt Lott
283c874496 Update /privacy COPPA section 2016-04-26 11:20:47 -07:00
Josh Callebaut
c4652d82e2 Implements the SPADE logger into the SpellView 
* Updates spade.js vendor file, adds a sublime-project for developers to use
* Moves server logic away from handlers
* Moves session update logic to middleware, sets up server schema to autorender IDs as ObjectIDs
* Modernizes the supermodel loading scheme and switches from constructor to initalize
 2016-04-26 09:56:30 -07:00
Scott Erickson
e8d0ec08cb Merge pull request #3572 from UltCombo/i18n-subscription-modal 
Update subscribe modal's style to support i18n, fixes #3526
 2016-04-25 13:22:18 -07:00
Matt Lott
93194d4f1e Change top nav Courses link to Students 2016-04-23 16:54:24 -07:00
UltCombo
304cdc1113 Update subscribe modal's style to support i18n, fixes #3526 
Subscribe modal: make the "parent" and "sale" buttons take only as much space as necessary and the "subscribe" button takes all the remaining space, this fixes #3526.

Here's how the new style looks:

### Before
![](http://i.imgur.com/uwt9Jed.png)
![](http://i.imgur.com/1VKdJjZ.png)

### After
![](http://i.imgur.com/2ElCHMT.png)
![](http://i.imgur.com/G4EAi1P.png)
 2016-04-23 19:11:54 -03:00
Matt Lott
4a7518ca6f Add new team members to /about 2016-04-21 20:45:13 -07:00
Scott Erickson
a452f1ce47 Update teacher trial request views, some related bug fixes 
* Tweak wording, options
* Instead of storing changes in local storage, warn when users may lose changes by navigating away
* Fix CreateTeacherAccountView so that if you connect to an existing account, the redirect is triggered
* Fix users.coffee weird race condition
 2016-04-20 16:30:11 -07:00
Rob
67686e8c71 Add district complete to teacher convert page. 2016-04-20 10:37:00 -07:00
Rob
f79a9b96bf Add district picker to teachers/signup 2016-04-20 10:29:59 -07:00
phoenixeliot
79d4fc3126 Merge branch 'dashboard-bugfixes' 2016-04-19 12:36:36 -07:00
phoenixeliot
e2d08fa7cf Stuff 
Partially fix ActivateLicensesModal.spec

[IN PROGRESS] Don't display deleted users

Move userID to classroom.deletedMembers on user delete (not retroactive)

Fix PDF links for course guides, remove old PDFs from repo

Remove deprecated SalesView

Remove underline for not-yet-linked student names

Only show class select when there's more than one

Ignore case when sorting student names

Use student.broadName instead of name for display and sorting

Fix initial load not showing progress after joining a course (hacky)

Fix text entry for enrollment number input

Fix enrollment statistics

Fix enrollment stats completely (and add back in per-class unenrolled count)

Add deletedMembers to classroom schema

More fixes to enrollment stats (don't count nonmember prepaids)

Don't use 0 as implicit false for openSpots

Update suggested number of credit to buy automatically

Fix classroom edit form ignoring cleared values

Add alert text when more users selected than enrollments available

Alert user when trying to assign course to unenrolled students

Alert user when assigning course to nobody

Add some tests for TeacherClassView bulk assign alerts

Fix TeacherClassView tests failing without demos

Use model/collection.fakeRequests :D

Remove unused comment

Fix handling of improperly sorted deleted users on clientside

Add test for moving deleted users to deletedMembers

Add script for moving all deleted classroom members to classroom.deletedMembers

Completely rewrite tallying up enrollment statistics

Fix some tests to not be dependent on logged-in user

Address PR comments

Fix default number of enrollments to buy

Fix i18n for not enough enrollments

Use custom error message for classroom name length
 2016-04-19 12:32:20 -07:00
Rob
988eeeeb07 Merge branch 'school-complete' 2016-04-18 23:35:50 -07:00
Rob
e64d585841 Add extra information when a school is autocompleted. 2016-04-18 22:54:43 -07:00
Rob
e7356411fb Autocomplete names of schools on quote page. 2016-04-15 14:00:36 -07:00
phoenixeliot
c3da6a23c9 Change isTeacher checks to isSessionless for /play 2016-04-15 10:58:52 -07:00
Rob
ceb64ce9ca Improve verifier. 2016-04-13 16:41:16 -07:00
phoenixeliot
a524256b5b Add sessionless play for Teachers 2016-04-12 19:34:05 -07:00
Nick Winter
a7114a2719 Implement headless verifier; fix headless client 2016-04-12 19:34:05 -07:00
Scott Erickson
cabca6366f Show guides when users are a teacher OR own a classroom 2016-04-08 10:14:47 -07:00
Scott Erickson
5aeb559ad1 Fix ConvertToTeacherAccountView to save the email field 2016-04-07 14:40:21 -07:00
Matt Lott
be254cf10e Route homepage students to /courses instead of /play 2016-04-05 10:43:06 -07:00
Matt Lott
49e7506c62 Add parental leave benefits to /about page 2016-04-05 10:14:54 -07:00
Matt Lott
4b1486159c Change teacher account convert terminology to update 2016-04-05 09:16:22 -07:00
Matt Lott
133574356a Update /about page 
Removing sales positions, adding marketing position
Updating benefits list
 2016-04-05 06:29:03 -07:00
phoenixeliot
c826543b40 Remove kinda broken enrollment stats (temporary) 2016-04-04 16:09:58 -07:00
phoenixeliot
beb53d9f2f Various fixes and changes to teacher-accounts and teacher-dashboard 2016-04-04 15:42:29 -07:00
Scott Erickson
58a5df7a4f Restrict teacher and student accounts to their respective areas and actions 2016-04-04 15:20:34 -07:00
phoenixeliot
4a72ffc185 Implement all of teacher-dashboard 2016-04-04 15:19:27 -07:00
Scott Erickson
bd3a77da9f Implement teacher accounts 2016-04-04 15:18:06 -07:00
Scott Erickson
43389ac9b6 Merge pull request #3471 from delftswa2016/loggedIn-achievement-error 
Error when accessing achievement without being logged in
 2016-03-30 09:41:01 -07:00
Rob
e40b952ef2 Do something slightly better for loged in students. 2016-03-29 21:44:59 -07:00
Scott Erickson
6e16248cd8 Merge pull request #3509 from codecombat/header-avatar 
Add small avatar to header
 2016-03-28 11:17:58 -07:00
Rob Blanckaert
9da65cdcff New homepage variations. 2016-03-25 17:09:58 -07:00
phoenixeliot
0355ea3e1a Add small avatar to header 2016-03-25 16:25:51 -07:00
Imperadeiro98
5676c6b2e4 Add i18n to new level loading strings 2016-03-22 12:02:36 +00:00
Matt Lott
d1ae4adfbb Merge pull request #3499 from IC-Induja/master 
Added 9 new loading screen comments
 2016-03-20 05:40:17 -07:00
Matt Lott
2bf028cc4a Update /about page team section 2016-03-20 05:30:52 -07:00
IC-Induja
57bd7ab5f8 Update level_loading.jade 2016-03-20 01:20:42 -04:00
Matt Lott
5d71acba05 Replace HipChat with Slack 2016-03-18 17:05:21 -07:00
Nick Winter
905c9cdb93 Use victory text and next level data on level completion. Update picoCTF logo. 2016-03-18 14:18:41 -07:00
Nick Winter
13928884b0 Merge iDEAL link for nl on home 2016-03-18 11:16:28 -07:00
Nick Winter
4a737d3045 Merge iDEAL link for nl on home 2016-03-18 11:14:10 -07:00
Scott Erickson
d6a46826e6 Add top margin to base-flat footer 2016-03-18 11:03:55 -07:00
Scott Erickson
461fb14f37 TestView styling and responsive tweaks 2016-03-18 11:03:55 -07:00
Scott Erickson
e6593dea8d Refactor FacebookHandler and GPlusHandler 
* Move api loading to FacebookHandler
* Use success callbacks
* Use same, properly named events
* Use same functions and property names
* Refactor related social button, out of use rendering system
* Remove the now unnecessary form split from CreateAccountModal
 2016-03-18 11:03:55 -07:00
Scott Erickson
93c7072d8d Refactor ConfirmModal for #3138 and #3488 2016-03-18 11:03:55 -07:00
Matt Lott
255ebbc048 Ads for free campaign players 
Display leaderboard ads on campaign and play views.
Do no show ads in classroom, picoCTF, or to teachers.
Add no ads blurb to subscription features matrix.
Scale game UI for ads on short screens.

Closes #3491
 2016-03-18 10:29:31 -07:00
Maikel Langezaal
49d7028e2e Cleanup 2016-03-17 11:30:19 +01:00
Imperadeiro98
9a36267ba7 Cleanup i18n in some files 2016-03-16 21:49:19 +00:00
Scott Erickson
07aad0ca18 Merge pull request #3463 from delftswa2016/maximize-button-fix 
Fix the fullscreen-code button and beautiful-code button
 2016-03-14 10:45:08 -07:00
Jacob Boon
ce8f7f2c14 include iDeal offer for Dutch (nl) users 2016-03-14 16:39:16 +01:00
Chengxin Ma
6ff7c562a8 updated new homepage header (i18n) 2016-03-12 12:19:21 +01:00
Matt Lott
3a1627682d Update homepage logged out copy 2016-03-11 15:44:37 -08:00
Scott Erickson
9d315a4848 Fix "students enrolled" to "students assigned" in TeacherCoursesView 2016-03-11 14:13:44 -08:00
Maikel Langezaal
5aff988ec5 Cleaned up code 2016-03-11 21:08:13 +01:00
Maikel Langezaal
e07d2561bd Made the treema visible to be build, but disabled and hidden the buttons 2016-03-11 21:01:06 +01:00
yuliang123
457d6bbc6c Fix the fullscreen-code button and beautiful-code button 2016-03-11 16:59:45 +01:00
Matt Lott
acba838db4 🐛Request demo Ux bugs 
Only ask about login if not logged in
Add missing set up a class i18n string
 2016-03-10 14:40:16 -08:00
Scott Erickson
84cdf1e2ce Add showRequiredError and showSignupRationale alerts and tests to CreateAccountModal 2016-03-10 11:37:31 -08:00
Scott Erickson
a59e96f277 Tweak invalid class code behavior, fix hide modal button test 2016-03-10 11:23:09 -08:00
Scott Erickson
ebc98f988f Refactor CreateAccountModal out of AuthModal, add class code to signup 2016-03-10 10:52:11 -08:00
Matt Lott
eb7bebe293 Add DAU 30-day avg and daily total to dashboard 2016-03-08 15:27:57 -08:00
Matt Lott
bce9862be2 Update request demo Ux 
Renaming request quote to request demo
Changing create class wording to set up class
Showing different UI if teacher or not
Adding gameplay screenshots to homepage
Update request demo email

Closes #3449
 2016-03-08 09:30:50 -08:00
Robin Yang
ee331cc9c5 Change request quote headings H1/H2 to H3/H4 2016-03-07 13:56:34 -08:00
Imperadeiro98
2442115892 Remove i18n from admin pages 2016-03-05 15:08:27 +00:00
Nick Winter
1ccad78782 Submit picoCTF solutions, show progress, disable sound 2016-03-04 11:44:43 -08:00
Scott Erickson
0b6390795a Tweak text on admin page 2016-03-04 11:14:18 -08:00
Scott Erickson
a2249f8df1 Add return-to-admin (turn off espionage mode) 2016-03-04 10:43:17 -08:00
Matt Lott
19b7fe7295 Remove iOS position from /about careers section 2016-02-29 15:16:09 -08:00
Matt Lott
e56efe5921 Fix analytics MAUs and campaign paid users 2016-02-28 15:24:35 -08:00
Nick Winter
859e127e14 Merge pull request #3422 from blorente/master 
Added some lines for #710
 2016-02-27 16:58:47 -08:00
Imperadeiro98
5c4f9b6947 Small fixes to new-home-view.jade 2016-02-27 08:25:57 +00:00
Imperadeiro98
02a91642fc Merge master 2016-02-27 08:07:59 +00:00
Maikel Langezaal
b2aef32699 Trailling spaces removed, typo fixed and added 1 tag 2016-02-26 23:28:39 +01: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
Scott Erickson
1c4a84dee6 Handle when a SomethingResource fails, show Unknown Error 2016-02-25 15:15:39 -08:00
blorente
ef8ed4b6ed Added some lines for #710 2016-02-25 23:41:27 +01: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
Imperadeiro98
62c5b34a96 Update About page i18n 
Also fixed some images
 2016-02-25 15:48:29 +00: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
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
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
Scott Erickson
becad06750 Refactor ArticleEditView and PatchesView to use model endpoint functions 2016-02-22 16:03:21 -08:00
Matt Lott
cac9a7463f Dashboard monthly revenue counts, and tabs 2016-02-20 17:27:45 -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
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
c8551a6382 Make new home page responsive 2016-02-17 11:05:20 -08:00
Nick Winter
fe351be32e Start to rework CampaignView when we're in picoCTF mode 2016-02-16 20:39:59 -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
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
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
Scott Erickson
944b6b743f Add homepage unsupported browser messages to new home page 2016-02-05 11:39:06 -08:00
Matt Lott
e75bca2b43 Add active class definitions to analytics dashboard 2016-02-05 09:40:08 -08:00
Matt Lott
5d2ad62fb9 Add top school counts to analytics dashboard 2016-02-04 17:31:25 -08:00
Matt Lott
e8c22679d9 Add trials to active classes analytics dashboard 
Only looking at active classrooms, split into paid, trial, and free.
Active class: 12+ students total, 6+ active in last 30 days.
 2016-02-04 16:31:52 -08:00
Scott Erickson
95e627f346 Merge pull request #3374 from taptapdan/issue-3138-CastButtonView 
Refactor CastButtonView to use view in template
 2016-02-04 14:53:13 -08:00
Daniel Fiore
d0d19f94e9 Refactor ProblemAlertView to use view in template 2016-02-04 14:44:29 -08:00
Robin Yang
1daa2e1db0 Update Getting Started Pdf link on /schools 
Previous link was pointing to Hour of Code version, still had
free/unlimited trial language.
 2016-02-03 16:18:14 -08:00
Scott Erickson
b98da5a32f Add login button and logout link to new home view in request demo area 2016-02-03 16:16:43 -08:00
Scott Erickson
89eb3d0dfb Add /courses link to new home page navbar, tweak wording 2016-02-03 11:16:15 -08:00
Scott Erickson
b91299a59f New home page tweaks 2016-02-03 10:59:54 -08:00
Josh Callebaut
0eb32aac24 Creates clickable links for default tasks 2016-02-03 10:26:36 -08:00
Scott Erickson
9e38587719 Do not hide teacher note for small screens, add close link 2016-02-03 10:10:43 -08:00
Nick Winter
c8601e81d6 Fix request-a-quote link in the footer 2016-02-02 17:14:26 -08:00
Daniel Fiore
6ad5d6bc73 Refactor CastButtonView to use view in template 2016-02-02 15:57:55 -08:00
Nick Winter
24fc14260e Add /privacy policy page 2016-02-02 15:13:54 -08:00
Scott Erickson
0e7e9aad39 Add new home page with test 2016-02-02 15:12:37 -08:00
Scott Erickson
ab62982bac Tweak RequestQuoteView form to better fit best practices 
* Scroll to errors
* Set email input type to 'email'
 2016-02-01 15:51:29 -08:00
Scott Erickson
5fffb2eefb Remove TeachersFreeTrialView 2016-02-01 10:40:22 -08:00
Josh Callebaut
14ef28b658 Merge pull request #3369 from Zerrien/master 
Editor Changes (Task tab, pre-initialize tasks, Artisan nurturing, level submission)
 2016-01-29 09:42:04 -08:00
Scott Erickson
e62e497543 Replace TeachersFreeTrialView with RequestQuoteView 2016-01-28 17:21:36 -08:00
Josh Callebaut
4a2d5c2e59 Fixes level ownership check 2016-01-28 14:05:04 -08:00
Josh Callebaut
8347c8247f Merge branch 'master' of https://github.com/codecombat/codecombat 2016-01-28 13:57:56 -08:00
Scott Erickson
4ef5f40fa1 Network error handling fixes 
* Make work there are multiple network requests and only one fails
* Test for i18n attributes instead of English translations so Travis works
* Various PR changes
 2016-01-27 10:42:12 -08:00
Scott Erickson
d00f8344be Add demo controls to TestView 2016-01-27 10:42:02 -08:00
Scott Erickson
29350bf1de Make network error handling more generic 2016-01-27 10:41:56 -08:00
Matt Lott
78c86eb979 Add furthest course table to analytics page 2016-01-26 14:37:25 -08:00
Scott Erickson
277c526dc3 Add CourseVictoryModal 2016-01-25 13:03:29 -08:00
Scott Erickson
57cf264880 Add img-prize, label-banner and well-parchment to design elements 2016-01-25 13:03:29 -08:00
Josh Callebaut
6dfc02980a Fixes non-existant task array, bad focus, adds a button to add default tasks. 2016-01-22 13:54:20 -08:00
Josh Callebaut
aea23072e3 Fix #3348 - don't display score button for levels without a score type 2016-01-22 11:27:38 -08:00
Cat Sync
feb4c16b85 broadName should insert a space when using firstName lastName, and return Anoner if nothing else is available 2016-01-22 13:58:02 -05:00
Josh Callebaut
ab93dc8564 Bug fixes and style fixes. 2016-01-21 12:14:37 -08:00
Josh Callebaut
c28720c640 Implements fixes based on code review. 2016-01-20 15:32:21 -08:00
Scott Erickson
491a679abb Merge pull request #3327 from Imperadeiro98/master 
Cleaned couple files
 2016-01-18 15:35:59 -08:00
Scott Erickson
c23fb50fa7 Merge pull request #3330 from differentmatt/teacher-news 
Add approved teacher trials to CodoCombat list Teachers group
 2016-01-18 15:18:55 -08:00
Scott Erickson
a28b53eb5c Merge pull request #3321 from taptapdan/fix-issue-2732 
Looks good. Thanks!
 2016-01-18 15:08:52 -08:00
Matt Lott
d2921f66cb Add approved teacher trials to mail news group 2016-01-17 07:39:30 -08:00
Daniel Fiore
39b42fe363 Fix level list highlighted levels 
The Level Editor level list now highlights the row in which you are the
person who last saved the level. The level list now also displays
glyphicons to indicate watched/unwatched levels.
 2016-01-16 15:05:54 -08:00
Imperadeiro98
f47640e59a Cleaned couple files 
Removed some unused styles, a template, a view and changed the class
name of some views
 2016-01-16 12:07:15 +00:00
Robin Yang
af65b85217 Update Getting Started Area 
- Upload new Course 2 guide Pdf
- Update Getting Started Pdf
- Add links to Course 2 and Educator Wiki
 2016-01-15 13:15:08 -08:00
Josh Callebaut
89fc6cc078 Removes stay logging, implements functionality improvements for artisan modals. 2016-01-13 17:45:27 -08:00
Josh Callebaut
14c2942134 Moves Tasks to their own tab and adds a guide-book icon next to the save icon which displays help and doubles as a level review submission modal. 2016-01-13 15:54:57 -08:00
Nick Winter
be1091caf8 Merge pull request #3315 from ryang217/master 
Cleaned up teacher testimonial area
 2016-01-12 13:13:52 -08:00
Robin Yang
95a996af07 Cleaned up teacher testimonial area 
Fixed quote per teacher (Tim M.)’s request, added Twitter link

Adjusted font sizing and positioning on quotes.

Added smart (curly) quotes instead of straight quotes.
 2016-01-12 12:19:48 -08:00
Nick Winter
e872ead632 Implement Brazil coupon 2016-01-11 09:52:46 -08:00
Matt Lott
213f3edd0d Update /about team section 2016-01-08 10:25:21 -08:00
Matt Lott
017dea696f Remove HoC extra 2 months trial enrollments 2016-01-07 15:45:46 -08:00
Scott Erickson
a10aec256f Set upper limit to max seats you can purchase at once 2016-01-07 09:54:02 -08:00
Scott Erickson
5941c4b27f Add autocomplete and slider to design elements view, limit showing javascript widgets automagically 2016-01-06 16:33:50 -08:00
Scott Erickson
93b9aa3c2c Add DesignElementsView (mostly complete) 2016-01-06 16:11:28 -08:00
ryang217
57ed2fae67 Added Robin to About page 2016-01-05 13:04:02 -08:00
Imperadeiro98
b7ba677b00 Use view in template 2015-12-26 14:21:06 +00:00
Nick Winter
208073ffdb Fix saving levels from #3276 refactoring 2015-12-24 11:21:12 -08:00
Nick Winter
c0d58c3786 Tweak style and add i18n for #3280 2015-12-24 06:34:54 -08:00
Pulkit Agarwal
357e8c0bcd Add level to user profile page 2015-12-24 15:52:30 +05:30
Nick Winter
b42ed395c0 Small fix for #3276 NewLevelComponentModal 2015-12-23 08:41:00 -08:00
Nick Winter
6b02a7a31f Merge pull request #3276 from Imperadeiro98/master 
Use view in template
 2015-12-23 08:29:54 -08:00
Nick Winter
3be6abf2e1 Merge Router.coffee 2015-12-23 08:23:23 -08:00
Nick Winter
08d0440c71 Link to language-specific forum categories when available 2015-12-23 08:22:19 -08:00
Nick Winter
dfc1ef2e89 Add i18n tags for new legal page stuff 2015-12-23 08:21:49 -08:00
Nick Winter
21ae7d47be Don't load extra level completion images unless it's that level 2015-12-23 08:21:11 -08:00
Imperadeiro98
d321bb7a95 Removed spr from spell_list_entry_thangs.jade 2015-12-22 21:41:20 +00:00
Nick Winter
a92ed8fbbe Fix /courses/teachers link to /schools 2015-12-22 06:43:19 -08:00
Matt Lott
68aae0d4e0 Update /courses/teachers active courses styling 2015-12-21 16:18:01 -08:00
Nick Winter
8683a2f27a Merge pull request #3251 from themaka/browserstack-quid-pro-quo 
Adding Browserstack to our web page as we promised
 2015-12-21 15:55:29 -08:00
Josh Callebaut
314f8256ee Improves style further. 2015-12-21 15:42:46 -08:00
Matt Lott
bde8e6721c Add enroll students button to /courses/teachers 2015-12-21 15:04:21 -08:00
Nick Winter
e070c70b9d Put /schools into the main flow in place of anonymous /teachers for now 2015-12-21 15:02:11 -08:00
Matt Lott
b5e7a9694e Remove /courses/teachers concepts 
Also moving enrolled counts around a bit and adding a class count
sentence.
 2015-12-21 14:19:35 -08:00
Josh Callebaut
9ba9d8ab4d Style guide fixes. 2015-12-21 12:51:29 -08:00
Josh Callebaut
79ff058117 Adds the Thang Task View. 2015-12-21 12:44:22 -08:00
Matt Lott
348e0407bc Update /schools copy and fonts 2015-12-21 12:39:59 -08:00
Imperadeiro98
025d2bea2f Couple fixes 2015-12-21 16:03:28 +00:00
Imperadeiro98
e70cbed4e4 Use view in template 2015-12-21 15:51:46 +00:00
Scott Erickson
079109145f Cull recruiting views and translations 2015-12-18 10:34:21 -08:00
Matt Lott
94cf5654ff Update /teachers with post-HoC copy 2015-12-18 05:39:25 -08:00
Matt Lott
43ca30b413 Update /courses/teachers getting started pdf 2015-12-18 05:21:06 -08:00
Matt Lott
28c554295c Remove homepage HoC section 2015-12-18 05:15:04 -08:00
Scott Erickson
e1130ff1e8 Clean up legal string interpolation 2015-12-16 16:39:46 -08:00
Scott Erickson
e9b59d62d6 Remove replaced string 2015-12-16 16:39:46 -08:00
Scott Erickson
96e6920722 Update some copy to use db products 2015-12-16 16:39:44 -08:00
Scott Erickson
ef3f847932 Remove SubscriptionSaleView 2015-12-16 16:39:44 -08:00
Scott Erickson
a28e7bde2c Update tests for db products, some cleanup 2015-12-16 16:39:44 -08:00
Nick Winter
0eecda7b40 Fix logged-in /schools call to action 2015-12-16 16:39:44 -08:00
Matt Lott
d369c0b47c Update /schools contact us button styling 2015-12-16 16:39:43 -08:00
Matt Lott
8837d042ab Update /schools fonts 2015-12-16 16:39:43 -08:00
Matt Lott
646aa56716 /schools page 2015-12-16 16:39:43 -08:00
Nick Winter
5cbb61c261 Change /about address to our office 2015-12-16 16:39:43 -08:00
Scott Erickson
59fcb22d01 Deprecate managed subscriptions, disallowing new ones 2015-12-16 16:39:43 -08:00
Scott Erickson
7c516c4d9f Move product information to the db 2015-12-14 11:10:50 -08:00
Matt Lott
939fd6865b Update /courses default code language shown 2015-12-11 16:00:36 -08:00
Scott Erickson
703671940f Make Facebook login only happen when user explicitly clicks to do so 2015-12-11 14:47:42 -08:00
Scott Erickson
71bca28148 Have level list in CourseDetailsView include play buttons up through the last level completed and any levels started 2015-12-11 12:59:53 -08:00
Barry
3db216a341 Fetched from master repo 2015-12-10 19:25:42 -05:00
Nick Winter
7076a23fe2 Merge pull request #3252 from themaka/staff-update 
Updating About page to include me
 2015-12-09 08:45:21 -08:00
Nick Winter
591749de15 Fix some button child click and duplicate tag issues with e284ec79 2015-12-09 06:57:33 -08:00
Nick Winter
0945e3ee90 Merge pull request #3250 from Imperadeiro98/master 
Courses i18n
 2015-12-09 06:34:13 -08:00
Maka
31a508842e Updating About page to include me 2015-12-08 23:56:57 -08:00
Maka
6bc8fe08b2 Adding Browserstack to our web page as we promised 2015-12-08 21:38:28 -08:00
Matt Lott
5ea9b6e8af Update trial requests to be type course 2015-12-08 16:16:02 -08:00
Imperadeiro98
95efdcac1c Added a line I removed 2015-12-08 20:58:53 +00:00
Imperadeiro98
e284ec7959 Courses i18n 
Also, removed duplicated 'Continue' string
 2015-12-08 20:05:08 +00:00
Matt Lott
78548b550f Disable class language change after members > 0 2015-12-07 14:36:59 -08:00
Imperadeiro98
b0a1334eec Removed play-level-modal 
I think it is no longer used
 2015-12-07 21:36:50 +00:00
Matt Lott
4ffe9a5035 Update /courses fwd/back links to be more consistent 
Teachers, click here! is bit bigger.
 2015-12-07 11:11:11 -08:00
Nick Winter
e375b8cdc8 Merge pull request #3185 from Imperadeiro98/the-branch 
Refactor to use view in template
 2015-12-07 09:28:26 -08:00
Matt Lott
13c75b3f1f Condense class student progress list 2015-12-06 20:35:54 -08:00
Barry
3ef2be1a42 0px bottom margin on panel 2015-12-06 18:36:54 -05:00
Barry
74f692072e Started repositioning buttons.Can't remove box-shadow from panel 2015-12-06 18:07:41 -05:00
Matt Lott
66f434adba Update class progress colors 2015-12-06 15:00:00 -08:00
Matt Lott
cb4d8fee8c Update /courses/purchase visuals 2015-12-06 14:26:35 -08:00
Matt Lott
45418dbfe3 Update /courses/purchase copy 2015-12-06 07:28:16 -08:00
Matt Lott
c4c4f42e74 Update class enroll modal visuals 2015-12-06 06:27:56 -08:00
Nick Winter
f38eea3590 Merged. Turn off chained rankings for now since they are slow and don't work anyway 2015-12-06 04:36:41 -08:00
Matt Lott
e5af4d857d Update class management enroll and assign button copy 2015-12-05 19:10:46 -08:00
Matt Lott
b9af07c785 Classroom view logged out Ux 2015-12-04 16:37:13 -08:00
Scott Erickson
a573f49c98 Make unused enrollments section hidden for anonymous users in TeacherCoursesView 2015-12-04 15:02:58 -08:00
Scott Erickson
ed478e7c5e Update enrollment terminology in ActivateLicensesModal, change enroll button color on disabled 2015-12-04 14:53:43 -08:00
Scott Erickson
9edd28b67a Update more terminology in classroom view 2015-12-04 14:53:43 -08:00
Scott Erickson
dabf317688 Update enrollment terminology in PurchaseCoursesView 2015-12-04 14:53:43 -08:00
Scott Erickson
afb26d535b Update ClassroomView with new enrollment terminology 2015-12-04 14:53:43 -08:00
Matt Lott
70b1a05435 Display course name in class details view 
Instead of campaign name
 2015-12-04 14:32:22 -08:00
Scott Erickson
6ac659b571 Add explanatory copy to TeacherCoursesView 2015-12-04 14:17:24 -08:00
Nick Winter
b21c20c08d Update free-trial-approved copy to not reference the confirmation email 2015-12-04 14:03:30 -08:00
Nick Winter
c36bed8103 Fix classroom handling of sessions with no state yet 2015-12-04 11:59:51 -08:00
Matt Lott
4778cf5535 /hoc analytics 2015-12-04 11:31:49 -08:00
Nick Winter
417d4802ee Don't show teacher name for single-player course 2015-12-04 11:04:18 -08:00
Scott Erickson
97c28e1c8a Improve slow level loading on CampaignView 
* Fix LevelSetupManager to call onLevelSync asynchronously if level is not loaded on init
* Show a progress bar in level-info-container while level is loading asynchronously
 2015-12-04 10:26:09 -08:00
Scott Erickson
6a48f3697a Add link to student and teacher course pages on course details page 2015-12-04 09:40:25 -08:00
Scott Erickson
8d70b5d53f Remove course mocks 2015-12-04 09:29:14 -08:00
Scott Erickson
f72070d36b Remove #levels from link to course details view from student courses view 2015-12-04 09:26:49 -08:00
Matt Lott
89aeac9424 Rename courses teacher resource pdfs 2015-12-03 16:30:50 -08:00
Matt Lott
c610ce6ffd Remove progress tab from course details view 2015-12-03 16:25:33 -08:00
Scott Erickson
d874569b27 Add stats to ClassroomView 2015-12-03 14:51:38 -08:00
Scott Erickson
b2ed489197 Make sure LadderView displays a valid link back to levels for course arenas 2015-12-03 13:46:50 -08:00
Scott Erickson
3ac8f16d28 Fix ClassroomView sparse progress handling 2015-12-03 13:32:22 -08:00
Scott Erickson
afbfc69fd5 Hide teacher controls in ClassroomView when a student is viewing 2015-12-03 13:16:57 -08:00
Scott Erickson
3fefdfa0a7 Add student total playtime to ClassroomView 2015-12-03 12:29:30 -08:00
Scott Erickson
1bdefb3927 Fix links bleeding into course names in ClassroomView 2015-12-03 12:10:08 -08:00
Scott Erickson
1df87fa685 Add detailed progress and links to ClassroomView 2015-12-03 12:10:08 -08:00
Nick Winter
b0e9670453 Fixed course indexing for first levels in courses 2015-12-03 12:04:49 -08:00
Matt Lott
25213c5342 Add teachers guide to /courses/teachers 2015-12-02 17:28:25 -08:00