Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

14096 Commits

Author SHA1 Message Date
Brian Beggs
0251e8e15a Merge pull request #11545 from mitocw/feature/aq/support_mutiple_instances_ccx_mitocw#175 
Allow multiple instances of ccx
 2016-02-24 21:22:29 -05:00
sanfordstudent
a7d6b13b7e Merge pull request #11637 from edx/sstudent/MA-1038-permanent-fix 
MA-1038
 2016-02-24 14:01:03 -05:00
Michael Katz
fd065c9e8c Merge pull request #11643 from edx/release 
Release 2016-02-24
 2016-02-24 11:16:16 -05:00
Giovanni Di Milia
7683eadcaf Modified permission classes for CCX REST APIs 
Modified how the per object permissions are enforced in the CCX REST APIs
 2016-02-24 08:40:07 -05:00
muhammad-ammar
d226b55b04 don't catch exception to raise http500 
TNL-4043
 2016-02-24 11:03:17 +05:00
muzaffaryousaf
ee637c58ea Set notes page size to 25 
TNL-4108
 2016-02-24 11:03:17 +05:00
muhammad-ammar
ea89d2eea4 hide notes tab if feature flag is disabled or harvard notes enabled 
TNL-2816
 2016-02-24 11:03:16 +05:00
muhammad-ammar
ce57700d68 hide paging footer when only one page 2016-02-24 11:03:15 +05:00
muzaffaryousaf
bfa2ea5bd8 Remove sanitization from python & adding it to the templates. 
TNL-4012
 2016-02-24 11:03:15 +05:00
muhammad-ammar
13b14e0a60 Paginate edxnotes frontend 
TNL-3908
 2016-02-24 11:03:14 +05:00
muhammad-ammar
e2333214b1 paginate edxnotes views 
TNL-3840
 2016-02-24 11:03:14 +05:00
Bill DeRusha
85df4eee4c Merge pull request #11630 from edx/bderusha/soft-sec-id 
Do not send initial verification photo_id if new photo_id provided
 2016-02-23 14:47:29 -05:00
Sanford Student
3313b755fa MA-1038 2016-02-23 14:20:51 -05:00
Bill DeRusha
beacf3c93a Only return unexpired initial verifications. 2016-02-23 13:38:48 -05:00
Bill DeRusha
a1a58db9be Do not send initial verification photo_id if new photo_id provided 
ECOM-2888
 2016-02-23 13:29:53 -05:00
Michael Frey
90146d9ae0 Only allow ecommerce checkout if user is also activated 2016-02-23 10:11:14 -05:00
Toby Lawrence
acf6c1d609 Merge pull request #11523 from edx/perf/speed-up-slow-user-role-ops 
Don't blow away the role cache when updating.
 2016-02-23 06:55:00 -05:00
Eric Fischer
73fa3190cd Revert "Inform openassessment to clear submission" 
This reverts commit 920cc3d222.
 2016-02-22 17:32:44 -05:00
Qubad786
b669765cee TNL-4136 fix topic detail endpoint's url to support alphanumeric and period characters 2016-02-23 02:39:22 +05:00
Michael Katz
bf5d2034a1 Revert "Added staff role on ccx to staff of master course and added a data migration for existing ccx courses." 
This reverts commit 91bf48fc8c.
 2016-02-22 15:33:01 -05:00
Nimisha Asthagiri
03487073aa Merge pull request #11579 from edx/course_blocks_api/support_substructure 
Course Blocks API: Support accessing a substructure MA-1604
 2016-02-22 13:38:01 -05:00
Nimisha Asthagiri
70469c16b2 Block Structure API: Replace has_block with __contains__ 2016-02-22 11:25:46 -05:00
John Eskew
df261cd5d6 Remove all request.REQUEST usages - replace with request.GET and/or 
request.POST to eliminate Django deprecation messages.
 2016-02-22 09:54:26 -05:00
Amir Qayyum Khan
2ee9105017 Fixes bug where coach with multiple CCXs can't view coach dashboard 2016-02-22 18:59:07 +05:00
Nimisha Asthagiri
4bbe9a2021 Merge pull request #11326 from edx/mobile/remove-dead-code 
Mobile API: remove unused endpoints
 2016-02-19 15:14:13 -05:00
Eric Fischer
920cc3d222 Inform openassessment to clear submission 
The openassessment xblock stores some information that assumes
a given student module is never cleared, it needs to be informed of
this operation.
 2016-02-18 15:41:13 -05:00
Nimisha Asthagiri
c088df0835 Remove unused Mobile latest_updates field 2016-02-18 12:12:05 -05:00
Nimisha Asthagiri
deb9148f64 Remove unused Mobile CourseBlocksAndNavigation endpoint. 2016-02-18 12:12:05 -05:00
Nimisha Asthagiri
fa8ca11d8c Remove unused Mobile Social Facebook endpoint 2016-02-18 12:12:04 -05:00
Peter Pinch
dcb04cb092 Merge pull request #10877 from mitocw/enhancement/aq/add_master_course_staff_in_ccx 
Added staff and instructor roles on ccx to all the staff and instructors of the master course plus fixed view as student masquerade and display name of ccx on coach dashboard
 2016-02-18 11:09:37 -05:00
Nimisha Asthagiri
d969f48646 Course Blocks API: Support accessing a substructure MA-1604 2016-02-18 10:03:58 -05:00
Zia Fazal
e8ccc2f3e5 Merge pull request #11076 from CredoReference/render-lms-main-navigation-with-template 
Render lms main navigation (tabs) with template
 2016-02-18 11:21:16 +05:00
Renzo Lucioni
62d07c91b5 Merge pull request #11541 from edx/renzo/manual-cert-trigger 
Add API endpoint for issuing programs certificates
 2016-02-17 15:04:13 -05:00
Toby Lawrence
12633f1710 Make the test_grades_csv test consistent. 
Before it was depending on the order of results, which is not very consistent.  Now we use known identifiers to delve through data before making our assertions.
 2016-02-17 14:18:01 -05:00
Renzo Lucioni
619420bb80 Add API endpoint for issuing programs certificates 
Allows staff users to manually enqueue the task responsible for awarding programs certificates. ECOM-3692.
 2016-02-17 13:52:27 -05:00
vkaracic
86a4710ee8 Otto checkout flow 2016-02-17 18:16:44 +01:00
Nimisha Asthagiri
eb914a00b4 Merge pull request #11564 from edx/release 
Release Feb 17, 2016
 2016-02-17 11:17:13 -05:00
Ahsan Ulhaq
d90c1a2845 Merge pull request #11560 from edx/ahsan/ECOM-2831-GeneratedCertificates-admin-broken 
set show_full_result_count false
 2016-02-17 20:09:45 +05:00
Ahsan Ulhaq
88df456414 set show_full_result_count false 
ECOM-2831
 2016-02-17 18:10:40 +05:00
M. Rehan
af9e26f5cb Merge pull request #11479 from edx/mrehan/plat-998-warnings-on-logout 
Fix - Bypass unnecessary logs on logging out.
 2016-02-17 17:46:05 +05:00
Amir Qayyum Khan
91bf48fc8c Added staff role on ccx to staff of master course and added a data migration for existing ccx courses. 2016-02-17 15:54:28 +05:00
Qubad786
faf3a64e36 Bypass unnecessary logs on loging out 2016-02-17 13:42:01 +05:00
aamir-khan
b6604a3a70 ECOM-3706: Updated the hard coded datetimes in tests and also added the test for restricting credit direct sale 2016-02-16 13:14:44 -05:00
aamir-khan
f7be42a135 ECOM-3706: Restricted the enrollment in credit modes directly in upgradeAndVerified flow 2016-02-16 13:14:44 -05:00
Toby Lawrence
9654449302 Merge pull request #11465 from edx/perf/speed-up-courseware-tests 
Switch to SharedModuleStoreTestCase in the 'courseware' app where possible.
 2016-02-16 10:06:53 -05:00
Dmitry Viskov
d532f8de0e Render LMS main navigation (tabs) with template, override templates for a specific list item 2016-02-16 17:03:53 +03:00
Awais Jibran
31853d49cc Merge pull request #11495 from edx/aj/tnl4115-improve-log-get-course-section 
Use Course ID in logging an exception
 2016-02-16 18:56:50 +05:00
Toby Lawrence
49d3a7d35d More quality fixes. 2016-02-16 07:58:33 -05:00
Saleem Latif
cd101d5dec Merge pull request #11494 from edx/saleem-latif/WL-307 
WL-307: correct FAVICON_PATH setting for comprehensive theming
 2016-02-16 14:39:13 +05:00
Saleem Latif
75f17ecc8e correct FAVICON_PATH setting for comprehensive theming 2016-02-15 17:13:19 +05:00