Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,363 Commits 1 Branch 0 Tags
f1ebee433f6aba40a3ad5f36f406cb9f65815d3d
Commit Graph

6667 Commits

Author SHA1 Message Date
Michael Frey
f1ebee433f Only allow ecommerce checkout if user is also activated 2016-02-24 11:23:40 -05:00
Eric Fischer
73fa3190cd Revert "Inform openassessment to clear submission" 
This reverts commit 920cc3d222.
 2016-02-22 17:32:44 -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
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
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
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
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
wajeeha-khalid
7a9fea0236 Merge pull request #11450 from edx/jia/MA-1985 
MA-1985 add analytics event to thread/comment vote
 2016-02-12 21:13:45 +05:00
Awais Jibran
5be6d31384 Use Course ID in logging an exception 
TNL-4115
 2016-02-12 20:10:59 +05:00
Peter Fogg
77343a02d2 Merge pull request #11486 from itsbenweeks/info_display_number_fix 
info page course id -> display_number_with_default
 2016-02-11 12:53:21 -05:00
wajeeha-khalid
72aeb2c8da implemented test event data for thread/comment vote 2016-02-11 22:30:41 +05:00
wajeeha-khalid
3312eb2d22 refactored code into exclusive functions 2016-02-11 21:31:44 +05:00
wajeeha-khalid
fe9b1a0d80 add analytics event to thread/comment vote 2016-02-11 21:31:44 +05:00
Ben Weeks
52e8db34fd course id/org/name -> display_stuff_with_default 2016-02-11 10:25:12 -05:00
Toby Lawrence
4611829ac1 Quality fixes. 2016-02-11 08:48:48 -05:00
Peter Fogg
5d0ed333a5 Merge pull request #11502 from edx/peter-fogg/audit-cert-cutoff-date 
Explicitly cut off cert eligibility.
 2016-02-10 15:41:16 -05:00
Peter Fogg
2d028f8246 Add an explicit cutoff date for audit cert granting. 
The previous logic was a convoluted way of doing the same thing, and
has already led to one bug. Instead of hoping that the bugs are ironed
out now and that future devs maintain this logic properly, let's just
set a real cutoff date.
 2016-02-10 12:16:37 -05:00
Awais Jibran
eb97c6cfb9 Merge pull request #11421 from edx/aj/ecom3612-beta-tester-self-paced-course-issue 
Fix Beta Testers access courseware in self-paced courses
 2016-02-10 21:02:22 +05:00
Jesse Zoldak
7ccca469fc Merge pull request #11481 from edx/zoldak/remove-lettuce-homepage-test 
Convert homepage acceptance test to bok-choy
 2016-02-10 08:45:06 -05:00
Jesse Zoldak
f0c54c15ee Convert homepage acceptance test to bok-choy 2016-02-10 06:32:38 -05:00
Awais Jibran
5899be9207 Fix Beta Testers access courseware in self-paced courses 
ECOM-3612
 2016-02-10 14:47:03 +05:00
John Eskew
3f58954f3a Merge pull request #11469 from edx/jeskew/fix_django_19_warnings 
Remove deprecation warnings from Django models.
 2016-02-09 16:38:23 -05:00
John Eskew
bb5c28c0c5 Remove deprecation warnings from Django models. 
Add app_label definitions in Meta classes for models.
Move import of course_mode model into methods to prevent importing
the models at startup time.
 2016-02-09 09:28:43 -05:00
Jesse Zoldak
f8c66c1a16 Merge pull request #11463 from edx/zoldak/staff-debug-test 
Remove duplicate staff debug acceptance tests
 2016-02-09 09:24:19 -05:00
wajeeha-khalid
9d6df1e132 Merge pull request #11189 from edx/ekafeel/discussion-api-namespace-pagination 
Ekafeel/discussion api namespace pagination
 2016-02-09 17:42:48 +05:00
Toby Lawrence
6a6ef0fd35 Fix some broken tests. 2016-02-08 14:13:36 -05:00
Toby Lawrence
ad9498ecf4 Switch to SharedModuleStoreTestCase in the 'courseware' app where possible. 2016-02-08 14:11:04 -05:00
Jesse Zoldak
fc4866054f Remove duplicate staff debug acceptance tests 2016-02-08 13:17:14 -05:00
David Ormsbee
9ae0dada4c Merge pull request #11445 from edx/ormsbee/clear_cache_in_tests 
Clear caches between tests for ModuleStoreTestCase/SharedModuleStoreTestCase
 2016-02-08 10:23:54 -05:00
sanfordstudent
c51bcdbf91 Merge pull request #11418 from edx/sstudent/MA-1918-handle-no-handouts 
MA-1918 returning None for courses with no handouts
 2016-02-08 08:52:41 -05:00
David Ormsbee
be25bb8aba Clear caches between tests for ModuleStoreTestCase/SharedModuleStoreTestCase 
Cached values were leaking across tests, causing difficult to debug errors,
particularly when using Config Models. As part of this work, certain tests
that had query counts that relied on those values being cached needed to
be adjusted up.
 2016-02-06 00:01:15 -05:00
jsa
92aa346fdf Implement celery task to award program certs. 
ECOM-3354
 2016-02-05 12:21:20 -05:00
Sanford Student
f88e5bc1d8 MA-1918 returning None for courses with no handouts 2016-02-05 11:31:16 -05:00
Kevin Falcone
98671a8aa6 Merge pull request #11399 from edx/jibsheet/dont-use-using 
Don't use using() in migrations
 2016-02-04 19:47:10 -05:00