Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,158 Commits 1 Branch 0 Tags
449c6903a67aedfeddfcabb6152af0e784ac9bce
Commit Graph

15639 Commits

Author SHA1 Message Date
Michael LoTurco
449c6903a6 Add Support endpoint for Course Entitlements 2018-02-20 13:20:47 -05:00
Qubad786
c90aa33cb8 Integrate with the updated VAL api utils. 2018-02-16 19:06:44 +05:00
J. Cliff Dyer
4946b6b296 Track viewing of individual blocks. 
* Implement a ViewedEvent handling system which calls handlers when a
  block has been viewed for 5 seconds (configurable).
* Hook up Verticals to register their children blocks with this event,
  and submit completions once seen.

OSPR-2093
OC-3358
 2018-02-15 15:13:48 -05:00
Tyler Hallada
4a6d8f78f0 Fix borked rebase conflict resolution 2018-02-15 13:20:20 -05:00
Tyler Hallada
6bc1d34022 Add class=SFE to root div to increase specificity 2018-02-15 13:20:18 -05:00
Tyler Hallada
3e7a742177 Fix integration of accessibility policy page 2018-02-15 13:20:18 -05:00
Tyler Hallada
73cffad5ce Dev in sfe container & prod use /dist of sfe 2018-02-15 13:20:18 -05:00
Michael Youngstrom
8cf2911ec9 Merge pull request #17483 from edx/testeng/bokchoy_auto_cache_update_6c6de6119c17e97f88707f1cc9a06be35827e4b9 
Bokchoy db cache update
 2018-02-14 18:28:23 -05:00
edx-cache-uploader-bot
98defce09d Updating migrations 2018-02-14 15:45:39 -05:00
George Schneeloch
6aa87d43c0 Fix broken link in comment 2018-02-14 14:48:07 -05:00
Michael Frey
ed54cdc1d9 increase limit for staff users 2018-02-13 12:49:26 -05:00
Michael Roytman
7fc5a78528 Merge pull request #17457 from edx/mroytman/EDUCATOR-1613-i18n 
pass language to mako template
 2018-02-13 09:58:00 -05:00
Dennis Jen
20349e88bd Merge pull request #17160 from open-craft/tomaszgy/fix_layout_of_enrollment_in_ccx_dashboard 
Simplify layout of the Enrollment tab of CCX dashboard
 2018-02-13 09:39:58 -05:00
Simon Chen
4459be9d1d Merge pull request #17338 from edx/sstudent/EDUCATOR-2189 
progress indicators on courseware ribbon
 2018-02-12 16:37:09 -05:00
Tomasz Gargas
605f080b9a Simplify the content enrollment tab in the CCX Dashboard. 
Signed-off-by: Tomasz Gargas <tomasz@opencraft.com>
 2018-02-12 21:47:49 +01:00
Michael Roytman
3496bb9a0a pass language to mako template 2018-02-12 15:44:20 -05:00
Sanford Student
8956739a34 Add the visual indicator to the sequence horizontal nav bar to mark verticals completed 
EDUCATOR-2189
 2018-02-12 15:26:40 -05:00
edx-cache-uploader-bot
41926a99e0 Updating migrations 2018-02-12 14:24:58 -05:00
Michael LoTurco
82f4ce4252 Add CourseEntitlementSupportDetail model and related admin model 
Learner-3919
 2018-02-12 11:43:44 -05:00
Jeremy Bowman
a600ef4c25 Merge pull request #17444 from edx/jmbowman/PLAT-1948 
PLAT-1948 Update the cached lettuce test databases
 2018-02-12 08:25:37 -05:00
Jeremy Bowman
b15882e277 PLAT-1948 Update the cached lettuce test databases 2018-02-09 16:07:35 -05:00
Tyler Hallada
523d479ce0 Temporarily comment bad index in ensure_indexes 2018-02-09 15:44:28 -05:00
Stu Young
350111b329 Merge pull request #17441 from edx/testeng/bokchoy_auto_cache_update_42faf22499804dcf29fc66e7c75fb7226d3ccf45 
Bokchoy db cache update
 2018-02-09 15:41:55 -05:00
Ned Batchelder
2be70b5d57 Merge pull request #17366 from mitodl/pdpinch/complex-calc 
Update functions in calc.py to work in complex plane
 2018-02-09 15:17:12 -05:00
edx-cache-uploader-bot
691e35f673 Updating migrations 2018-02-09 12:26:21 -05:00
Matthew Piatetsky
bb8f9ae915 Merge pull request #17431 from edx/bundling_test_handle_exceptions 
handle exceptions and create the necessary html in optimizely
 2018-02-09 08:59:40 -05:00
Ahsan Ulhaq
25130ae3c8 Making honor code not eligible for Certificate 
LEARNER-4117
 2018-02-09 13:53:50 +05:00
bmedx
c8aca84619 Update chem version to force new nltk requirement to be picked up 2018-02-08 17:02:31 -05:00
Matthew Piatetsky
618146e415 addressing comments 2018-02-08 11:29:56 -05:00
Matthew Piatetsky
826ef28b4d handle exceptions and create the necessary html in optimizely 2018-02-08 10:25:52 -05:00
attiyaishaque
9704146e40 EDUCATOR-2224 Discussion Topic with no posts have message. 2018-02-08 14:47:04 +05:00
Jeremy Bowman
4cdff4518f Merge pull request #17425 from edx/jmbowman/PLAT-1949 
PLAT-1949 Less cluttered management command output
 2018-02-07 16:26:39 -05:00
Brian Mesick
86d077ac3d Merge pull request #17413 from edx/bmedx/upgrade_nltk 
Upgrade NLTK to 3.2.5, fixup usage and tests
 2018-02-07 15:39:22 -05:00
Jae Bradley
a19bc8c30d Merge pull request #17408 from edx/LEARNER-3926-portfolio-project-test-upsell 
LEARNER-3926 Portfolio Project Test Upsell Modal
 2018-02-07 14:57:08 -05:00
Jeremy Bowman
88cb9f8c77 PLAT-1949 Less cluttered management command output 2018-02-07 13:44:08 -05:00
bmedx
6a22de454f Upgrade NLTK to 3.2.5, fixup usage and tests 2018-02-07 10:42:23 -05:00
Jeremy Bowman
4c40f106e8 PLAT-1947 Fix bok-choy test that failed under Django 1.11 2018-02-07 09:57:10 -05:00
jaebradley
47b36c6acd implement portfolio project test upsell modal 
update styles

html updates

add waffle flags

fix waffle flags
 2018-02-07 07:41:33 -05:00
Jeremy Bowman
378287fbc0 Merge pull request #17404 from edx/jmbowman/PLAT-1942 
PLAT-1942 Handle xmodule_django field deprecations
 2018-02-06 13:23:04 -05:00
Jeremy Bowman
9682e00f4c PLAT-1943 Fix more naive datetime warnings 2018-02-05 17:58:35 -05:00
Jeremy Bowman
bf86b3da98 PLAT-1942 Handle xmodule_django field deprecations 2018-02-05 15:05:54 -05:00
Tyler Hallada
ffbb0c16ef Merge pull request #17322 from edx/thallada/assets-case-insensitive-sort 
EDUCATOR-2191 Use Mongo aggregate hack to sort case-insensitive
 2018-02-05 14:05:32 -05:00
Tyler Hallada
be474b5d61 Merge pull request #17117 from edx/thallada/contentstore-index-displayname-fix 
Fix typos in contentstore's mongo index keys
 2018-02-05 14:03:54 -05:00
Tyler Hallada
c959ebce01 Add Jira ticket number to TODO comment 2018-02-05 11:27:43 -05:00
Tyler Hallada
45f9b88298 Fix modulestore mongo tests 2018-02-05 11:27:43 -05:00
Tyler Hallada
df5671927f Handle no assets results case properly 2018-02-05 11:27:43 -05:00
Tyler Hallada
1710021c0d Don't sort when sort is None 2018-02-05 11:27:43 -05:00
Tyler Hallada
b55aeb4798 Use Mongo aggregate hack to sort case-insensitive 2018-02-05 11:27:43 -05:00
Tyler Hallada
32e5679d7f Also fix displayname typo in ensure_index comment 2018-02-05 10:35:38 -05:00
Tyler Hallada
fbb65c22c8 Fix typos in contentstore's mongo index keys 
"display_name" was specified as a key to two indexes, but items in the collection have the key "displayname" without an underscore.
 2018-02-05 10:35:38 -05:00