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

17040 Commits

Author SHA1 Message Date
Diana Huang
b0877270bf Add course grades to programs dashboard. 2017-10-25 15:44:47 -04:00
Cliff Dyer
ab13544cf2 Merge pull request #16112 from open-craft/cliff/handle-completion-events 
Handle completion events
 2017-10-25 10:13:18 -04:00
Harry Rein
618cf6aec5 Merge pull request #16333 from edx/HarryRein/responsive-updates-bookmarks-page 
Update bookmarks and updates pages to be responsive.
 2017-10-25 10:01:03 -04:00
Waheed Ahmed
8c0e87ab65 Fix unicode error on financial assistance page. 
If country name has special character str() raises unicode error.

LEARNER-2951
 2017-10-25 17:27:46 +05:00
Hasnain Naveed
b9cd1043df Merge pull request #16320 from edx/hasnain-naveed/WL-1060 
WL-1060 | Made the dashboard social sharing site aware.
 2017-10-25 16:01:41 +05:00
Albert (AJ) St. Aubin
93c3ff2a98 Merge pull request #16273 from edx/aj/LEARNER-1733 
Implement Entitlement Model for Course Centric Architecture
 2017-10-25 07:00:32 -04:00
J. Cliff Dyer
94d05bceb5 Add handler to receive completion events 
* Submit a completion when receiving a completion event from an XBlock.
* Handle legacy progress events.
* Convert handler to use a dispatch dict instead of an if-else chain.
* Extract masquerade checking from individual handlers.
* Gate submit_completion on waffle switch
* 404 on handler views when trying to submit completion without waffle
switch enabled.

OC-3087

Disallow calling submit_completion when waffle flag is disabled.

Add tests that trying to publish completion errors.
 2017-10-25 06:54:59 -04:00
tasawernawaz
d839d17714 update css and html/ add basics for react 
LEARNER-2804
 2017-10-25 11:12:26 +05:00
Albert St. Aubin
a9011fde58 Implement Entitlement Model for Course Centric Architecture 
[LEARNER-1733]
 2017-10-24 19:12:55 -04:00
Gabe Mulley
e6abdf7e63 Merge pull request #16328 from edx/mulby/fix-course-sock 
Merge PR 16260 back into master with a fix for the course sock
 2017-10-24 15:08:05 -04:00
Harry Rein
73455ac378 Updating bookmarks and updates pages to be responsive. 2017-10-24 14:17:35 -04:00
Gabe Mulley
7efa805fbc fix tests 2017-10-24 13:51:22 -04:00
Harry Rein
ed2e6dc889 Merge pull request #16306 from edx/HarryRein/responsive-dashboard 
Harry rein/responsive dashboard
 2017-10-24 12:33:12 -04:00
Uman Shahzad
0084b3b4ae Merge pull request #16303 from open-craft/uman/ent-tagline-logistration 
[ENT-671] Show the Enterprise tagline on the logistration page.
 2017-10-24 21:01:45 +05:00
Alex Dusenbery
5cf016cf5b EDUCATOR-1570 | Wire up a stub signal receiver to handle comment_created signals. 2017-10-24 11:32:07 -04:00
Gabe Mulley
44e5afba1e Revert "Revert "Merge pull request #16260 from edx/mulby/dynamic-deadline-upgrade-messaging"" 
This reverts commit b541dfa3fd.
 2017-10-24 11:18:06 -04:00
Uman Shahzad
0a726a4679 Show the Enterprise tagline on the logistration page. 2017-10-24 20:12:27 +05:00
Harry Rein
889e9880f5 Responsive dashboard and learner profile. 2017-10-24 11:08:35 -04:00
Hasnain
2277aaca3f WL-1060 | Made the dashboard social sharing site aware. 2017-10-24 16:35:44 +05:00
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