Commit Graph

12296 Commits

Author SHA1 Message Date
Qubad786
4aef8d1c7b exclude bumper 2017-10-26 16:28:25 +05:00
Tyler Hallada
806114a3ef Check org before course deadline config w/ tests 2017-10-25 17:54:47 -04:00
Tyler Hallada
4c8b257bbb Add OrgDynamicUpgradeDeadlineConfiguration model 2017-10-25 15:56:28 -04:00
J. Cliff Dyer
69271d043b Handle completion of scorable blocks
* Add a handler to mark a block complete when a problem is scored.
* Also handle marking incomplete when user problem state is deleted.
* Add score_deleted to published providing_args for PROBLEM_{RAW,WEIGHTED}_SCORE_CHANGED

OC-3089
2017-10-25 11:50:09 -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
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
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
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
Gabe Mulley
7efa805fbc fix tests 2017-10-24 13:51:22 -04:00
bmedx
78ebffa861 Clean up survey warnings 2017-10-24 12:58:02 -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
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
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
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
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
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
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
Douglas Cerna
94bea7a707 Cherry picked Adolfo's commits and addressed Braden's observations 2017-10-19 14:24:58 -04:00
Andy Armstrong
d18022bb5d Make the discussion board responsive
LEARNER-1923
2017-10-19 14:09:22 -04:00
Gabe Mulley
dafeca5770 Change upgrade deadline messaging 2017-10-19 10:59:44 -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
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
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
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
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
Qubad786
9c06bb65b1 Use edx-val transcripts and translations collectively with contentstore.
Adds val trancripts in outcome of get_transcripts_info and rest of flow remains the same and also add fallback  to edx-val rtanscripts for mobile accessible video endpoints.
2017-10-16 19:23:18 +05:00
Qubad786
ec7b78d60e Use edx-val transcripts as a fallback on the video component
Purpose of this, is to serve transcripts from edx-val if the requested transcripts are not found in the contentstore i.e. that's where all the transcripts are living to date.
2017-10-16 19:23:18 +05:00
muhammad-ammar
845bb7b884 transcript import export
EDUCATOR-1216
2017-10-16 19:23:18 +05:00