Matt Lott
7b2c2b0fdb
Example student view
2016-09-13 06:07:05 -07:00
Rob
a5e20e2899
Merge branch 'sphinxsearch'
2016-09-12 18:33:33 -07:00
Nick Winter
9702c91127
Add first few modules for CS3 curriculum
2016-09-12 18:26:41 -07:00
Rob
a9b58144c4
Check if searching for an id
2016-09-12 18:03:39 -07:00
Nick Winter
d7f4ef6809
Updates to CS 2 curriculum; stub for CS 3 curriculum modules
2016-09-12 16:26:59 -07:00
Thekiddiejsandpython
9f6d7c4932
Change Ipad message, fr.coffee update ( #3927 )
2016-09-12 23:50:18 +01:00
Thekiddiejsandpython
0db0409aa7
Update fr.coffee ( #3926 )
2016-09-12 23:21:12 +01:00
Justinschut
6c4d362210
Update nl-NL.coffee ( #3918 )
2016-09-12 23:19:29 +01:00
Matt Lott
318ec778d5
🐛 Fix IE11 Array.find combat bug
...
Array.find not supported yet
2016-09-12 15:02:31 -07:00
Rob
96f201dae4
Query sphinx search if configured.
2016-09-12 14:57:02 -07:00
Matt Lott
af47e25985
Merge branch 'master' into production
2016-09-12 13:54:36 -07:00
Scott Erickson
a2e8badb6f
Fix tests when running them as a user who has earned something
2016-09-12 10:57:17 -07:00
Matt Lott
9ccca9a5a3
🐛 Remove duplicate test utils.makeLevelSession
2016-09-12 10:54:03 -07:00
Scott Erickson
71a63709e7
Restrict server jasmine to 2.4.1
2016-09-12 10:44:07 -07:00
Matt Lott
b803080bed
Only return member sessions for assigned courses
...
Closes #3906
2016-09-12 09:24:20 -07:00
Matt Lott
346c29361b
Redirect students away from /teachers and vice versa
...
Closes #3910
2016-09-12 06:28:42 -07:00
Matt Lott
ed8e36f5cd
Put student pages under /students
...
Closes #3909
2016-09-12 06:20:59 -07:00
Matt Lott
9f93c0ed18
Restrict resource hub access
...
Closes #3908
2016-09-12 05:39:28 -07:00
Nick Winter
899aceae4e
Merge branch 'master' into production
2016-09-11 09:42:59 -07:00
Nick Winter
c86c3c4628
Fix session loading after all other dependencies and hanging the level load
2016-09-11 09:16:50 -07:00
Robin Yang
4eed50f92a
Add Curriculum Specialist role to /about
2016-09-09 17:09:45 -07:00
Scott Erickson
6ac854c40a
Add update classroom buttons to AdministerUserModal
2016-09-09 16:05:03 -07:00
Robin Yang
cdda8855b5
Fix homepage well button
2016-09-09 15:26:25 -07:00
Nick Winter
5d8569480b
Separate print and web styles for course guides
2016-09-09 15:12:28 -07:00
Phoenix Eliot
18532e4a74
Merge branch 'master' into production
2016-09-09 14:59:56 -07:00
Phoenix Eliot
c24e81aebb
Redirect with same protocol as request
...
Try using // instead of explicit protocol
2016-09-09 14:59:41 -07:00
Nick Winter
bbe4a0540d
Fix solution template problems breaking course guides, and list those broken solution templates in /artisans/solution-problems
2016-09-09 14:41:32 -07:00
Scott Erickson
7bab895dee
Generalize new I18N view system
...
Previously, when diplomats submit translations, the system
would try to figure out whether it should be a 'patch' or a 'change',
and then would either create a patch for an admin or artisan to
review and accept or reject, or would apply the changes immediately
and they would be live. This was done as a compromise between
getting translations live quickly, but also preventing already-translated
text from getting overwritten without oversight.
But having the client handle this added logical complexity. So
this makes all diplomats submit patches, no matter what. The server
is then in charge of deciding if it should auto-accept the patch or not.
Either way, a patch is created.
There was also much refactoring. This commit includes:
* Update jsondiffpatch so changes within array items are handled correctly
* Refactor posting patches to use the new auto-accepting logic, and out of Patch model
* Refactor POST /db/patch/:handle/status so that it doesn't rely on handlers
* Refactor patch stat handling to ensure auto-accepted patches are counted
* Refactor User.incrementStat to use mongodb update commands, to avoid race conditions
* Refactor Patch tests
2016-09-09 10:59:26 -07:00
Imperadeiro98
e70556e900
Change pt-BR description
2016-09-09 15:01:58 +01:00
Rob
308b2bff5a
Merge branch 'master' into production
2016-09-08 16:03:26 -07:00
Rob
ffb4dd6a54
Dang HTTPS
2016-09-08 16:02:39 -07:00
Rob
96be26c72f
Merge remote-tracking branch 'origin/master' into production
2016-09-08 15:24:04 -07:00
Imperadeiro98
baa916e37a
Update i18n ( #3907 )
...
* Update i18n
* Change pt-BR description
* Remove dead code from HomeView
2016-09-08 22:48:28 +01:00
Rob Blanckaert
af3e069828
Merge pull request #3872 from codecombat/filter-domains
...
Code Review: Filter domains for webdev iFrame
2016-09-08 17:46:00 -04:00
Robin Yang
e79b76818b
Change Lisa's title
2016-09-08 12:43:57 -07:00
Robin Yang
1ec76050e2
Add link to /community on /about
2016-09-08 11:03:36 -07:00
Robin Yang
0219844c9d
Increase legibility of Play Now
...
Overrides $gold hex.
2016-09-08 10:56:18 -07:00
Scott Erickson
1fb7996f6c
Fix EarnedAchievement.upsertFor to handle achievements that had no rewards
2016-09-08 10:32:59 -07:00
Phoenix Eliot
00d6d588ec
Update sales lead portioning
2016-09-07 16:11:12 -07:00
Robin Yang
bab9d0b944
Merge pull request #3914 from codecombat/fix-homepage-well
...
Modify Homepage Well Behavior
2016-09-07 15:50:22 -07:00
Phoenix Eliot
97e36cfbd8
Merge branch 'master' into production
2016-09-07 15:28:51 -07:00
Phoenix Eliot
d134047293
Fix algolia inputs in teacher signup form
2016-09-07 15:26:38 -07:00
Robin Yang
ea44d87e91
Add Resource Hub to logged-in teacher homepage well
2016-09-07 14:36:03 -07:00
Robin Yang
f0eae0eb38
Rename "View Progress" button for logged in student
2016-09-07 14:13:19 -07:00
Robin Yang
547b2a2b50
Use broadName for homepage well instead of email
2016-09-07 14:05:44 -07:00
Phoenix Eliot
8f82411751
Merge branch 'master' into production
2016-09-07 13:53:36 -07:00
Rob Blanckaert
9619ff5a0a
Try harder to find the ip address, and dont split the ipaddress if we didnt find it.
2016-09-07 13:46:45 -07:00
Phoenix Eliot
963b82eadd
Fix more query variable getting
2016-09-07 13:44:26 -07:00
Phoenix Eliot
32b56eacb8
Fix getting query parameters in CourseVictoryModal
2016-09-07 13:42:27 -07:00
Phoenix Eliot
e29fe7e761
Add CourseInstance ID to back-to-ladder link
2016-09-07 11:43:09 -07:00
