Commit Graph

34267 Commits

Author SHA1 Message Date
Peter Pinch
259de40788 Merge pull request #10353 from mitocw/enhancement/aq/disbale_due_dates_section_unit
Made CCX schedule configuration sync with studio (Date time management).
2015-12-10 14:21:20 -05:00
Matt Drayer
1e96c81dba Merge pull request #10901 from edx/saleem-latif/SOL-1418
saleem-latif/SOL-1418: Revised Generate Certificates Section and added Certificate Generation UI
2015-12-10 12:52:58 -05:00
Tim Krones
7253e3c83e Merge pull request #10932 from open-craft/tim/add-xblock-vectordraw
Add xblock-vectordraw to requirements.
2015-12-10 18:31:42 +01:00
Feanil Patel
e2b02137a5 Merge pull request #10927 from edx/feanil/fix_delete_command
Fix the delete course management command.
2015-12-10 12:24:05 -05:00
Diana Huang
493defa3b8 Merge pull request #10919 from edx/diana/fix-flaky-course-team-test
Modify test to be more robust to WrongPageErrors.
2015-12-10 11:53:10 -05:00
Sarina Canelake
5c0accaaf6 Merge pull request #10900 from stvstnfrd/courseware/enabled
Remove COURSEWARE_ENABLED flag
2015-12-10 11:52:49 -05:00
Renzo Lucioni
6d09a5b585 Merge pull request #10923 from edx/renzo/robust-modified-courseware
Make modifies_courseware robust to exceptions raised during tests
2015-12-10 11:26:17 -05:00
Feanil Patel
a4006c8604 Add another test and fix existing tests. 2015-12-10 11:12:53 -05:00
Tim Krones
0ea255bd05 Add xblock-vectordraw to requirements. 2015-12-10 17:12:09 +01:00
clrux
b5f190ddbf Merge pull request #10314 from edx/clrux/ac-21
LMS: Fixing contrast issues in the forums
2015-12-10 10:45:13 -05:00
Renzo Lucioni
124afe4873 Make modifies_courseware robust to exceptions raised during tests
Guarantees that SharedModuleStoreTestCase's reset() method is always called, regardless of whether decorated test cases raise exceptions.
2015-12-10 10:36:21 -05:00
Diana Huang
4db0d9c960 Modify test to be more robust to WrongPageErrors. 2015-12-10 10:35:10 -05:00
Ned Batchelder
a66d05ae69 Merge pull request #9940 from edx/ned/autospec-all-the-things
Add autospec to more mocks
2015-12-10 09:47:28 -05:00
Amir Qayyum Khan
53b22cbf1f Made dates configuration for CCX schedule same as in studio (Course) 2015-12-10 18:45:00 +05:00
Feanil Patel
07f015bb57 Fix the management command. 2015-12-10 08:29:33 -05:00
Peter Pinch
8102bd51b2 Merge pull request #10906 from mitocw/refactor/aq/spacing_indentation_in_schedule.js
Refactoring: Fixed indentation in ccx/schedule.js plus path of momemt.js for requireJs
2015-12-10 08:18:13 -05:00
Peter Pinch
f3285f7811 Merge pull request #10672 from mitocw/fix/aq/add_coach_role_on_ccx
Made coach dashboard available on ccx in addition to master course
2015-12-10 06:48:09 -05:00
Saleem Latif
3134a76118 Revised Generate Certificates Section and added Certificate Generation history UI. 2015-12-10 16:26:19 +05:00
Amir Qayyum Khan
85c7258ec1 Fixed display name ccx course on coach dashboard 2015-12-10 14:34:01 +05:00
Ned Batchelder
3603ede558 Merge pull request #10870 from edx/ned/new-xblock
Update XBlock to 0.4.4 (just a packaging change)
2015-12-09 17:02:49 -05:00
Chris Rodriguez
2cdd0a98a1 Fixing contrast issues in the forums 2015-12-09 15:40:17 -05:00
Ned Batchelder
02fa9c101d Stop adding lms/lib and cms/lib to the PYTHONPATH for pylint
These two directories are not added to sys.path when running the
application, so there is no need to add them for pylint.  When they are
added, they make it impossible to run pylint properly because
lms.lib.xblock is imported when trying to import xblock.
2015-12-09 15:07:37 -05:00
David Baumgold
b9bfe11ec9 Merge pull request #10902 from open-craft/unicode-certs
Fix issue with unicode characters in certificates.
2015-12-09 14:46:11 -05:00
Bill DeRusha
3e96357867 Merge pull request #10912 from edx/bderusha/auto-deadlines-sp
Auto setting of verification deadlines with manual overrides
2015-12-09 13:42:19 -05:00
Bill DeRusha
522095e112 Auto setting of verification deadlines with manual overrides 2015-12-09 11:59:55 -05:00
Christine Lytwynec
175241d709 Merge pull request #10814 from edx/clytwynec/problem-type-a11y-tests
Problem type bok choy and a11y tests
2015-12-09 11:51:51 -05:00
Peter Fogg
9187ca8000 Merge pull request #10910 from edx/peter-fogg/fix-zendesk-logging
Fix spurious Zendesk warnings.
2015-12-09 11:34:34 -05:00
AlasdairSwan
5ecca7c56c Merge pull request #10907 from edx/alasdair/ECOM-3103-fa-form-jasmine-tests
ECOM-3103: Added Jasmine tests for the Financial Assistance form
2015-12-09 10:58:09 -05:00
Amir Qayyum Khan
a02ca25517 Refactoring: Fixed indentation in ccx/schedule.js plus path of momemt.js for requireJs 2015-12-09 20:20:01 +05:00
Christina Roberts
ef4f39fea5 Merge pull request #10788 from simbs/mariana/remove-force-round-time
Release/due times no longer round to half hours.
2015-12-09 10:11:38 -05:00
Peter Fogg
2d40c66361 Fix spurious Zendesk warnings.
We were logging warnings about group names when no group names were
requested. This will clean up Splunk a little bit.
2015-12-09 10:01:14 -05:00
AlasdairSwan
46dc9d70ae Finished tests 2015-12-09 10:00:21 -05:00
Ned Batchelder
43ac38aa87 Add autospec to all mocks 2015-12-09 09:44:22 -05:00
Matjaz Gregoric
f5c2f49eb5 Fix issue with unicode characters in certificates.
If platform name or "All rights reserved" translation contain non-ascii characters,
certificate HTML view would break with "'ascii' codec can't encode character...".
2015-12-09 09:54:09 +01:00
stv
03618f7c01 Normalize urlpatterns
Since these lines of code will now `blame` me, I couldn't bear the
thought of their ugly formatting leading back to me.
2015-12-08 22:12:49 -08:00
stv
2ee80e84ee Remove COURSEWARE_ENABLED flag
Per Dave Ormsbee:
> That was from way back when, when we actually had Django server pools,
> proxied differently by nginx; one was the courseware, and the other
> was askbot, a discussion forum.
>
> They shared all the same code, but different parts were live. It was
> about as good an idea as it sounds.
>
> There is no reason that I can think of in the current day and age where
> you would ever want to run the LMS and *turn off courseware*.
2015-12-08 21:40:42 -08:00
Matt Drayer
1f2f3de4a2 Merge pull request #10809 from edx/asadiqbal08/SOL-1455
asadiqbal08/SOL-1455 Certs: Revise Exceptions UI
2015-12-09 00:14:26 -05:00
Sarina Canelake
608c9000b7 Merge pull request #10897 from edx/if-one
Remove This Awful Code
2015-12-09 00:03:40 -05:00
Sarina Canelake
edf6730ca0 Pylint fixes to symmath module 2015-12-08 22:56:28 -05:00
Sarina Canelake
bc822b7f93 Merge pull request #10873 from edx/kill-callstackmanager
Remove CallStackManager (PLAT-931)
2015-12-08 20:46:21 -05:00
Peter Fogg
5ecb9af294 Merge pull request #10896 from edx/release
Release 2015-12-08
2015-12-08 18:58:14 -05:00
Peter Fogg
1717320b11 Merge pull request #10883 from edx/peter-fogg/investigate-spooky-migrations
Add migrations due to field default changes from #10802.
2015-12-08 18:57:52 -05:00
Sarina Canelake
8caad15188 Remove This Awful Code 2015-12-08 17:51:13 -05:00
Peter Fogg
9c8cadacfe Merge pull request #10894 from edx/hotfix/2015-12-08
Fix Unicode errors in financial assistance.
2015-12-08 17:35:13 -05:00
Ned Batchelder
586dab51f5 Update XBlock to 0.4.4 (just a packaging change) 2015-12-08 17:09:46 -05:00
Peter Fogg
a609e074c7 Fix Unicode errors in financial assistance. 2015-12-08 16:35:38 -05:00
Renzo Lucioni
a974cec3be Merge pull request #10888 from edx/renzo/programs-auth-url
Include auth URL data attribute in the programs authoring template
2015-12-08 15:59:55 -05:00
chrisndodge
4334eb9bd1 Merge pull request #10885 from edx/release
Release
2015-12-08 15:21:48 -05:00
David Ormsbee
ae1f415597 Merge pull request #10840 from edx/ormsbee/new_relic_course_org_attrs
Add course/org info to New Relic in courseware and XBlock rendering.
2015-12-08 14:42:28 -05:00
Christine Lytwynec
a9b308e5e1 Convert some problem type tests to bok choy and add a11y test 2015-12-08 14:39:23 -05:00