Commit Graph

1095 Commits

Author SHA1 Message Date
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
Adam
2735b2b5bb Revert "Decorated instructor dashboard with sudo_required." 2015-07-17 12:11:38 -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
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
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
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
Ahsan Ulhaq
c94f043c2b Credit Payment - Dashboard States
ECOM-1578
2015-07-09 13:33:31 +05: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
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
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
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
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
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
Will Daly
4632a07c07 Fix login/logout errors caused by unicode cookie names 2015-06-29 09:23:15 -07:00
Zia Fazal
bcbd1464d4 New course cannot be started till web certificate is active
fixed broken test

changes based on feedback on 6/24

fixed broken unit test after feedback changes

added more checks and updated tests

fixed broken bok choy test

Fixed pylint quality error

trying to fix pylint quality error
2015-06-29 12:53:21 +05:00
Braden MacDonald
7437bcfe12 New provider config options, New Institution Login Menu - PR 8603 2015-06-26 13:24:01 -07:00
Braden MacDonald
cd941eada7 New SAML/Shibboleth tests - PR 8518 2015-06-26 13:24:00 -07:00
Braden MacDonald
b4904adc1e Use ConfigurationModels for third_party_auth, new metadata fetching - PR 8155 2015-06-26 13:23:59 -07:00
Braden MacDonald
caca3e1bdf SAML2 third_party_auth provider(s) - PR 8018 2015-06-26 13:23:59 -07:00
Will Daly
754eb9af18 Merge pull request #8655 from edx/will/more-login-cookie-info
User info cookie
2015-06-26 07:34:07 -07:00
Nimisha Asthagiri
8b5e5c5910 Merge branch 'release' 2015-06-25 13:11:41 -04:00
Will Daly
34863c76c1 Make the user info cookie secure 2015-06-24 16:02:23 -07:00
Will Daly
5e86a64729 User info cookie
* Add a new cookie for user information
* Make marketing cookie names configurable.
* Handle URL reversal when URLs don't exist (in Studio)
* Move cookie code from student/helpers.py into its own module.
2015-06-24 09:44:50 -07:00
aamir-khan
987889fc37 ECOM-1524: Display credit availability on the dashboard 2015-06-24 16:50:38 +05:00
Will Daly
b89ad57cb7 Remove duplicate logged-in-cookie helper methods
There were two helper methods that set the marketing site
"logged in" cookie.  This commit deletes one of them
and ensures that all callers are using the other one.
2015-06-23 12:47:15 -07:00
Kyle McCormick
1726c136fa MA-772 create app course_overviews for caching course metadata 2015-06-22 18:33:12 -04:00
Matt Drayer
f0f3766443 mattdrayer/ECOM-1773: Fixed invalid URL reversal 2015-06-22 14:04:43 -04:00
Will Daly
8c52c92bcb Reverification iOS support and refactor
* Delete reverification templates
* Delete photocapture.js
* Delete unused "name change" end-points
* Rebuild the reverification views using Backbone sub-views
* Stop passing template names to the JavaScript code
* Avoid hard-coding the parent view ID in the webcam view (for getting the capture click sound URL)
2015-06-22 08:45:12 -07:00
Braden MacDonald
345fcabd05 Fix CRI-9 so third_party_auth pipeline always completes, and consolidate auto-enrollment code 2015-06-18 20:57:19 -07:00
Braden MacDonald
350f98ebde Changes for compatibility with latest python-social-auth (0.2.7) 2015-06-18 19:31:47 -07:00
Ahsan Ulhaq
20e6c7625c LMS: Modification in enrollment API
Added CourseEnrollmentAttribute model

ECOM-1719
2015-06-16 10:39:04 +05:00
cewing
6a0c9aee9d MIT CCX: Use CCX Keys
Implement the use of CCX opaque keys throughout the ccx code base

include the new custom ccx id package in the github checkouts list

update the coach dashboard wrapper to get CCX information from the incoming course_id, if possible

update function signatures for all view functions to expect CCX as passed by the dashboard wrapper (default to None), remove calls to get_ccx_for_coach as the ccx is passed in.

update reverse calls in python view code to use a CCXLocator for the URL instead of a CourseLocator

use CCXLocator where necessary

use course id to find ccx, instead of thread local

remove unused method and related tests

use course id for getting ccx

provide course id to the get_current_ccx method

ensure the course id passed in is a CourseKey instance of some type whether it starts out as a string or not

use the provided block to figure out what the course_id should be, then get the ccx for that

redirect to ccx dashboard using coach ccx if no ccx is passed in

update student dashboard listing for ccx to build an appropriate url from a CCXLocator, not from the course locator.

refactor building the ccx locator so we don't have to do it repeatedly

begin test refactoring after ccx_keys introduction

Ensure that when access checking happens, the course_locator form of a ccx locator is used.  This ensures that the access check happens against the course and it is not necesarry to duplicate the entire access control structure for the course.

pick up api change in ccx-keys

create and conditionally use a wrapper for the mixed modulestore returned by xmodule.modulestore.django.modulestore

the wrapper will strip and restore ccx values from CourseKey and UsageKey objects

fix return values on a few methods

remove unused symbol

pull updated ccx-keys package

set course_id on the caching descriptor system to avoid api incompatibilities in some subsystems

use ccx.course instead of self.course

fix get method to find course keys from blocks that are not themselves keys but have a location attribute (which will be a key)

if an item coming out of the db has children, restore the ccx to them as well

if the block passed in has a CCX key, unwrap that before we try to look up the override, otherwise it will never be found.

pick up a change in the ccx keys package that allows for stripping CCX identity from a usage key

begin writing tests to cover this modulestore wrapper

remove the switch_pocs view, the url pattern for it, and the tests that covered it

remove the ccx context and the middleware responsible for setting the current CCX.  These are no longer needed

all dashboard views should raise 404 if a ccx is not provided by the coach_dashboard decorator

code quality

prevent errors resulting from trying to `get` a ccx based on non-unique criteria.

remove obsolete usage of ACTIVE_CCX_KEY

fix setUp method for grading tests to properly create grades for the ccx rather than for the course.

clean up reverse calls

code quality

adding docstrings to clarify purpose of this patch

fix bug in getting ccx for coach

fix grading views to properly fetch a ccx-ified course so that grades for that version will be calculated

fix small errors in modulestore implementation

fix errant merge marker

update call to get_current_ccx after key refactoring merged with tab changes
2015-06-12 00:01:24 -07:00
Will Daly
5198257cbe Merge pull request #8461 from edx/will/verify-student-cleanup
Remove unused code left over from ECOM-188.
2015-06-10 14:44:51 -04:00
Will Daly
69306da49a Remove unused code left over from ECOM-188. 2015-06-10 13:08:23 -04:00
Awais
d5ca25e197 ECOM-1644 minor message updation. 2015-06-10 22:08:23 +05:00