Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,372 Commits 1 Branch 0 Tags
484e6ef74da8d755551ee1ea60dbf77d06cda303
Commit Graph

34372 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saleem Latif
484e6ef74d skip 'filtering students' only when students are given and statuses to regenerate are not 2015-12-21 12:57:39 -05:00
Saleem Latif
268db9080a Disable 'Generate Exception Certificates' button when there are no certificate exceptions. 2015-12-21 12:56:42 -05:00
Saleem Latif
5ccc520bb3 Remove unused imports 2015-12-21 12:56:35 -05:00
Saleem Latif
76696aeba9 Add i18n to strings 2015-12-21 12:56:28 -05:00
Saleem Latif
33bbc8d77e display certificate generate history in reverse chronological order 2015-12-21 12:56:20 -05:00
Peter Fogg
30f25105e9 Support tool for changing enrollments. 
Allows support staff or global staff to view a list of a learner's
enrollments, and change enrollment modes. We generate a
ManualEnrollmentAudit record for these enrollment changes in order to
track updates. Additionally, enrollment changes are handled through
the enrollment API, which handles bookkeeping such as granting refunds
where appropriate.

ECOM-2825
 2015-12-17 16:03:58 -05:00
Diana Huang
98f73c062b Merge pull request #10981 from edx/rc/2015-12-16 
Rc/2015 12 16
 2015-12-16 10:35:54 -05:00
Diana Huang
1ebb78c9fa Merge pull request #10996 from edx/ormsbee/revert_staff_info 
Revert "Remove staff debug category type whitelist."
 2015-12-15 10:54:28 -05:00
Sven Marnach
dd79a69705 Merge pull request #10995 from open-craft/smarnach/activate-activetable 
Add the ActiveTable and Vector Draw XBlocks to ADVANCED_COMPONENT_TYPES.
 2015-12-15 16:42:46 +01:00
David Ormsbee
e15907c76f Revert "Remove staff debug category type whitelist." 
This reverts commit bb25473a7c.

Reason for revert: Was breaking display on Course About and Info
pages.
 2015-12-15 10:06:40 -05:00
Sven Marnach
d35effc8d2 Add the ActiveTable and Vector Draw XBlocks to ADVANCED_COMPONENT_TYPES. 2015-12-15 13:58:06 +01:00
John Eskew
0ed7903234 Merge pull request #10838 from edx/jeskew/standardize_mongo_connections 
All feedback above was addressed, the commits were squashed, and tests passed. Merging.
 2015-12-14 09:16:38 -05:00
Nimisha Asthagiri
160f391408 Merge pull request #10959 from edx/course_overview/manual_seeding 
Course Overview - require manual seeding of the table
 2015-12-14 08:39:03 -05:00
Christine Lytwynec
e45ac60c9c Merge pull request #10928 from edx/clytwynec/problem-type-a11y-tests 
add AnnotationProblemTypeTest and SymbolicProblemTypeTest
 2015-12-14 08:38:42 -05:00
Bill DeRusha
67c322e77e Merge pull request #10946 from edx/bderusha/fa-require-country 
Validate country on FA form
 2015-12-14 08:36:40 -05:00
John Eskew
74e70119a2 Use a common MongoDB connection function. 
Add some missing @autoretry_read() decorators.
Change to PyMongo 3.x-compatible syntax.
 2015-12-14 07:42:38 -05:00
Matt Drayer
e9c8b4b07b Merge pull request #10972 from edx/ziafazal/SOL-1375-text-update 
SOL-1375: org help text updated
 2015-12-14 06:04:14 -05:00
Zia Fazal
772a4d4ba1 org help text updated 2015-12-14 12:39:44 +05:00
Nimisha Asthagiri
d6364312f4 Course Overview - require manual seeding of the table. 2015-12-13 23:35:46 -05:00
Matt Drayer
7a8f372e25 Merge pull request #10968 from edx/mattdrayer/SOL-1519 
mattdrayer/SOL-1519: Include course-level configuration in feature check
 2015-12-13 11:29:22 -05:00
Matt Drayer
115b169259 mattdrayer/SOL-1519: Include course-level configuration in feature check 2015-12-13 09:57:29 -05:00
Sarina Canelake
5386d0a4ca Merge pull request #10845 from edx/kill-ora1 
Remove ORA1: Main Pull Request
 2015-12-11 17:31:41 -05:00
Bill DeRusha
5504050abd Validate country on FA form 2015-12-11 17:16:21 -05:00
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
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