Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,164 Commits 1 Branch 0 Tags
c19a3368f0bdea4d96baa5041d42e04489f928bb
Commit Graph

17021 Commits

Author SHA1 Message Date
Clinton Blackburn
b574641f17 Minor update to if-else to avoid unnecessary query 
If an anonymous learner visits the course tab view, we now perform one
less query to check enrollment status. This query has been moved inside
an else statement, and is only called if the learer is logged in.
 2017-10-23 17:47:35 -04:00
Ned Batchelder
5940342f71 Merge pull request #16180 from caesar2164/shopping-cart-style-fixes 
Fix Shopping-cart CSS and JS
 2017-10-23 13:51:43 -04:00
Sanford Student
fd8a9fdb02 EDUCATOR-1511: credit users added to verified user partition irrespective of upgrade deadline 2017-10-23 13:14:47 -04:00
Jillian Vogel
1b63bd9cd7 Merge pull request #16155 from open-craft/jill/enable_enterprise_integration 
Lets ENABLE_ENTERPRISE_INTEGRATION be configurable
 2017-10-23 20:09:43 +10:30
Harry Rein
160dba9505 Merge pull request #16210 from edx/HarryRein/responsive-header 
Adding a responsive, unified header to the LMS.
 2017-10-20 17:12:00 -04:00
Harry Rein
3d79e3e05d Adding unified, responsive header. 2017-10-20 16:24:31 -04:00
edx-pipeline-bot
d8620c952a Merge pull request #16296 from edx/release-mergeback-to-master 
Merge release back to master
 2017-10-20 14:52:24 -04:00
sanfordstudent
22f9530dec Merge pull request #16295 from edx/sstudent/EDUCATOR-1573 
EDUCATOR-1573, add waffle switch
 2017-10-20 13:58:01 -04:00
John Eskew
ce37e6d77e Merge pull request #16286 from edx/jeskew/move_third_party_auth_startup_code 
Move third_party_auth settings code to ready method.
 2017-10-20 11:45:37 -04:00
Jeremy Bowman
fcc619e419 Merge pull request #16288 from edx/jmbowman/PLAT-1542 
PLAT-1542 No callable queryset method arguments
 2017-10-20 11:41:05 -04:00
Sanford Student
1d6ca854f5 EDUCATOR-1573, add waffle switch 2017-10-20 11:39:03 -04:00
Eric Fischer
b541dfa3fd Revert "Merge pull request #16260 from edx/mulby/dynamic-deadline-upgrade-messaging" 
This reverts commit a13595352f, reversing
changes made to 68d5fe8922.
 2017-10-20 10:45:40 -04:00
John Eskew
54441488dc Add comments to docstring forbidding additional code. 2017-10-20 07:59:32 -04:00
Waheed Ahmed
c56f72878e Fix edX logo links to home page instead of dashboard. 
When you are on the Dashboard, or on any page in courseware, the logo
in the Header links to dashboard and the logo in the footer links
to edX home page.

LEARNER-2881
 2017-10-20 14:49:06 +05:00
Jeremy Bowman
d4ce82a4f9 PLAT-1542 No callable queryset method arguments 2017-10-19 18:06:26 -04:00
Nimisha Asthagiri
41862cf163 Merge pull request #16035 from proversity-org/proverity/NVN-enrollment-search-instructor-dashboard-fix 
FIX: course enrollment search, FIX: hidden tabs on instructor dashboard
 2017-10-19 17:50:06 -04:00
Andy Armstrong
e2612bdccf Merge pull request #16249 from edx/andya/responsive-discussions 
Make the discussion board responsive
 2017-10-19 17:09:47 -04:00
John Eskew
a6757e47a4 Move third_party_auth settings code to ready method. 2017-10-19 16:17:31 -04:00
Ayub khan
c739f59ea9 Merge pull request #16284 from edx/you/update_translations 
Update translations (autogenerated message)
 2017-10-20 00:15:55 +05:00
Douglas Cerna
94bea7a707 Cherry picked Adolfo's commits and addressed Braden's observations 2017-10-19 14:24:58 -04:00
ayub-khan
3032de0251 Update translations (autogenerated message) 2017-10-19 23:18:25 +05:00
Andy Armstrong
d18022bb5d Make the discussion board responsive 
LEARNER-1923
 2017-10-19 14:09:22 -04:00
Brittney Exline
40f37608fa Merge pull request #16265 from edx/bexline/data_passback 
ENT-594 Enterprise version bump and Add settings variable for ENTERPRISE_REPORTING_SECRET
 2017-10-19 14:01:28 -04:00
Brittney Exline
23640d0019 ENT-594 Enterprise version bump and Add settings variable for ENTERPRISE_REPORTING_SECRET 2017-10-19 12:24:05 -04:00
Gabe Mulley
dafeca5770 Change upgrade deadline messaging 2017-10-19 10:59:44 -04:00
Matt Tuchfarber
b5ddcb3950 Merge pull request #16263 from edx/tuchfarber/program_marketing_fix 
Fix program marketing page when it doesn't have a video.
 2017-10-19 09:18:48 -04:00
Harry Rein
8c8edd2c80 Merge pull request #16274 from edx/HarryRein/LEARNER-2860-goals-styling-fixes 
Orders course goals and updates styling.
 2017-10-19 09:16:12 -04:00
Jillian Vogel
425239a509 Disables Enterprise Integration feature by default 
Moves ENABLE_ENTERPRISE_INTEGRATION to settings.FEATURES,
and changes the default value to False.
 2017-10-19 15:58:13 +10:30
Harry Rein
ec17971a2b Orders course goals and updates styling. 
LEARNER-2860
 2017-10-18 16:57:57 -04:00
Matt Tuchfarber
75e3845dad Fix issue where program doesn't have video 
I wrongly assumed a video field wouldn't exist on a program
that doesn't include a video. Since it exists and is set to null
this fixes the retrieval of the source url.
 2017-10-18 16:56:00 -04:00
Jeremy Bowman
bda84d526b PLAT-1555 Stop using deprecated TEST_* DB setting keys 2017-10-18 14:17:09 -04:00
sanfordstudent
13f3b496a2 Merge pull request #16266 from edx/aed/EDUCATOR-1428 
EDUCATOR-1428 | Add time_limit to course/subsection grading tasks.
 2017-10-18 13:33:52 -04:00
Gabe Mulley
3ed43c9456 Merge pull request #16261 from edx/newrelic-tracing-ace 
Add custom new relic tracing to ACE tasks
 2017-10-18 11:31:49 -04:00
John Eskew
e28932c74a Merge pull request #16262 from edx/jeskew/fix_historical_deletion_mgmt_cmd 
Fixes to mgmt cmds which delete django-simple-history data.
 2017-10-18 10:30:46 -04:00
Gabe Mulley
fce9344ddc new relic tracing for ace 2017-10-18 10:29:53 -04:00
Brian Mesick
9e91d3d0be Merge pull request #16070 from edx/bmedx/settings_tuple_to_list_PLAT-1530 
Change Django settings from tuples to lists to prep for 1.11 upgrade
 2017-10-18 09:20:14 -04:00
John Eskew
41aaaab584 Fixes to mgmt cmds which delete django-simple-history data. 2017-10-18 09:15:37 -04:00
Brian Mesick
ba4c6ca2aa Merge pull request #16256 from edx/bmedx/django111_models_and_migrations_cleanup 
Remove empty models.py files
 2017-10-18 09:03:32 -04:00
John Eskew
eb99657770 Merge pull request #16220 from edx/jeskew/delete_historical_data 
Mgmt commands to clear data from historical tables.
 2017-10-18 09:00:21 -04:00
McKenzie Welter
0375e42d59 Merge pull request #16167 from edx/McKenzieW/course-cert-hours-of-effort 
Flag for Hours of Effort in course certificates
 2017-10-17 18:27:22 -04:00
Braden MacDonald
d64e0b9501 Merge pull request #16047 from open-craft/cliff/block-completion-model 
Block completion model
 2017-10-17 15:06:34 -07:00
McKenzie Welter
39bf59e6d3 Flag for Hours of Effort in course certificates 
Retrieve different data fields from Discovery
 2017-10-17 17:07:54 -04:00
bmedx
763fa4de99 Remove empty models.py files 2017-10-17 16:21:21 -04:00
Alex Dusenbery
1ea419c2c4 EDUCATOR-1428 | Add time_limit to course/subsection grading tasks. 2017-10-17 15:28:01 -04:00
John Eskew
f3e089bd3f Mgmt commands to clear data from historical tables. 2017-10-17 15:27:59 -04:00
Sofiya Semenova
7382fe12aa Merge pull request #16203 from edx/ssemenova/dashboard-cert-info 
Clean up dashboard_certificate_information template.
 2017-10-17 14:50:42 -04:00
J. Cliff Dyer
4ab64f76a2 Add BigAutoField for BlockCompletion primary key. 2017-10-17 14:45:49 -04:00
J. Cliff Dyer
6f89157d62 Introduce BlockCompletion model. 
* Includes custom manager.
* Includes percent validation.
* Includes useful indices.
* Subclasses TimeStampedModel

OC-3086
 2017-10-17 14:35:58 -04:00
Sofiya Semenova
b8d73df5a4 Cleaning up dashboard_certificate_information template. 2017-10-17 13:27:19 -04:00
bmedx
21791ccb58 Change Django settings from tuples to lists to prep for 1.11 upgrade 2017-10-17 12:53:02 -04:00