Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,752 Commits 1 Branch 0 Tags
c07badecdd75c48870236287c83604b7a2bd2891
Commit Graph

328 Commits

Author SHA1 Message Date
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
Will Daly
f854726efc Add tracking code to LinkedIn URL. 
Add client-side analytics event for LinkedIn Add to Profile button click.

Add management command for generating certs for testing.

Update styling of the certificate messages.
 2015-02-23 11:52:47 -05:00
Anton Stupak
767324dddb Merge pull request #6744 from edx/anton/edxnotes-caret-navigation 
TNL-716: Add possibility for notes creation via keyboard.
 2015-02-23 17:55:12 +02:00
polesye
d795ec2f20 TNL-716: Add possibility for notes creation via keyboard. 2015-02-22 13:52:46 +02:00
Awais
726b7f2cfe ECOM-1046 adding functionality for generating the certs. 
ECOM-1046 minor change in code. rename file name.
 2015-02-21 04:31:32 +05: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
9ef0494092 Return field detail with registration API errors 
Also, make registration API CSRF exempt
 2015-02-20 11:31:55 -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
Renzo Lucioni
8f974ea901 Merge pull request #6815 from edx/renzo/enable-logistration 
Make logistration generally available if feature flag is enabled
 2015-01-30 15:15:56 -05:00
Renzo Lucioni
a8bed5ce98 Make logistration generally available if feature flag is active 
Makes logistration available at /login and /register as well as /accounts/login/ and /accounts/register/. In addition:

- Adds support for redirect URLs in third party auth for combined login/registration page
- Adds support for external auth on the combined login/registration page
- Removes old login and registration acceptance tests
- Adds deprecation warnings to old login and register views
- Moves third party auth util to student_account
- Adds exception for microsites (theming)
 2015-01-30 13:28:30 -05:00
AlasdairSwan
1562fdbbb4 ECOM-1002 fixed issue of grey background for logistration page. Also fixed focus issue when toggling between forms - as raised by @cptvitamin 2015-01-29 15:29:49 -05: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
Renzo Lucioni
c6777a5b25 Bok Choy tests for the split payment and verification flow 
Adds mode creation endpoint to course_modes app and ability to bypass media device access prompt when proceeding through verification flow in a testing environment.
 2015-01-15 17:25:25 -05:00
Chris Rodriguez
e44ca91b2a Small accessibility fixes for cohorts 2015-01-15 10:33:49 -05: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
cahrens
5ea7ced900 Create a RESTful handle_cohort view method for GET and PUT/POST. 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
f9d8198ef3 Merge pull request #6576 from edx/db/configure-tender-domain 
Make Tender optional and configurable
 2015-01-14 15:02:09 -05:00
David Baumgold
4d323271ee Make Tender optional and configurable 2015-01-14 11:25:55 -05:00
Brian Talbot
10168b6908 ECOM-873 accessability updates for decoupled verification 2015-01-12 16:21:34 -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
Dennis Jen
d2660e530f Merge branch 'release' 
Conflicts:
	lms/templates/verify_student/make_payment_step.underscore
 2015-01-08 15:02:26 -05:00
Will Daly
bea5a3ce64 Fix for ECOM-876 2015-01-07 12:06:36 -05:00
AlasdairSwan
9d7c90bee8 Merge pull request #6466 from edx/alasdair/logistration-history-query-params-fix 
Updated after Will's comments
 2015-01-06 13:01:23 -05:00