Commit Graph

39204 Commits

Author SHA1 Message Date
Clinton Blackburn
2695e7b3cb Merge pull request #10965 from edx/clintonb/credit-followup
Followup to Credit Patch
2015-12-11 17:06:24 -05:00
Sarina Canelake
be1adc3887 Merge pull request #10964 from edx/kill-abtest
Remove outdated abtest_module
2015-12-11 16:53:36 -05:00
Peter Desjardins
557a411c60 Merge pull request #10952 from edx/pdesjardins/DOC-2478
Pdesjardins/doc 2478 - Fix problems with the doc build
2015-12-11 16:46:39 -05:00
Sarina Canelake
21e4c90c3f Keep 'peergrading' and 'combinedopenended' defined as deprecated 2015-12-11 16:16:08 -05:00
Clinton Blackburn
27f853d605 Followup to Credit Patch
- Removed unused variable
- Updated message class and text
- HTML-escaping relevant fields

ECOM-2893
2015-12-11 15:53:18 -05:00
Andy Armstrong
cc24ca55e6 Support local debugging of XBlock JavaScript
It turns out that loading JavaScript with $.getScript
causes Chrome to treat the file as an XHR request
and not JS. I've switched over to using RequireJS
to load the URL which already has the ability to
dynamically load files and have the browser
recognize them.
2015-12-11 15:50:38 -05:00
Sarina Canelake
2b4a1be60f Comment out mock call to ORA1 stub server 2015-12-11 15:30:27 -05:00
Clinton Blackburn
2f131fafed Merge pull request #10961 from edx/release
Merging patch/2015-12-11
2015-12-11 15:16:52 -05:00
Sarina Canelake
dea671f927 Remove ORA1 tabs from setup.py 2015-12-11 15:07:13 -05:00
Sarina Canelake
71a2a2a001 Remove ORA1 lettuce tests 2015-12-11 15:07:13 -05:00
Sarina Canelake
c6c5230941 Create sample deprecated blocks for bok choy tests 2015-12-11 15:07:12 -05:00
Sarina Canelake
ef035524bf Disable failing calculator test 2015-12-11 15:07:12 -05:00
Sarina Canelake
2e4bba0a79 Remove ORA1 test units from xmodule test courses 2015-12-11 15:07:12 -05:00
Sarina Canelake
6280ccdbcf Remove combined_open_ended XModule CSS (ORA1) 2015-12-11 15:07:11 -05:00
Sarina Canelake
9d6ae576da Remove combined_open_ended XModule JS code (ORA1) 2015-12-11 15:07:11 -05:00
Sarina Canelake
f689271639 Remove combined_open_ended XModule Python code (ORA1) 2015-12-11 15:07:10 -05:00
Sarina Canelake
27cb3080c2 Remove final CMS references to 'peergrading' and 'combinedopenended' 2015-12-11 15:07:10 -05:00
Sarina Canelake
addbfa75e8 Remove references to deleted ORA1 test course 2015-12-11 15:07:09 -05:00
Sarina Canelake
e3a9721b42 Remove ORA1 references from LMS Python tests 2015-12-11 15:07:09 -05:00
Sarina Canelake
54262bc8e8 Remove ORA1 management commands 2015-12-11 15:07:09 -05:00
Sarina Canelake
2431baff8f Remove notification_image_for_tab logic (ORA1) 2015-12-11 15:07:08 -05:00
Sarina Canelake
92a7ea5dae Remove ORA1 staff grading coffeescript and templates 2015-12-11 15:07:08 -05:00
stv
0532b87a86 Remove ORA1 images 2015-12-11 15:07:07 -05:00
stv
daf359097d Remove ORA1 static assets from LMS 2015-12-11 15:07:07 -05:00
Sarina Canelake
a3c3c7aa66 fixup! Remove ORA1 common/ acceptance tests 2015-12-11 15:07:07 -05:00
Sarina Canelake
dcf4a15124 Remove CMS ORA1 templates 2015-12-11 15:07:06 -05:00
Sarina Canelake
76095c6f78 Remove ORA1 LMS templates 2015-12-11 15:07:06 -05:00
Sarina Canelake
fbe7f46f47 Adjust Mongo tests to account for removal of ORA1 2015-12-11 15:05:02 -05:00
Sarina Canelake
c450145f7b Update CMS Contentstore tests to not use ORA1 examples 2015-12-11 15:05:01 -05:00
Sarina Canelake
e023fb258b Remove ORA1 XModule JS specs and fixtures 2015-12-11 15:05:01 -05:00
Sarina Canelake
9c656b3ddb Remove ORA1 XModule Python tests 2015-12-11 15:05:01 -05:00
Sarina Canelake
2af299c82b Remove ORA1 common/ acceptance tests 2015-12-11 15:05:01 -05:00
Sarina Canelake
a08fdbcf4c Remove ORA1 test courses 2015-12-11 15:05:00 -05:00
Sarina Canelake
5d58d04fcf Remove ORA1 courseware lettuce tests 2015-12-11 15:05:00 -05:00
Sarina Canelake
f691b7b664 Remove all references to open_ended and s3 interfaces (ORA1) 2015-12-11 15:05:00 -05:00
Sarina Canelake
d887c0fef1 Remove 'open_ended_grading' djangoapp & URLs (ORA1) 2015-12-11 15:04:59 -05:00
Sarina Canelake
46bbd0a668 Remove outdated abtest_module 2015-12-11 14:54:45 -05:00
Clinton Blackburn
ca0e0b9728 Merge pull request #10958 from edx/patch/2015-12-11
Multiple Credit Fixes
2015-12-11 14:31:46 -05:00
Sarina Canelake
cd9fe5776d Merge pull request #10947 from edx/kill-checklists
Remove CMS Course Checklists feature TNL-3896
2015-12-11 13:55:36 -05:00
Ned Batchelder
46e81768b0 Merge pull request #10956 from edx/ned/updated-translations
Update translations (autogenerated message)
2015-12-11 13:49:19 -05:00
Clinton Blackburn
8fcf574029 Corrected Dashboard Display
- Simplified logic determiningg credit messaging on dashboard
- Fixed bug preventing users from initiating credit request

ECOM-2893
2015-12-11 13:02:28 -05:00
Clinton Blackburn
dfadb28343 Fixed Permissions Bug
The permissions class now supports non-GET requests.

ECOM-2893
2015-12-11 13:02:05 -05:00
Ned Batchelder
082306de84 Update translations (autogenerated message) 2015-12-11 12:54:55 -05:00
Peter Desjardins
df13b52181 Fix doc build failures that were caused by Python module import failures. Also fix broken cross references. https://openedx.atlassian.net/browse/DOC-2478 2015-12-11 12:50:40 -05:00
Sarina Canelake
ade863e994 Remove CMS Course Checklists feature 2015-12-11 10:32:14 -05:00
Nimisha Asthagiri
c14c146d0e Merge pull request #10841 from edx/mobile/optimize-course-api
Optimize Course Catalog using CourseOverview
2015-12-11 10:03:35 -05:00
Matt Drayer
d54ac1ebca Merge pull request #10948 from edx/ziafazal/SOL-1375
ziafazal/SOL-1375: Create course to org link at the time of course creation
2015-12-11 09:31:08 -05:00
Bill DeRusha
094f770962 Merge pull request #10944 from edx/bderusha/hcfa-legal-copy
Update Financial Aid copy.
2015-12-11 09:03:00 -05:00
Zia Fazal
2cb2233dde initial change set. add org autocomplete
added unit tests and fixed JS tests

added bok choy tests

fixed broken botchoy tests

fixed course discovery broken test

removed monkey patch at class level

changes after feedback from matte
2015-12-11 18:39:55 +05:00
Matt Drayer
a43063d3b6 Merge pull request #10925 from edx/asadiqbal08/SOL-1455-enhancements
asadiqbal08/SOL-1455: UI Enhancements
2015-12-11 07:50:15 -05:00