Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,094 Commits 1 Branch 0 Tags
698475f5d3ee22d2ee47936cdcf230b94649eb69
Commit Graph

16104 Commits

Author SHA1 Message Date
Robert Raposa
698475f5d3 Merge pull request #15070 from edx/robrap/revert-waffle-hack 
Revert: Default unified_course_view on in devstack.
 2017-05-09 14:23:18 -04:00
Nimisha Asthagiri
3491837e9c Merge pull request #15036 from edx/neem/bulk-read-grade-report 
Bulk-reads and Request caching in Course Grade Report
 2017-05-09 10:53:01 -04:00
Nimisha Asthagiri
9df23dc23e Merge pull request #15066 from edx/neem/fix-block-structure-key-error 
Fix KeyError issue with empty course structures
 2017-05-09 10:39:53 -04:00
Robert Raposa
59522311ef Revert: Default unified_course_view on in devstack. 2017-05-09 10:08:58 -04:00
Matt Drayer
cd56cc56cd Merge pull request #15030 from edx/mattdrayer/ENT-318 
ENT-318: Update activation email subject and message text
 2017-05-09 09:29:13 -04:00
Nimisha Asthagiri
16e9636513 Bulk-reads and Request caching in Course Grade Report 2017-05-09 08:58:49 -04:00
Nimisha Asthagiri
8c01ffb71a Fix KeyError issue with empty course structures. 
EDUCATOR-340
 2017-05-09 08:44:09 -04:00
Robert Raposa
ed5412eba9 Merge pull request #15059 from edx/robrap/LEARNER-868 
LEARNER-868: Default unified_course_view on in devstack.
 2017-05-08 14:23:14 -04:00
Cliff Dyer
65352c9d6c Merge pull request #15060 from edx/neem/handle-iter-errors 
Neem/handle iter errors
 2017-05-08 14:11:36 -04:00
Diana Huang
c0b7f9b82d Only try to render dates when user is authenticated. 2017-05-08 12:24:24 -04:00
J. Cliff Dyer
5beae9d1e8 Raise error at first encounter during compute_grades_for_course(_v2) task 2017-05-08 12:18:32 -04:00
J. Cliff Dyer
cebdbc18e7 Update CourseGradeFactory().iter() to return exception objects 2017-05-08 12:16:52 -04:00
Robert Raposa
e185d886d4 Default unified_course_view on in devstack. 2017-05-08 11:45:24 -04:00
Matt Drayer
5e94c63da6 mattdrayer/ENT-318: Update activation email subject and message text 2017-05-06 00:16:43 -04:00
Matthew Piatetsky
15b111410a Merge pull request #15053 from edx/minor_tweaks2 
ECOM-6602 Change buy certificate button style
 2017-05-05 18:03:43 -04:00
Matthew Piatetsky
7215a86539 Change buy certificate button style 
ECOM-6602
 2017-05-05 16:45:16 -04:00
Andy Armstrong
6d4f499b1b Merge pull request #15050 from edx/andya/fix-query-count-test 
Fix broken Python certificate tests
 2017-05-05 16:08:21 -04:00
Andy Armstrong
480cf57026 Improve test failure message 2017-05-05 15:12:21 -04:00
Brandon DeRosier
3d51bd0817 Merge pull request #15022 from open-craft/bdero/ent-361 
ENT-361: Allow hiding of IDP selection page during SSO
 2017-05-05 15:10:35 -04:00
Andy Armstrong
9ce46a3fb5 Improve course experience tests 2017-05-05 13:55:59 -04:00
Andy Armstrong
75a0fdf0eb Enable course sidebar for new course home page 
LEARNER-764
 2017-05-05 13:55:59 -04:00
Noraiz Anwar
3c0e02067d Merge pull request #14954 from edx/noraiz/TNL-6870 
TNL-6870 Add masquerading feature for preview mode
 2017-05-05 18:58:47 +05:00
Andy Armstrong
45d7577268 Merge pull request #14994 from edx/diana/course-dates-fragment 
Add course dates fragment to new sidebar
 2017-05-05 07:40:52 -04:00
Diana Huang
e12a704cea Add new course dates fragment. 
Also add it to the course home page.
 2017-05-04 20:53:42 -04:00
marcotuts
01ae718117 visual adjustments to course outline 2017-05-04 17:05:57 -04:00
Muzaffar yousaf
2f293ccc68 Merge pull request #14901 from OmarIthawi/omar/commentable-id-unicode 
Unicode fixes for django_comment_client and request_cached decorator
 2017-05-04 15:07:22 +05:00
Ned Batchelder
6be4337c7d Merge pull request #14898 from edx/nedbat/help-tokens-app 
Use a new external app for help tokens
 2017-05-03 18:08:27 -04:00
Matthew Piatetsky
2b8020b673 Merge pull request #15033 from edx/minor_tweaks2 
Add view course button
 2017-05-03 17:49:24 -04:00
Matthew Piatetsky
e8c90847ce Add view course button 
This reverts commit 55268dec72.
 2017-05-03 16:37:26 -04:00
Matthew Piatetsky
55268dec72 Revert "Add view course button" 2017-05-03 15:54:10 -04:00
Matthew Piatetsky
efba5ec8cc Merge pull request #15028 from edx/minor_tweaks 
Add view course button
 2017-05-03 15:35:32 -04:00
Robert Raposa
3b31270e07 Fix Start Course vs Resume Course using Course Blocks. 2017-05-03 15:02:42 -04:00
Matthew Piatetsky
4d08b70bb4 Add view course button 2017-05-03 14:50:29 -04:00
noraiz-anwar
d78d52e132 Add masquerading feature for preview mode 2017-05-03 18:50:50 +05:00
Brandon DeRosier
123584e5af ENT-361: Allow hiding of IDP selection page during SSO 
Closes ENT-361.
 2017-05-03 03:39:48 -04:00
Matthew Piatetsky
acbf860347 Merge pull request #15010 from edx/minor_tweaks 
Fix footer css on program details page
 2017-05-02 09:51:16 -04:00
sanfordstudent
bcc3d16589 Merge pull request #14929 from edx/neem/capa-refactor 
Refactor CAPA to use scorable XBlock mixin
 2017-05-02 09:43:06 -04:00
Andy Armstrong
2167584e5e Unify the home and course tabs 
LEARNER-609
 2017-05-01 17:22:28 -04:00
Ben Patterson
6e5769f279 Fix webpack service location for testing. 2017-05-01 17:09:32 -04:00
Brian Jacobel
a2323797f5 Work on sandbox bundling for webpack 2017-05-01 17:09:32 -04:00
Brian Jacobel
3b43fb38a4 Paver runs Webpack (incl watcher) in dev and test 2017-05-01 17:09:32 -04:00
Brian Jacobel
c5df4aa6b7 Work on getting Karma to run 2017-05-01 17:09:32 -04:00
Brian Jacobel
57e8250619 Webpack in LMS 2017-05-01 17:09:32 -04:00
J. Cliff Dyer
ea0027f338 refactor CAPA to use scorable xblock mixin 
for TNL-6594
 2017-05-01 15:08:17 -04:00
Calen Pennington
3deb3a3c1b Merge pull request #14977 from cpennington/cale/fix-learner-542 
Cale/fix learner 542
 2017-05-01 12:18:03 -04:00
Matthew Piatetsky
d1729c555a Fix footer css 2017-05-01 11:56:10 -04:00
Cliff Dyer
ea9fe1de62 Merge pull request #15004 from edx/neem/shuffled-backfill-tasks 
Shuffle tasks.
 2017-05-01 09:17:51 -04:00
J. Cliff Dyer
1daa4eadd5 Shuffle tasks. 2017-04-28 14:19:21 -04:00
Ned Batchelder
ecce0f1513 Merge pull request #14996 from edx/nedbat/remove-useless-super-delegation 
Remove a number of unneeded super()-delegation methods
 2017-04-28 13:04:43 -04:00
Calen Pennington
1811f7235f Minimize the number of queries done while noop updating a user-preference 2017-04-28 12:26:41 -04:00