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

14096 Commits

Author SHA1 Message Date
Max Rothman
babf2420b3 Fix test failure due to missing settings import 2015-07-20 09:54:00 -04:00
tlindaliu
0c837adfce Refactor auth.has_access to auth.user_has_role 
Change name of method to clear up confusion with the access.has_access method.
 2015-07-19 20:42:29 -04:00
tlindaliu
e0840d2d43 MA-849: Change has_access return type 
New classes for the return type, and changes to the has_access function and tests to make them compatible.
 2015-07-19 20:42:29 -04:00
Max Rothman
c97314413b Merge branch 'release' into release-merge-test 
Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/djangoapps/commerce/views.py
 2015-07-17 17:42:03 -04:00
Adam
2735b2b5bb Revert "Decorated instructor dashboard with sudo_required." 2015-07-17 12:11:38 -04:00
srpearce
b12d3f6303 Merge pull request #8773 from edx/sylvia/docs/DOC-2102 
Sylvia/docs/doc 2102
 2015-07-17 15:42:59 -04:00
Jesse Zoldak
c2b4cf210f Skip test that had a hardcoded date expectation MA-1038 2015-07-17 13:05:58 -04:00
Sylvia Pearce
eea3b31105 Delete white spaces that are causing test failures 2015-07-17 16:12:53 +00:00
Ben McMorran
2cf3390ba8 Merge pull request #8837 from edx/benmcmorran/discussion-caching-3 
TNL-2389 Use discussion id map cache for thread creation and update
 2015-07-17 11:33:02 -04:00
Awais Jibran
2d19eafa7c Merge pull request #7404 from edx/waheed/plat407-decorate-instructor-dashboard-with-sudo-required 
Decorated instructor dashboard with sudo_required.
 2015-07-16 21:12:43 +05:00
aamir-khan
d5dda6470e ECOM-1816: added the provider detail on the receipt page. 2015-07-16 18:25:03 +05:00
arbabnazar
21832bb99a modify the whitelist cert script to take list of users 2015-07-16 15:05:34 +05:00
Zia Fazal
bed7d80777 enable certificate generation for html certificates 
Enable Student-Generated Certificates for HTML certs flow
 2015-07-16 13:32:14 +05:00
Waheed Ahmed
bc052db1ee Added DjangoSudo functionality for instructor dashboard and course team page 2015-07-16 11:14:11 +05:00
Renzo Lucioni
60c818f030 Import missing settings module in tests of commerce views 2015-07-15 19:03:26 -04:00
Sarina Canelake
bb7ba752bd Merge pull request #7322 from edx/sarina/remove-old-analytics-dashboard 
Remove everything gated by ENABLE_INSTRUCTOR_ANALYTICS flag AN-4583
 2015-07-15 16:36:28 -04:00
jsa
7449f68522 Support setting email opt-in in calls to the Otto shim 
XCOM-499
 2015-07-15 16:22:36 -04:00
Renzo Lucioni
d4a5ad4818 Mark basket creation and order retrieval endpoints as v0 
These endpoints are currently for internal use only, but should be versioned nonetheless; Drupal will begin using the basket creation endpoint soon. No functionality has been changed. XCOM-494.
 2015-07-15 16:22:29 -04:00
Sylvia Pearce
d2b6ac84d3 Reorganize and update API documentation 2015-07-15 14:31:02 -04:00
Zia Fazal
b5c32ec4f1 ziafazal/SOL-980: Fix error while generating certificates 2015-07-15 12:21:50 -04:00
Sarina Canelake
376fe0a57c Remove outdated Analytics scripts, code, and css 2015-07-15 11:11:10 -04:00
Sarina Canelake
4f2be41a48 Add messaging about Insights to Analytics instructor tab 2015-07-15 11:11:09 -04:00
Ben McMorran
d36eb83a03 Add query count tests 2015-07-15 14:56:04 +00:00
jsa
afa77f86bf Support setting email opt-in in calls to the Otto shim 
XCOM-499
 2015-07-14 11:28:59 -04:00
Adam
95dbec60bb Merge pull request #8902 from edx/things-to-tack-on-rc 
Things to tack on rc
 2015-07-14 09:26:22 -04:00
Marco Morales
493200734e Merge pull request #8296 from edx/marco/find-courses-page/styling-changes 
Styling improvements to openedX search through Find Courses page
 2015-07-14 08:14:35 -04:00
Matt Drayer
d57fd0e47c Merge pull request #8847 from edx/ziafazal/SOL-1021 
ziafazal/SOL-1021: Create Analytics events for certificate actions
 2015-07-14 07:58:55 -04:00
Zia Fazal
57f1dc92b3 ziafazal/SOL-1021: Capture additional certificate configuration events 
* Changed certificate_id to configuration_id
* Fix for acceptance test faiiure
* Add waits to bok choy tests

fix for flaky test
 2015-07-14 11:12:09 +05:00
Sven Marnach
3d7246ecc8 Allow masquerading as a specific user different from the logged in user. 2015-07-13 18:55:45 -07:00
Sarina Canelake
49f78b4742 Remove logging-not-lazy Pylint violations 2015-07-13 17:34:54 -04:00
Sarina Canelake
39d3537410 Pylint logging-format-interpolation: Convert logging calls to use %s formatting 2015-07-13 17:33:29 -04:00
Sarina Canelake
8283c07e32 Remove superfluous-parens pylint violations 
Skipped 'print' statement violations, as print() is Py3k syntax.
 2015-07-13 17:33:28 -04:00
Sarina Canelake
22bbdacee9 Convert Meta classes to new-style classes 2015-07-13 17:33:26 -04:00
Sarina Canelake
ba8fd1c21d Eliminate instances of unused-import Pylint violation 2015-07-13 17:33:25 -04:00
Renzo Lucioni
4a1e617289 Merge pull request #8901 from edx/renzo/version-baskets-api-url 
Mark basket creation and order retrieval endpoints as v0
 2015-07-13 17:12:40 -04:00
Ben McMorran
a119b723fd TNL-2389 Use discussion id map cache for thread creation and update 2015-07-13 20:56:50 +00:00
Ben McMorran
8eb0653a5f Merge pull request #8708 from edx/benmcmorran/discussion-caching-2 
TNL-2458 Cache discussion id mapping on course publish
 2015-07-13 16:52:12 -04:00
Renzo Lucioni
609e6ca277 Mark basket creation and order retrieval endpoints as v0 
These endpoints are currently for internal use only, but should be versioned nonetheless; Drupal will begin using the basket creation endpoint soon. No functionality has been changed. XCOM-494.
 2015-07-13 16:27:58 -04:00
Ben McMorran
ccf20e52b1 TNL-2458 Cache discussion id mapping on course publish 2015-07-13 20:12:52 +00:00
Akiva Leffert
6084f4df27 Make render_xblock return a 404 if access check fails 
The mobile clients need the request to fail if they don't have
permisssions so that they know to refresh a session token.

JIRA: https://openedx.atlassian.net/browse/MA-1003
 2015-07-13 15:56:58 -04:00
AlasdairSwan
51deec380e ECOM-1661 removed nav links for logged out states 
Add context for navigation states
added find course to dashboard sidebar and included check for context that Will adds in PR
removed nav_course_search context due to design change so replaced with nav_hidden
Removed rwd_header.js and all references as no longer being used.

Wrapped Find Courses in dashboard sidebar in if statement
 2015-07-13 15:33:00 -04:00
Adam Palay
5088ae3091 when removing field from _field_data_cache when rebinding a module to a new user, also remove it from _dirty_fields (TNL-2640) 2015-07-13 14:17:27 -04:00
Renzo Lucioni
3db2b5ff88 Commerce baskets API supports cross-domain session and OAuth2 authentication 
Required in order to support requests from Drupal and mobile clients. XCOM-493.
 2015-07-10 15:42:49 -04:00
Clinton Blackburn
b87c525109 Merge pull request #8866 from edx/clintonb/commerce-api-expiration-date 
Updated Commerce API to return CourseMode expiration date
 2015-07-09 17:00:03 -04:00
Tyler Nickerson
825d99deee Merge pull request #8865 from edx/nickersoft/jwt-security 
XCOM-281: LMS now passes JWT issuer and expiration date to ecommerce API client
 2015-07-09 16:43:07 -04:00
Clinton Blackburn
7d91361f32 Updated Commerce API to return CourseMode expiration date 
XCOM-477
 2015-07-09 15:30:48 -04:00
Nickersoft
2d13e9e886 LMS now passes JWT issuer and expiration date to ecommerce API client 2015-07-09 15:06:54 -04:00
Sarina Canelake
07a3d74999 Merge pull request #8844 from ubc/xcompass/pu/fix-test_course_about_in_cart 
Fix failed test_course_about_in_cart
 2015-07-09 14:01:52 -04:00
zubair-arbi
1574650f28 Merge pull request #8845 from edx/tasawer/story/ecom-1651-on-demand-cert-download-update 
Update copy for On Demand Cert Download
 2015-07-09 21:08:47 +05:00
David Ormsbee
472de1a5de Merge pull request #7288 from edx/ormsbee/grade_query_caching 
Grading Performance Work
 2015-07-09 12:07:52 -04:00