Commit Graph

89 Commits

Author SHA1 Message Date
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
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
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
Dino Cikatic
ee90c5fe36 SOL-217 Remove Google Analytics calls 2015-03-19 21:52:24 +00:00
Dino Cikatic
2117d168a4 SOL-217 Adding basic analytics events logging for courseware search and index 2015-03-19 21:52:23 +00:00
Chris Rodriguez
5ae7cc7ee1 UX-1642 Making visual tweaks and enhancements to the logistration form 2015-03-18 12:14:31 -04:00
Clinton Blackburn
935323a879 Enrolling via E-Commerce API for combined login-registration page
The login-registration page now supports using the E-Commerce API when enrolling users in honor seats (of courses with SKUs).
2015-03-13 00:25:13 -04:00
Dino Cikatic
bfa625ea78 SOL-258 Removing preview and content type from search list for sequence type 2015-03-09 16:28:04 +01:00
Zia Fazal
e21ff20375 backend changes based on feedback
Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/instructor_task/api.py

refined entrance exam student attempts reset

Quality improvements 1/16

added rescore, delete state and task history functionality

added unit tests for entrance exam reset attempts

added unit tests for re scoring of entrance exam and task history

improved test coverage

Got rid of pep violation

feedback changes and added jasmine test

added more jasmine tests for Javascript changes

added bok-choy tests for UI changes

replaced input containing <p> tags with <label>

Removed ee element assertions to avoid js error

Added call to super.setUp()

changes based on feedback on 2/18

Writing tests in JS instead of coffee script

commit related to skip entrance exam 2/13

fixed bad-continuation quality error

fixed broken bok-choy test

changes based on feedback on 2/18

added js tests and removed coffee script tests

fixed broken bok-choy and unit tests

changes left while rebasing

rephrase test titles

do not need these libs

changes based on feedback on 2/24

changes text which was left

Changes based on feedback on 3/3
2015-03-04 15:32:56 +05:00
Zia Fazal
b3f85e1d4a Instructor Dashboard management tools for Entrance Exams
Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/instructor_task/api.py

refined entrance exam student attempts reset
added rescore, delete state and task history functionality
2015-02-23 15:04:05 -05:00
polesye
d795ec2f20 TNL-716: Add possibility for notes creation via keyboard. 2015-02-22 13:52:46 +02:00
Greg Price
84f9d03fc4 Merge pull request #6953 from edx/gprice/registration-endpoint-refactor
Refactor registration endpoint and return field-specific detail in errors
2015-02-20 16:19:10 -05:00
Greg Price
0646b5f53d Refactor registration views to avoid shim
This also changes the registration API contract to use the course_id
parameter for analytics instead of an extra analytics parameter.
2015-02-20 11:31:55 -05:00
Jean-Michel Claus
7cb495a166 TNL 713 (TNL-714, TNL-717, TNL-718): Added accessibility plugin. 2015-02-19 19:02:57 +02:00
Will Daly
a29662cdbc ECOM-859: Add support for an input image capture.
Add support for HTML Media Capture (file input)
so that iOS users can use the camera.
2015-02-18 11:10:41 -05:00
Will Daly
e609f982d7 Country Access: block enrollment
Block users from enrolling in a course if the user
is blocked by country access rules.

1) Enrollment via the login/registration page.
2) Enrollment from the marketing iframe (via student.views.change_enrollment)
3) Enrollment using 100% redeem codes.
4) Enrollment via upgrade.

This does NOT cover enrollment through third party authentication,
which is sufficiently complex to deserve its own commit.
2015-02-10 13:07:51 -05:00
Martyn James
c668be3133 Merge pull request #6855 from edx/dsego/SOL-260
Courseware search: Change name of results page from "Searching [course n...
2015-02-10 11:02:27 -05:00
Martyn James
63e9bd55ba Added confirmation that 'Search Results' appears 2015-02-05 13:24:03 -05:00
polesye
c88aad557a TNL-1353: Fix annotator dependency. 2015-02-05 15:51:30 +02:00
Davorin Sego
71d66316fc Courseware search: Change name of results page from "Searching [course name]"
and patch up some style issues
2015-02-02 14:44:15 +01:00
polesye
bf3740696e TNL-1298: Flaky Jasmine test for Student Notes. 2015-02-02 09:53:24 +02:00
Davorin Sego
e09d47b122 Courseware Search integration 2015-01-28 21:34:58 -05:00
polesye
689d7bc8a1 Fix unit tests. 2015-01-28 09:29:02 +02:00
polesye
bd42a39468 TNL-1078: Lines don't break correctly in Student Notes. 2015-01-27 18:09:11 +02:00
polesye
a2a28880c5 TNL-1116: Fix clicking bug. 2015-01-27 11:22:46 +02:00
polesye
df86a3312f TNL-1132: Fix viewer behaviour on hover. 2015-01-26 10:53:44 +02:00
Adam
11428fa632 Merge pull request #5237 from mtyaka/mathjax-upgrade
Upgrade MathJax to 2.4
2015-01-20 12:26:38 -05:00
Will Daly
0a9f9130b0 Inline the user api form description calls 2015-01-19 16:01:11 -05:00
Matjaz Gregoric
e255f4b021 Upgrade MathJax to 2.4.
Several IE bugs have been fixed in 2.4.
2015-01-19 08:10:45 +01:00
Andy Armstrong
bca6274eb5 Miscellaneous text updates 2015-01-15 10:33:48 -05:00
Andy Armstrong
798342e177 Rename 'cohorted content group' to 'content group' 2015-01-15 10:33:48 -05:00
Andy Armstrong
ac58ebf7da Rename 'cohort groups' to just 'cohorts' 2015-01-15 10:33:48 -05:00
Brian Talbot
d556cdd586 syncing icon class syntax + semantically hiding changed icons from assistive tech
TNL-1137
2015-01-15 10:33:47 -05:00
Andy Armstrong
42c4071869 Implement better select handling and tests 2015-01-15 10:33:47 -05:00
Chris Rodriguez
54a8a4fccb Addressing items in the latest PR; includes RTL-ifying all SCSS 2015-01-15 10:33:47 -05:00
Andy Armstrong
fc5b94eeeb Address most of Christina's code review comments 2015-01-15 10:33:46 -05:00
Andy Armstrong
b77e65cdc2 Assign cohorts to groups in the instructor dashboard
TNL-653
2015-01-15 10:33:46 -05:00
Andy Armstrong
674bfc4fcb Use edx namespace for Backbone classes 2015-01-15 10:33:46 -05:00
Tim Babych
dbfc12ce01 Merge pull request #6321 from edx/feature/edxnotes
TNL-213: Student Notes
2015-01-15 02:02:13 +02:00
polesye
c7153be040 TNL-213: Let Students Add Personal Notes to Course Content.
Co-Authored-By: Jean-Michel Claus <jmc@edx.org>
Co-Authored-By: Brian Talbot <btalbot@edx.org>
Co-Authored-By: Tim Babych <tim@edx.org>
Co-Authored-By: Oleg Marshev <oleg@edx.org>
Co-Authored-By: Chris Rodriguez <crodriguez@edx.org>
2015-01-14 23:34:11 +02:00
David Baumgold
4d323271ee Make Tender optional and configurable 2015-01-14 11:25:55 -05:00
Renzo Lucioni
8ef0e77e46 Prevent Jasmine tests from redirecting in dev mode
Also prevent Jasmine from attempting to load deleted templates
2015-01-11 16:08:29 -05:00
Brian Talbot
f128629f48 fixing styling and class syntax (to new FA-based classes) for missing UI elements 2015-01-09 12:01:26 -05:00
Muhammad Shoaib
10f8d8c097 WL-135 added the migration for the expiration_date field in the coupons model
added the functionality of adding the expiration date, and also handled in the shopping cart when the user try to add the expired coupon code in the shopping cart

added expiration date in the coupons list in the ecommerce page

added the unit tests and jasmine tests

fix the quality issues and rebased with master

regenerated the migration file with a different number

i18n and verified te course mode

changes suggested by  stephan
2015-01-09 19:14:48 +08:00
Renzo Lucioni
fe691b051b Apply most important copy changes from docs 2015-01-06 11:31:12 -05:00
Renzo Lucioni
fb013272b8 Wrap full name placeholder in quotes to deal with spaces
Also fix failing JS test which was looking for a removed button.
2015-01-05 16:31:55 -05:00