Commit Graph

2733 Commits

Author SHA1 Message Date
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
Martyn James
af14d222fc Merge pull request #7085 from edx/dcikatic/SOL-258
SOL-258 Removing preview and content type from search list for sequence ...
2015-03-10 11:55:33 -04:00
asadiqbal
5a7ac441e5 Entrance Exam authoring and messaging updates
Multi-commit history:
- hide drag functionality for entrance exam section.
- hide entrance exam subsection elements e.g. delete, drag, name etc.
- show unit/verticals expanded in case of entrance exam
- modify code in order to allow user to update entrance exam score from UI.
- write down unit tests.
- write down Jasmine tests.
- add bok-choy test
- updated bok-choy test
- internationalize string
- repositioned sequential block creatori
- SOL-221 (entrance exam message)
- SOL-199 LMS Part (show entrance exam content) and hide the course navigation bar.
- redirect the view in case of entrance exam.
- update code structure as per suggestions
- write down unit tests
- fix pep8
- instead of hiding the exam requirement message, now also showing the exam the completion message (success state).
- write down unit test to show exam completion message.
- Update code as per review suggestions
- update doc string
- addressed review suggestions
- change sequential message text
- css adjustments
- added new css class for entrance exam score in studio
- added Jasmine test for remaning coverage
- sequential message should appear under the context of entrance exam subsection.
- updated text in CMS and LMS as per suggestions.
- added unit text to insure sequential message should not be present in other chapters rather then entrance exam.
- skip setter if empty prerequisite course list
- exclude logic from xblock_info.js that is specifically related to entrance exam.
- added js tests and updated code as per suggestions
- added tests
- addressed several PR issues
- Several small fixes (style, refactoring)
- Fixed score update issue
- added some more unit tests.
- code suggested changes.
- addressed PR feedback
2015-03-10 09:24:43 -04:00
Giulio Gratta
0840467201 Making edX changes to pdf viewer/analytics html 2015-03-09 16:12:27 -07: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
Will Daly
940f892290 ECOM-1140: Instructor dashboard example certificates
Allow global staff to generate example certificates
on the instructor dashboard.

Allow global staff to enable/disable self-generated
certificates for a course.
2015-03-06 13:20:48 -05:00
Ned Batchelder
4f6881c871 Change .md file to .rst. 2015-03-06 13:18:04 -05: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
chrisndodge
006b06dd21 Merge pull request #7198 from edx/release
Merge Release back to Master
2015-03-03 08:49:10 -05:00
Sarina Canelake
c60f2991cd Remove outdated CS188 stylesheet 2015-02-27 09:36:48 -05:00
Fred Smith
c8f8704a7a Merge pull request #7107 from edx/ahsan/tnl-1382-css-background-used-home-link-issue-stage
CSS issue of the change on the stage
2015-02-25 11:57:21 -05:00
Ahsan Ulhaq
7c8bdb9d6d CSS issue of the change on the stage 2015-02-25 19:29:35 +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
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
ahsan-ul-haq
a02101bd99 Merge pull request #6928 from edx/ahsan/tnl-944-calculator-UI-difficult-access
Calculator UI difficulit to access
2015-02-23 19:42:04 +05:00
Ahsan Ulhaq
6536ab8452 change the description for ambiguous tests 2015-02-23 17:02:03 +05:00
ahsan-ul-haq
de64bfa0f1 Merge pull request #6956 from edx/ahsan/tnl-1382-css-background-used-home-link
CSS Background Image used for important link
2015-02-23 15:41:36 +05: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
Ahsan Ulhaq
01435692fb change home icon image to font awesome icon and changed css accordingly 2015-02-20 18:42:58 +05:00
Ahsan Ulhaq
fe7b5b2c82 dropdown button position issue 2015-02-20 18:42:58 +05:00
Ahsan Ulhaq
cd33ee8ad5 changes in the css for text with home icon 2015-02-20 18:42:58 +05:00
Ahsan Ulhaq
b208f059a0 CSS Background Image used for important link
CSS background image was used for the home icon at upper right corner
so when user enter high contrast mode or disable bakground image it
disapear so moved it to DOM element

TNL-1382
2015-02-20 18:42:58 +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
ad1cf355e9 Merge pull request #7007 from edx/will/ecom-859-take-three
ECOM-859: Add support for an input image capture.
2015-02-18 12:59:26 -05: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
Ahsan Ulhaq
47670b058c remove unused jasmine tests 2015-02-18 20:35:36 +05:00
Ahsan Ulhaq
0a6b8ae052 Calculator UI difficulit to access
Tooltip hint on the calculator apears on the mouse hover so the links
on the tooltip could not be accessed

tnl-944
2015-02-18 20:35:36 +05:00
Will Daly
a5f173dfcc ECOM-1060: Logistration third-party auth improvements
When the user returns to the registration page with a current
third party auth provider, hide the third party auth buttons
are hidden, including the
"or create a new one here" text that does not make sense
when the buttons are hidden.
2015-02-17 14:48:53 -05:00
Chris
48b50fa097 Merge pull request #6971 from edx/clrux/rtl-1630-fix
RTLifying the forgot password link
2015-02-13 15:15:24 -05:00
Will Daly
62b91d6fcc Merge pull request #6982 from edx/will/update-linkedin-field-name
LinkedIn Add to Profile source parameter
2015-02-13 14:03:10 -05:00
Chris Rodriguez
a1143d45ba RTLifying the forgot password link 2015-02-13 13:25:20 -05:00
Will Daly
a18e0c6bc7 Rename LinkedIn configuration field to "company_identifier"
Add "source" parameter to LinkedIn add-to-profile URL.

Add platform name to certification name.

Style changes for linked in sharing on dashboard
2015-02-13 12:23:51 -05:00
Chris
2c8698c087 Merge pull request #6970 from edx/clrux/rtl-1629-fix
Adding new logistration Sass partial to RTL compiled
2015-02-13 10:46:54 -05:00
Chris Rodriguez
23557b9800 RTL-ifying footer 2015-02-13 09:44:17 -05:00
Chris Rodriguez
be7b3f2949 Adjusting RTL styles for UX-1628 2015-02-13 09:44:17 -05:00
Chris Rodriguez
bed9d2f5da Adjusting line height and labels 2015-02-12 18:53:20 -05:00
Chris Rodriguez
7c02782f90 Adding new logistration Sass partial to RTL compiled 2015-02-12 18:53:20 -05:00
Chris Rodriguez
23e2b8b702 Adjusting RTL styles for UX-1628 2015-02-12 11:29:59 -05:00
Will Daly
70ec4c5f66 Merge pull request #6948 from edx/will/country-access-part-2
Finish Country Access (Part 2 of 3)
2015-02-11 13:15:38 -05:00
Waqas Khalid
4f326a8ca3 Merge pull request #6832 from edx/waqas/tnl1149-discussion-mathjax-solution
Discussion forum should be independent of mathjax
2015-02-11 20:27:45 +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
Waqas Khalid
11159ba71e Discussion forum doesn't work when mathjax is down
When mathjax is down discussion forum doesn't work
as we were using markdown.js with processor as
mathjax. Unavailability of mathjax raise error in
js which stops discussion to render. So I made
markdown independent of mathjax. Markdown now will
use mathjax when it is available otherwise ignore it.

TNL-1149
2015-02-10 13:12:41 +05:00
Waheed Ahmed
1e824a2d46 Fixed close button for help feedback menu.
TNL-1336
2015-02-07 01:38:09 +05:00
Martyn James
e760d2d2d2 Update styles 2015-02-06 11:11:37 -05:00