Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,619 Commits 1 Branch 0 Tags
7b5f9b80098b9a8100dc0acc9bb19f7ef6804713
Commit Graph

2578 Commits

Author SHA1 Message Date
Andy Armstrong
7b5f9b8009 Implement RequireJS Optimizer in the LMS 
TNL-2487
 2015-07-20 13:59:54 -04:00
Max Rothman
80cf4d6ecb Merge pull request #8969 from edx/release-merge-test 
Release merge test
 2015-07-20 10:38:37 -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
Sylvia Pearce
eea3b31105 Delete white spaces that are causing test failures 2015-07-17 16:12:53 +00: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
Tasawer
1ded8b546c Update code of get_eligibility api. 
ECOM-1858
 2015-07-16 12:52:16 +05:00
Waheed Ahmed
bc052db1ee Added DjangoSudo functionality for instructor dashboard and course team page 2015-07-16 11:14:11 +05:00
Sylvia Pearce
c2420b0940 Final tweaks to API documentation updates 2015-07-15 21:46:11 +00:00
Sylvia Pearce
d2b6ac84d3 Reorganize and update API documentation 2015-07-15 14:31:02 -04:00
Feanil Patel
ea5b41cd84 Merge pull request #8898 from edx/feanil/fix_student_migrations 
Update migration dependency.
 2015-07-14 10:27:56 -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
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
47b99720fa Clean up old style class definitions 2015-07-13 17:33:27 -04:00
Sarina Canelake
22bbdacee9 Convert Meta classes to new-style classes 2015-07-13 17:33:26 -04:00
Sarina Canelake
b41e70f541 Remove Pylint violations deprecated-pragma, bad-option-value 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
Feanil Patel
4ae4e25f5c Update student migration 0035 to add a dependency. 
This migration instantiates the modulestore which is now dependent
the xblock_django database config settings.  So the initial migration
for that has to run before this migration.
 2015-07-13 16:53:33 -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
jsa
41b0b793de reduce log severity when building marketing links 2015-07-10 16:21:12 -04:00
Ahsan Ulhaq
c94f043c2b Credit Payment - Dashboard States 
ECOM-1578
 2015-07-09 13:33:31 +05:00
Clinton Blackburn
cd60dd5606 Merge pull request #8771 from edx/clintonb/currency-comparison-fix 
Comparing currencies with same case
 2015-07-09 01:45:39 -04:00
Will Daly
e60ae31d84 Cherrypick hotfix-2015-07-07 into release candidate 
Includes the changes from 897fddba3e.
Those changes were introduced while resolving a merge
conflict from release back into master.
 2015-07-08 16:55:38 -04:00
Kyle McCormick
1dfe9ed9e8 MA-779 Update student dashboard to use CourseOverview 2015-07-08 12:05:38 -04:00
Kyle McCormick
5b630a7704 MA-779 Make has_access work on CourseOverview objects 2015-07-08 12:05:38 -04:00
Matt Drayer
c25e37ea93 Merge pull request #8734 from edx/ziafazal/SOL-1011 
ziafazal:SOL-1011: Certificate URL should use 'download_url' field and not 'verify_uuid'
 2015-07-07 15:40:34 -04:00
Will Daly
104bcd5143 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	common/djangoapps/student/views.py
	openedx/core/djangoapps/credit/tests/test_api.py
 2015-07-07 09:58:45 -07:00
Clinton Blackburn
301a874c5c Enforcing lowercase currency for CourseMode 
- CourseMode.save() always lowercases the currency value
- CourseMode currency comparisons have been updated to be case-insensitive
 2015-07-06 23:38:25 -04:00
Ahsan Ulhaq
796e4cb5e6 Merge pull request #8580 from edx/ahsan/ECOM-1719-LMS-Modification-enrollment-API-update 
LMS: Modification in enrollment API
 2015-07-07 02:32:53 +05:00
Matt Drayer
a8f909fe77 Merge pull request #8659 from edx/ziafazal/SOL-1006 
ziafazal/SOL-1006: Disable course 'start date' for inactive web-enabled certificates
 2015-07-06 16:45:24 -04:00
Will Daly
e67975b275 Feature flag credit provider messaging on the dashboard. 
When the credit eligibility is disabled, skip the code
that access the CreditProvider table.  This will allow us
to safely delete a column from the table in rc/2015-07-08.
 2015-07-06 12:56:15 -07:00
Ahsan Ulhaq
8d9d4b85d5 LMS: Modification in enrollment API 
Changed enrollment api to set enrollment atributes if the course is
credit course

ECOM-1719
 2015-07-07 00:49:02 +05:00
Usman Khalid
fe54b085c6 Added ability to disable xblock types in LMS. 
TNL-2305
 2015-07-03 20:58:40 +05:00
zubair-arbi
8934818381 Merge pull request #8753 from edx/zub/bugfix/ecom-1734-change-login-redirect-url 
change redirect url from '/accounts/login' to '/login'
 2015-07-03 16:19:24 +05:00
Will Daly
bfe01605b4 Merge pull request #8700 from edx/will/remove-provider-course-m2m-relation 
Credit eligibility/provider refactor
 2015-07-02 12:36:37 -07:00
Ali Mohammad
eb70f2303c Merge pull request #8749 from edx/rc/2015-06-29 
Merge back into master
 2015-07-02 13:34:42 -04:00
Will Daly
e2acf3ab87 Credit eligibility/provider refactor 
* Remove m2m relation between credit course and credit providers.
* Separate eligibility and provider APIs into different modules.
* Add API call for retrieving a user's eligibilities.
* Cache credit course list.
* Style the dashboard purchase button.
* Display a link for the credit provider on the dashboard.
* Add analytics events for clicks on the purchase button.
* Expose more credit models to Django admin and add search functionality.
 2015-07-02 10:03:52 -07:00
zubair-arbi
e369939b4b change redirect url from '/accounts/login' to '/login' 
ECOM-1734
 2015-07-02 18:44:10 +05:00
Ned Batchelder
9d5b5658a4 Merge pull request #8552 from edx/ned/smarter-mako-caching 
Make edxmako cache properly with changing lookup paths
 2015-07-01 17:47:04 -04:00
Chris Dodge
b741ce786b fix python unit tests 2015-07-01 13:46:55 +02:00
Davorin Sego
2972e9110c search input element styling improvements, test clean up 2015-07-01 13:46:55 +02:00
Marco Morales
b9ed758246 Initial syles cleanup and changes for course discovery on openedx 2015-07-01 13:46:54 +02:00
Zia Fazal
ad1f4951fc get_certificate_url should return certificate download_url in case of non html certificates 2015-07-01 16:14:37 +05:00
Braden MacDonald
4487b6d184 Fix errors with fetching Shibboleth metadata 2015-06-30 20:50:45 -07:00
Renzo Lucioni
39dadb57f0 Merge pull request #8698 from edx/renzo/fulfillment-logging 
Improve logging of ecommerce interactions
 2015-06-30 21:31:41 -04:00
Sarina Canelake
28a234380a Dark lang middleware: Check if user is authenticated 
Check if the request's user is authenticated before attempting to
get their user preferences. Otherwise, log warnings appear indicating
the UserNotFound error was caught.
 2015-06-30 20:01:00 -04:00
Renzo Lucioni
d330831871 Improve logging of ecommerce interactions 
Adds standardized audit logging for checkout and enrollment change requests. XCOM-427.
 2015-06-30 17:34:16 -04:00