phoenixeliot
aa93a3ec6c
Translate spell type (function/method/snippet/etc)
2016-04-26 16:37:06 -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
Scott Erickson
92f58b29b0
Merge branch 'i18n-subscription-modal-interpolate' of https://github.com/UltCombo/codecombat into UltCombo-i18n-subscription-modal-interpolate
2016-04-25 12:28:46 -07:00
UltCombo
0ad2d086eb
subscribe modal: interpolate feature values for all languages
2016-04-23 22:57:10 -03:00
Matt Lott
93194d4f1e
Change top nav Courses link to Students
2016-04-23 16:54:24 -07:00
Matt Lott
b5f6fef862
Update /about benefits copy
2016-04-21 20:55:20 -07: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
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
Nick Winter
15d762e93e
Propagate i18n; remove newlines in en.coffee so that other locale files' line numbers will match
2016-04-16 18:11:22 -07:00
phoenixeliot
a524256b5b
Add sessionless play for Teachers
2016-04-12 19:34:05 -07:00
Matt Lott
265f4a8c37
Update enrollments purchase blurb
2016-04-05 11:55:14 -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
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
Rob
e40b952ef2
Do something slightly better for loged in students.
2016-03-29 21:44:59 -07:00
Rob Blanckaert
9da65cdcff
New homepage variations.
2016-03-25 17:09:58 -07:00
Nick Winter
914e7eb487
Propagate i18n
2016-03-25 10:54:28 -07:00
Imperadeiro98
5676c6b2e4
Add i18n to new level loading strings
2016-03-22 12:02:36 +00:00
Matt Lott
2bf028cc4a
Update /about page team section
2016-03-20 05:30:52 -07:00
Matt Lott
5d71acba05
Replace HipChat with Slack
2016-03-18 17:05:21 -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
Matt Lott
f14575ece6
Update subscribe modal level counts
2016-03-17 17:29:47 -07:00
Imperadeiro98
9a36267ba7
Cleanup i18n in some files
2016-03-16 21:49:19 +00: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
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
ebc98f988f
Refactor CreateAccountModal out of AuthModal, add class code to signup
2016-03-10 10:52:11 -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
Imperadeiro98
2442115892
Remove i18n from admin pages
2016-03-05 15:08:27 +00:00
Nick Winter
fb9b169c62
Propagate a big i18n
2016-03-04 15:51:16 -08:00
Matt Lott
19b7fe7295
Remove iOS position from /about careers section
2016-02-29 15:16:09 -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
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
Maikel Langezaal
40ed5618b8
Added i18n tags for new HomePage Issue #3413
2016-02-26 11:43:38 +01:00
blorente
ef8ed4b6ed
Added some lines for #710
2016-02-25 23:41:27 +01: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
4b02f120e2
Add new About page and refactor out flat-style
2016-02-24 16:22:06 -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
378ddccce7
Change loop concept to be specifically while loops
2016-02-05 18:11:27 -08:00
Scott Erickson
5fffb2eefb
Remove TeachersFreeTrialView
2016-02-01 10:40:22 -08:00
Scott Erickson
e62e497543
Replace TeachersFreeTrialView with RequestQuoteView
2016-01-28 17:21:36 -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
29350bf1de
Make network error handling more generic
2016-01-27 10:41:56 -08:00
Matt Lott
d2921f66cb
Add approved teacher trials to mail news group
2016-01-17 07:39:30 -08: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
Nick Winter
63d643ac13
Merge branch 'brazil_coupon'
2016-01-12 12:26:36 -08:00
Nick Winter
a91f33df4b
Propagate i18n
2016-01-11 12:59:28 -08:00
Imperadeiro98
cfa4617e16
Add indicator to changed string
2016-01-11 20:57:42 +00:00
Maka
e786073f5b
Updated teacher page to remove 'unlimited enrollment' reference.
2016-01-11 12:59:49 -05: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
ryang217
c29db142a1
Add locale keys for Robin About Page entry
...
Adding onto 57ed2fa
2016-01-05 14:02:08 -08:00
Nick Winter
08f983db59
Propagate i18n
2015-12-23 10:07:32 -08:00
Nick Winter
130b67d6ce
Merge pull request #3273 from codecombat/clean-i18n
...
Remove unused i18n strings
2015-12-23 08:52:47 -08:00
Nick Winter
dfc1ef2e89
Add i18n tags for new legal page stuff
2015-12-23 08:21:49 -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
Imperadeiro98
7af7553bff
Remove unused i18n strings
2015-12-20 15:00:58 +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
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
3f6afa6580
Interpolate discount in year sub description
2015-12-16 16:39:45 -08:00
Scott Erickson
96e6920722
Update some copy to use db products
2015-12-16 16:39:44 -08:00
Nick Winter
67ac55de7f
Implement #3255 in the i18n tags instead
2015-12-10 10:57:24 -08: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
Maka
a11a7c38d4
Added maka_blurb + maka_title to en.coffee
2015-12-09 08:13:03 -08:00
Nick Winter
70c90d9bb5
Propagate i18n
2015-12-09 06:58:33 -08:00
Nick Winter
591749de15
Fix some button child click and duplicate tag issues with e284ec79
2015-12-09 06:57:33 -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
Imperadeiro98
27cad5dce0
Added a resource string and fixed other
2015-12-07 22:34:35 +00:00
Imperadeiro98
b0a1334eec
Removed play-level-modal
...
I think it is no longer used
2015-12-07 21:36:50 +00: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
0d65d73024
Finish merging master into courses-vhoc
2015-12-02 10:10:50 -08:00
Nick Winter
c77e1c0fa2
Add course complete visual state for student CourseDetailsView
...
Also including a few misc tweaks to CourseDetailsView and the end-of-course HeroVictoryModal state.
2015-12-02 09:52:52 -08:00
Nick Winter
88ee363576
Add schoolName field to AuthModal
2015-12-01 17:44:03 -08:00
Nick Winter
8e1143b519
Add schoolName field to AuthModal
2015-12-01 17:32:02 -08:00
Nick Winter
ae6eca583a
Present 'Play Classroom Version' before playing a campaign level when appropriate
2015-12-01 11:24:16 -08:00
Nick Winter
851e3a092e
Play button goes to /courses if that's all the player has played
2015-11-30 16:43:33 -08:00
Matt Lott
171e4f888e
Update /courses/teachers
...
Adding edit class settings modal
Adding create new class modal
Repurposing ClassroomSettingsModal for create new class too.
2015-11-30 16:20:24 -08:00
Nick Winter
457b9d0dbf
Simple AI -> Simple CPU, since players read it as 'AL' (who is SIMPLE AL?)
2015-11-30 15:27:52 -08:00
Nick Winter
fcd970dbe2
Propagate i18n
2015-11-30 10:57:45 -08:00
Nick Winter
ecfd982847
Note PayPal payment method. End limited-time year sale.
2015-11-30 10:50:34 -08:00
Nick Winter
31e7b36310
Add link to /acccount/subscription from /account/settings
2015-11-30 09:19:53 -08:00
Nick Winter
9dccf73af0
'Click to view attempt' for incomplete student solutions
2015-11-27 12:12:32 -08:00
Nick Winter
ac0e21aa39
Propagate i18n
2015-11-25 16:52:10 -08:00
Matt Lott
7b01fd7b65
Add course name to victory modal
2015-11-25 14:23:35 -08:00
Matt Lott
4cc71bd0e6
Add HoC links to homepage
2015-11-24 15:28:37 -08:00
Matt Lott
f261c1466a
Update /teachers
...
Stop forwarding to HoC
Update copy with courses info.
2015-11-24 10:59:14 -08:00
Matt Lott
d7a66722b9
Update teacher surveys
...
Removing trial subscriptions
Updating trial page copy
Adding special HoC trial
Introducing a new course prepaid property endDate, which won’t be
returned or redeemed after the date.
2015-11-24 10:32:19 -08:00
Nick Winter
d673dd9973
Ask, 'How fun was this level?' on course victory
2015-11-19 14:49:29 -08:00
Scott Erickson
ee1e484dda
Have play buttons show 'Compete!' for arena levels on CourseDetails levels list
2015-11-18 14:08:25 -08:00
Matt Lott
b3362c8d0d
Add courses to top menu
...
Bumping about to bottom menu, removing clans.
2015-11-13 11:33:03 -08:00
Nick Winter
9e61928080
Add reset progress feature in account settings
2015-11-12 15:27:28 -08:00
Nick Winter
4497334e6d
Update a couple team avatar and descriptions
2015-11-10 15:21:34 -08:00
Imperadeiro98
424bea90b6
Reverted resources strings removal
2015-11-04 22:44:46 +00:00
Imperadeiro98
89521e2dbe
Remove a lot of unused strings
2015-11-04 21:45:15 +00:00
Nick Winter
05e95923c2
Add Carlos to /about
2015-11-02 16:15:43 -08:00
Josh Callebaut
f885a0e45d
This updates the en.coffee file to account for josh_c's blurb and title.
2015-11-02 16:08:03 -08:00
dillon
493d302a0d
Change visible references of 'HipChat' to 'Slack'.
2015-10-30 00:07:58 -07:00
Imperadeiro98
f2ca1dbd63
Updates to i18n
2015-10-29 15:57:22 +00:00
Nick Winter
448e1c3d9f
Propagated i18n
2015-10-28 09:08:05 -07:00
Nick Winter
a970f322f9
Merge pull request #3132 from Imperadeiro98/i18n-updates
...
Updated i18n across some files
2015-10-28 06:41:35 -07:00
Nick Winter
20f2abfb37
Propagate i18n
2015-10-28 06:26:01 -07:00
Matt Lott
48786372d8
🐛 Prevent parallel managed sub unsubscribes
...
Our unsubscribe API does not support this. Removing option from
subscription UI.
Fixes #2976
2015-10-26 13:45:38 -07:00
Imperadeiro98
09422910f7
Updated i18n
2015-10-23 16:49:05 +01:00
Nick Winter
d5288a254b
Remove Ace of Coders tournament blurb from home page
2015-10-16 14:55:58 -07:00
Imperadeiro98
9184566d67
Update pt-PT and standardize new tip
2015-10-13 21:07:21 +01:00
Nick Winter
8209c4a0c7
Propagate i18n
2015-10-13 12:32:51 -07:00
Nick Winter
537ede7740
Merge pull request #3108 from Imperadeiro98/i18n-and-cleanups
...
Added i18n to some strings
2015-10-13 12:27:58 -07:00
Nick Winter
0c7169f5c0
Merge pull request #3088 from javatlacati/patch-1
...
Update level_loading.jade
2015-10-13 12:21:19 -07:00
Imperadeiro98
20371fa146
Indentation re-fix
2015-10-13 16:14:43 +01:00
Imperadeiro98
2b8856aead
Fixed indentation
2015-10-13 16:08:20 +01:00
Imperadeiro98
fbfb80d4bf
Added i18n to some strings
2015-10-13 16:05:47 +01:00
Matt Lott
708f78153b
Route /hoc to courses
...
When in HoC mode:
Students have an option to play through as a single player, in addition
to entering a code to join an existing class.
Teachers get the normal course enrollment flow, without a sales blurb
on /courses.
2015-10-12 16:25:23 -07:00
Imperadeiro98
a74a09a532
Added change to a string
2015-10-09 16:37:19 +01:00
Nick Winter
5dde55c1f3
Add premium server recognition for Brazil
2015-10-09 08:05:34 -07:00
RUSLAN LÓPEZ CARRO
dcab1eecc0
Update en.coffee
2015-10-09 09:39:15 -05:00
Nick Winter
a34e4b3afd
Merge pull request #3084 from Imperadeiro98/clean-up
...
Cleaned up a couple of files
2015-10-08 16:25:50 -07:00
Scott Erickson
3a90356f59
Add class invite system
2015-10-05 16:01:32 -07:00
Imperadeiro98
7949e4fbab
Cleaned up a couple of files
...
Removed some unused strings, an unnecessary style and an event
2015-10-05 22:30:02 +01:00
Imperadeiro98
446b193f8c
Added i18n to courses
2015-09-25 20:51:51 +01:00
Matt Lott
928f72e2cf
Merge branch 'prepaid-v2' into master
2015-09-25 10:28:27 -07:00
Imperadeiro98
7b183e3ae5
Removed some old 'changed' from en.coffee
2015-09-21 21:03:55 +01:00
Nick Winter
c2c3ae4c4c
Add /careers and Ace of Coders links to home page
2015-09-21 12:40:33 -07:00
Nicholas Winter
5151ab9091
Describe Ace of Coders tournament
2015-09-15 16:36:50 -07:00
Matt Lott
9041646ecc
Update teacher copy
2015-09-09 13:20:23 -07:00
Nick Winter
d92ca389d6
Switched ladder views to display red/blue team instead of humans/ogres.
2015-09-03 15:46:56 -07:00
Nick Winter
98b0bcfc75
Fixed playback victory message for spectate mode. Spectate mode now opens in new tabs.
2015-09-03 15:05:10 -07:00
Nick Winter
02676dc59f
Fixed #2988 .
2015-09-03 05:10:06 -07:00
Nick Winter
dcfa65213e
Propagated i18n.
2015-09-03 04:47:48 -07:00
Nick Winter
1a6c3ad8c0
Updated level counts in en.coffee.
2015-09-03 04:27:36 -07:00
Matt Lott
24fb52a8d9
Update year sub sale copy
2015-08-27 10:54:52 -07:00
Matt Lott
5faeb82d17
Extend terminal sub with year sub purchase
2015-08-27 09:45:10 -07:00
Imperadeiro98
78b136d69c
Fixed {changed} in english file
2015-08-27 10:41:13 +01:00
Matt Lott
b6ddb41df6
Add sale end date to year sub page
2015-08-26 15:22:56 -07:00
Matt Lott
ea6bc6faf3
Add new heroes to year sub sale page
2015-08-26 14:49:35 -07:00
Matt Lott
66c864bca5
Add feature list to year sub sale landing page
2015-08-26 11:16:25 -07:00
Matt Lott
4392da1c20
Redirect to world selector after year sub purchase
2015-08-25 10:59:06 -07:00
Matt Lott
c601652d0b
Add teacher banner image to year sub sale page
...
Also updating sale copy.
2015-08-25 10:38:12 -07:00
Imperadeiro98
cf720ce270
Fixed 'changed' in english file
2015-08-21 21:42:02 +01:00
Matt Lott
9e222d0873
Add subscription sale
...
Give a discount for purchasing a year
New sale button on subscribe modal
New subscription sale landing page
2015-08-21 11:19:39 -07:00
