Sarina Canelake
ed76907c0d
Remove "ADMIN_MEDIA_PREFIX" (deprecated in Django 1.4)
...
Delete lms/static/admin resources as they are no longer needed
for the admin page as of Django 1.4
Moved two files that were referenced elsewhere:
lms/static/admin/js/jquery.min.js -> lms/static/js/admin/jquery.min.js
lms/static/admin/js/urlify.js -> lms/static/js/admin/urlify.js
2014-11-01 00:01:17 -04:00
Martyn James
9f3b9c7ba3
Merge pull request #5818 from edx/release
...
Merging latest updates to release
2014-10-31 14:49:04 -04:00
Diana Huang
47979e5bcf
Add tests for the enrollment_interface
2014-10-30 17:15:26 -04:00
Diana Huang
fc468bf696
Set up basic enrollment infrastructure.
2014-10-30 17:15:26 -04:00
Renzo Lucioni
471f513566
Merge pull request #5770 from edx/renzo/logistration-i18n
...
i18n logistration
2014-10-30 14:20:08 -04:00
Renzo Lucioni
4157e5c0f6
i18n logistration
2014-10-30 14:09:15 -04:00
Chris Dodge
fea9432b50
Add the ability for course staff to specify a Survey and make it required so that a student must fill it out before starting the course
2014-10-30 13:11:02 -04:00
Adam Palay
6a40ed1d74
courseware header bar should not overflow shopping cart button TNL-722
2014-10-30 12:16:56 -04:00
AlasdairSwan
ff753f2bcb
Merge pull request #5784 from edx/alasdair/rwd-header-and-footer
...
Alasdair/rwd header and footer
2014-10-30 09:21:21 -04:00
AlasdairSwan
0c22db688f
ECOM-406 removed commented out code, moved colours to variables and fixed hover state for mobile menu
2014-10-30 09:20:48 -04:00
Renzo Lucioni
bcef7611d4
Clean up logistration copy
2014-10-29 14:42:57 -04:00
AlasdairSwan
e04a3ab32b
ECOM-406 Added JS fil that will update DOM to make the header and footer responsive
...
Made the header and footer responsive
2014-10-29 14:00:54 -04:00
Will Daly
48bc4776be
Merge branch 'will/third-party-auth-fixes' into will/combine-reg-login-form
...
Conflicts:
common/djangoapps/third_party_auth/__init__.py
common/djangoapps/third_party_auth/pipeline.py
2014-10-28 15:16:27 -04:00
AlasdairSwan
728df71acf
ECOM-531 Updated style after review with Andy Waldrop
2014-10-28 10:20:44 -04:00
Sarina Canelake
f1b95b3484
Merge pull request #5699 from Edraak/staff-debug-info-ltr-code
...
Make staff debug info code to be always LTR
2014-10-28 09:13:51 -04:00
AlasdairSwan
fd14406aed
ECOM-369 merged and resolved issues with third party auth error messaging
2014-10-27 15:19:36 -04:00
AlasdairSwan
1b1eb78123
ECOM-369 Styled third party auth buttons and cleaned up third party auth messaging
2014-10-27 15:19:07 -04:00
AlasdairSwan
d2accb6d34
ECOM-369 Added handling of model save errors. Updated FormView to add preRender function to limit amount of duplicate code. Updated PasswordResetModel to return error object when errors occur.
2014-10-27 15:19:07 -04:00
Will Daly
be2b55590c
Use a 403 status to indicate that the user does not have a linked
...
account for third party auth.
2014-10-27 15:18:10 -04:00
AlasdairSwan
08e03ef380
ECOM-369 updated in light of review with Andy and code review
2014-10-27 15:17:07 -04:00
Renzo Lucioni
ca0d048b4f
Fix failing JS tests
2014-10-27 15:17:07 -04:00
AlasdairSwan
0b9ed0315b
ECOM-369 Styled third party auth buttons and cleaned up third party auth messaging
2014-10-27 15:17:07 -04:00
AlasdairSwan
3efeaf5a47
Moved pre-render to first in initialize to ensure runs before render
2014-10-27 15:16:33 -04:00
AlasdairSwan
2ea9685552
ECOM-369 Added handling of model save errors. Updated FormView to add preRender function to limit amount of duplicate code. Updated PasswordResetModel to return error object when errors occur.
2014-10-27 15:16:33 -04:00
AlasdairSwan
a86e9e68db
ECOM-466 Added support for custom error messages. Styled select widths
2014-10-27 15:15:10 -04:00
Will Daly
3996b0a7e6
Merge pull request #5708 from edx/will/fix-401-basic-auth-issue
...
Logistration: Use a 403 status to indicate that the user does not have a linked account
2014-10-25 14:29:05 -04:00
frances botsford
93425a7c47
Merge pull request #5719 from edx/frances/fix/rtl-dashboard-fixes
...
small UI fixes on dashboard for RTL
2014-10-24 15:26:42 -04:00
frances botsford
60bb6a1021
Merge pull request #5696 from Stanford-Online/giulio/course-about-font-awesomize
...
Convert icons on course_about to font awesome
2014-10-24 14:05:23 -04:00
Frances Botsford
13b97e3606
small UI fixes on dashboard for RTL
2014-10-24 14:01:39 -04:00
Will Daly
cc07afb967
Use a 403 status to indicate that the user does not have a linked
...
account for third party auth.
2014-10-24 08:57:54 -04:00
AlasdairSwan
c3083069d1
ECOM-466 cleaned up form submission validation
2014-10-24 08:55:28 -04:00
Giulio Gratta
5b647a3a12
remove unused icon images
2014-10-23 14:04:15 -07:00
AlasdairSwan
e332e79328
ECOM-369 Moved to Base FormView extended by other views.
2014-10-23 16:23:59 -04:00
stephensanchez
61436ea195
Merge branch 'release'
2014-10-23 19:41:31 +00:00
Renzo Lucioni
f157ee1461
Add tests of access and password reset views
2014-10-23 14:39:22 -04:00
Giulio Gratta
07263de841
Convert icons on course_about to font awesome
2014-10-23 10:54:18 -07:00
Will Daly
0245c7e16e
Use 'defaultValue' instead of 'default' in the form description. Fix an error that would cause the login and password reset pages to not load correctly.
2014-10-23 08:56:40 -04:00
Omar Al-Ithawi
4f4349a63b
Make staff debug info code to be always LTR
2014-10-23 14:26:56 +03:00
Will Daly
33f0e92d62
Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form
2014-10-22 17:13:30 -04:00
Will Daly
9e9dec1de1
Integrate third party auth into the combined login/registration page.
...
Change third party auth login failure code to a 401, to detect authentication
success with no linked account.
If already authenticated, redirect immediately to the dashboard.
Use "Location" header correctly for 302 redirects from student views.
Add utility functions for simulating a running third-party auth pipeline.
Add a utility function for checking whether third party auth is enabled.
Respect default values sent by the server
2014-10-22 17:10:49 -04:00
Renzo Lucioni
21e5805bd9
WIP: Add JS tests of access, login, register, and password reset views
2014-10-22 10:23:39 -04:00
AlasdairSwan
3a0304724d
ECOM-531 tweaking margins
2014-10-22 09:52:40 -04:00
Muhammad Shoaib
b0802aafc8
css fix of remove icon and Fixed a bug where the discount coupon applied ‘disappeared’
...
when changing the quantity between enrollment vs reg code cart types.
2014-10-22 09:12:32 -04:00
polesye
7e6483f7b5
TNL-633: Remove leftover Google Font reference.
2014-10-22 16:11:49 +03:00
AlasdairSwan
ab035a0ebb
ECOM-531 updating grid column counts in media queries and added some more classes to style against instead of elements
2014-10-22 09:06:28 -04:00
AlasdairSwan
24a01ae37e
ECOM-531 Styling the buttons
2014-10-21 16:40:58 -04:00
AlasdairSwan
00ff10820a
ECOM-531 Styling the forms
2014-10-21 16:03:58 -04:00
asadiqbal08
1035d67a25
WL-98
...
fix typo and add more security on API
fix some bugs and typos
address PR feedback
be sure to send emails when accounts already exist
PR feedback
fix multiple uploads
pep8 fixes
pep8 fix
pylint fixes
fix url mapping
WL-98
- Complete code coverage
- Update code for error and warning messages.
- improve code as per some suggestions
updated the UI of the auto_enroll feature
fixed the errors
PR feedback
add test
add back file filtering
add some more error handling of input
remove unneeded coffeescript code
pylint fixes
add pep8 space
WL-98
- Updated and added test cases.
- Updated membership coffee file for errors display handling.
- fixed minor text issues.
allow for blank lines and add a test
add blank line (pep8)
2014-10-21 14:23:46 -04:00
AlasdairSwan
b69035f3af
Merge pull request #5659 from edx/alasdair/combine-reg-login-form
...
ECOM-408 Added grid-settings to override the default global box-sizing s...
2014-10-21 10:19:41 -04:00
AlasdairSwan
a5da61b4ab
ECOM-408 Added breakpoint variables to _grid-settings.scss
2014-10-21 09:39:32 -04:00
