Commit Graph

1537 Commits

Author SHA1 Message Date
Awais Jibran
0b66dc4b42 Merge pull request #7718 from edx/aj/tnl1921-forgot-password-model-not-showing
Forgot password model not visible when user clicks 'Forgot Password' link on CMS.
2015-04-23 16:53:06 +05:00
Aamir
a900e1f7ec Merge pull request #7660 from edx/aamir-khan/ECOM-1396/checkoint-name-field
Aamir khan/ecom 1396/checkoint name field
2015-04-23 12:06:09 +05:00
Usman Khalid
e82735f79d Change image upload input name and not make duplicate of file in data.
TNL-2052
2015-04-22 14:33:30 -04:00
aamir-khan
d606ae97fb ECOM-1396: added the function to check is the xblock published 2015-04-22 19:23:33 +05:00
Awais Jibran
8bd09d4057 Forgot password model not visible when user clicks 'Forgot Password' link on CMS.
TNL-1921
2015-04-22 18:06:36 +05:00
Usman Khalid
a14e6f0a7e Accessibility tweaks for account settings and profile pages.
TNL-1660
2015-04-21 19:42:50 +05:00
muhammad-ammar
cfcb38c498 Update user message strings 2015-04-17 17:23:19 -04:00
Andy Armstrong
8ff9fd84e4 Obey learner profile default visibility 2015-04-17 17:23:18 -04:00
muhammad-ammar
6b91ab4e2b Fixed gettext references.
TNL-1862
2015-04-17 17:23:18 -04:00
muzaffaryousaf
6502eaf755 DropDownFieldView should show empty option if model value is unset.
TNL-2022
2015-04-17 17:23:17 -04:00
muhammad-ammar
e50a641673 Accessibility changes for Account Settings and Learner Profile pages 2015-04-17 17:23:17 -04:00
muzaffaryousaf
c2d83bd4a6 Bok_choy tests for upload/remove profile image.
TNL-1538
2015-04-17 17:23:17 -04:00
muhammad-ammar
ca1f2f7768 Jasmine tests for upload/remove profile image on learner profile page.
TNL-1538
2015-04-17 17:23:17 -04:00
Usman Khalid
adf111e4d5 Adding functionlity to upload/remove profile image.
TNL-1538
2015-04-17 17:23:16 -04:00
muzaffaryousaf
9ac08ac59d Moving the country field to the required section of account setting page.
TNL-1856
2015-04-17 17:23:16 -04:00
Usman Khalid
bc05cd0ccd Resolving JS lint errors for account settings & learner profile page.
TNL-1855
2015-04-17 17:23:16 -04:00
Andy Armstrong
f03841a6bb Add client-side events for viewing pages
TNL-1504
2015-04-17 17:23:16 -04:00
Usman Khalid
e6c3644bd7 Quality fixes. 2015-04-17 17:23:15 -04:00
muzaffaryousaf
3110cf6bb6 Remove account settings display and editing from dashboard sidebar.
TNL-1516
2015-04-17 17:23:15 -04:00
Usman Khalid
2667f705ad Enable third party auth from account settings page.
TNL-1535
2015-04-17 17:23:15 -04:00
muzaffaryousaf
a378995f85 If user is not above age limit, show restricted learner profile.
TNL-1658
2015-04-17 17:23:15 -04:00
muzaffaryousaf
4f97cd7a04 Learner profile page.
TNL-1502
2015-04-17 17:23:14 -04:00
muhammad-ammar
9c2d18710c Jasmine tests for account settings page.
TNL-1499
2015-04-17 17:23:14 -04:00
Usman Khalid
74bf7f239e Account settings page.
TNL-1499
2015-04-17 17:23:14 -04:00
Usman Khalid
3a2c527cd6 Added javascript library backbone-super.
TNL-1499
2015-04-17 17:23:14 -04:00
zubair-arbi
e04e61d686 show error message to user on photo reverification page if Flash not found
ECOM-1355
2015-04-14 15:39:51 +05:00
David Ormsbee
03c3bbb379 Merge pull request #6636 from jazkarta/feature-pocs
MIT CCx (was Personal Online Courses)
2015-04-11 11:15:43 -04:00
Carlos de la Guardia
b315b4d747 MIT: CCX. Fixes for issues identified in code review
Switch to font awesome icons, to fix issue with toggling collapsible sections of the schedule in ccx coach dashboard

Ensure access check takes place after descriptor is bound to the user, or field override checks will never happen
2015-04-10 23:30:26 -04:00
Carlos de la Guardia
b3da2a54bb MIT: CCX. Fix issues identified in code review
Original Commit Messages:

use edx's own get_parent method, rather than our own.

add field to unique constraint to avoid MultipleObjectsReturned in case of multiple browser clicks on submit

fix 0011 migration, inherit from TimeStampedField and add composite index (migration only)

fix bug where adding an already registered user to a ccx would cause a crash due to an undefined variable

add assertNumQueries tests to test modules where override field providers are used

remove unnecessary teardown

implement recommended style for checking empty list

import utility methods rather than use duplicate code

added comment explaining date conversion to string for json

add logging for invalid users or emails when enrolling students

add comment about xmodule user state

avoid using get_or_create, which seems to be causing a race condition on schedule change save

relocate badly placed edvent handlers to fix multiple submit problem
2015-04-10 23:30:26 -04:00
cewing
7f691e4a92 MIT: CCX. Rename POC to CCX
Final official name is Custom Courses for EdX (CCX), rename all code to remove previous name.

Rename the FEATURE constant used to identify this feature

Rename the middleware for the CCX change

rename the constant used for storing the current poc id on the session.

rename the _PocContext threading local

rename the override provider in all places where it is referenced

`PersonalOnlineCoursesOverrideProvider` -> `CustomCoursesForEdxOverrideProvider`

generally rename symbols from overrides.py to replace `poc` with `ccx` where possible without changing model names or attributes

rename more symbols from poc to ccx
rename util functions from app utils module

general symbol renaming poc -> ccx in views.py and related url changes

Rename the coach role wherever it is used.

reword poc_coach to ccx_coach

UI rename

replace POC with CCX globally

template context variable renamed

rename poc_ to ccx_ in urls and all related locations (views, js, scss etc)

remove pocs migrations

Final massive renaming, including models.  Re-built migration.

cleaning up a few tailing references

Fix reference typo in schedule template JS

undo modifications made on the fly in test setup to ensure that our tests are properly isolated from the rest of the system tests.

Fixes jazkarta/edx-platform#38

Clean up some leftover strings and comments

fixing more strings and comments in python files

fix a naming error in the schedule tab that was causing problems in deleting courseware items.

Fixes jazkarta/edx-platform#36

updating tests and utility code to match changes in infrastructure from latest rebase
2015-04-10 23:30:25 -04:00
Carlos de la Guardia
97748e56ea MIT: CCX. Fix test failures
Django double-importing overwrites the TESTUSER object, invalidating identity comparisons.  Use a string instead to avoid the problem.

The get_current_poc function operates using a threadlocal and so no longer requires the user as an argument
2015-04-10 23:28:09 -04:00
Carlos de la Guardia
bb7eed58db MIT: CCX. Refactore using backbone.js 2015-04-10 23:28:00 -04:00
Aamir
a83d068600 Merge pull request #7617 from edx/aamir-khan/ECOM-1290-redirect-to-courseware-new
ECOM-1290: added the redirection back to courseware after re-verificatio...
2015-04-10 20:53:45 +05:00
aamir-khan
ca08b979b3 ECOM-1290: added the redirection back to courseware after re-verification 2015-04-10 19:44:35 +05:00
zubair-arbi
2c10eeb3aa update track selection page, use only min price for course modes
ECOM-1228
2015-04-10 11:53:31 +05:00
Awais
1d8b0e3e89 ECOM-1205-adding models and tests 2015-04-02 14:55:41 +05:00
Will Daly
bedba6a600 Merge pull request #7529 from edx/will/cors-iframe-proxy
Add proxy to allow IE9 to make xdomain requests
2015-04-01 14:18:42 -04:00
Will Daly
fcc5b1e347 Add proxy to allow IE9 to make xdomain requests
Adds an /xdomain_proxy.html endpoint that serves
the proxy file from the xdomain library.  This
allows IE9 users to iframe in the proxy page
to simulate a cross-domain request with cookies.
2015-04-01 09:16:42 -04:00
Matt Drayer
d9611dcd9f Merge pull request #7382 from edx/mattdrayer/SOL-461
mattdrayer/SOL-461: Student dashboard clean-up
2015-03-31 10:53:45 -04:00
Marco Morales
bd5b0b31a0 Matt - javascript and test changes, Marco - styling feedback from initial reviews 2015-03-31 08:47:17 -04:00
Marco Morales
dfcb3f2b6e Dashboard styling cleanup/changes, including:
- reversing the positions of the sidebar and course listing
- html for new social icons (not currently wired up)
- new actions dropdown for unenrollment and email settings
- partial reorganization of dashboard.scss styles
- text fix for unenrollment
- added missing endif, p/hgroup closures
- reverted la.course-item
- removed extra operator
- fixed broken bok choy test
2015-03-25 10:51:45 -04:00
Will Daly
735b400998 Login/Registration page can skip track selection.
Add querystring param "course_mode" to the login/registration
page so the user can skip track selection.

This supports upcoming changes to the course details page
that allow the user to choose the track when clicking
"enroll", which will replace the functionality of the track
selection page.
2015-03-25 09:15:31 -04:00
Will Daly
e66409be45 Merge pull request #7444 from edx/will/self-gen-certs-docstring-cleanup
Docstring/messaging cleanup in self-generated certs view.
2015-03-23 12:13:53 -04:00
Usman Khalid
6fb48eb159 Merge pull request #6706 from edx/ammar/tnl-181
Allow Instructor To Rename Cohorts And Set Cohort Assignment Method.
2015-03-23 19:49:03 +05:00
Will Daly
659535365d Update error messaging for progress page self-gen certs
Clean up docstrings for gen cert POST.
2015-03-23 09:10:39 -04:00
muzaffaryousaf
e6c75529c0 Cohort discussion topics via UI in instructor dashboard.
TNL-1256
2015-03-23 14:28:22 +05:00
Muhammad Ammar
70efd28483 Changes after Andy's Review 2015-03-23 09:21:21 +05:00
Muhammad Ammar
3ce494f5c5 Enable/disable cohorts from the instructor dashboard and move cohorts management to its own tab
TNL-1268
2015-03-23 09:21:15 +05:00
muhammad-ammar
0ebd8c29b0 Allow Instructor To Rename Cohorts And Set Cohort Assignment Method
TNL-181
2015-03-23 09:10:59 +05:00
Martyn James
5d54036090 Fix pylint violation 2015-03-20 10:41:56 +01:00