Brian Talbot
0052b87c37
Merge pull request #886 from edx/talbs/lms-disabledui
...
LMS: General Disabled Link/Button State Styling
2013-09-09 08:50:59 -07:00
Brian Talbot
422c6282e4
LMS: adds in pseudo-state styling for disabled buttons/links (by attribute or standard class names)
2013-09-09 11:43:55 -04:00
David Ormsbee
8491927ef7
Default empty course_name just to unbreak the test. Need to actually extract out verification-specifics from the receipt templates, but design is working on them right now.
2013-09-09 11:14:28 -04:00
Calen Pennington
1255ab7514
Add mitxmako.middleware to fix workers
...
If mitxmako.middleware has ever been imported, then render_to_string
works correctly (which is why we didn't see this in the rest of
edx-platform). However, if it hasn't (like in a celery worker), then
using mitxmako.middleware errors out.
[LMS-1085]
2013-09-09 11:13:50 -04:00
David Ormsbee
9f40263f7b
Fix broken callout to template partial from receipt page.
2013-09-09 11:00:01 -04:00
David Ormsbee
48f867bd6b
Merge branch 'master' into ormsbee/verifyuser3
...
Conflicts:
lms/envs/common.py
2013-09-09 10:18:25 -04:00
jkarni
b53d55543d
Merge pull request #823 from edx/jkarni/feature/multiple-assets-upload
...
Add support for multiple file uploads
2013-09-09 06:47:58 -07:00
Jason Bau
9dac2eff90
actually flatten username suggestion to ascii
2013-09-08 20:26:21 -07:00
ichuang
7fac4f3bb9
formulaequationinput: add capital greek letters and hbar to calc preview
2013-09-07 22:51:51 -04:00
chrisndodge
9c6987d010
Merge pull request #873 from edx/fix/cdodge/enable-course-image-setting
...
also even when we have a marketing site, we still need a course image fo...
2013-09-06 16:58:54 -07:00
Jason Bau
6a850e27bb
Address @brianhw review comments
...
* Fix open redirect vulnerability
* Add Logging To AUDIT_LOG : Note I had to change existing tests
that mocked AUDIT_LOG with this
* Use external_auth.views.SHIBBOLETH_DOMAIN_PREFIX in student.views
* Add a bunch of documentation
* PEP8 / Pylint
2013-09-06 15:37:27 -07:00
Jason Bau
4d656061be
Removing handling for ExternalAuthMap.MultipleObjectsReturned
2013-09-06 15:36:22 -07:00
Jason Bau
948c07c493
Revamped + Enhanced Shibboleth support
...
* If a shib users type in their email on the regular login page,
redirects them to /shib-login/
* Modify student.views.accounts_login to handle redirects
generated by @login_required for courses that use shib for
access control.
Redirect those logins to /shib-login/?next=
2013-09-06 15:36:22 -07:00
Brian Talbot
79a9c8677a
Verification: revises presentation of customized certificate receipt ciew
2013-09-06 17:23:43 -04:00
Diana Huang
238a2d53e3
Don't allow people into the verification flow if they've already been verified
2013-09-06 17:20:24 -04:00
Vik Paruchuri
499d272adc
Merge pull request #825 from edx/fix/vik/staff-information
...
Staff information about duplicate ORA submissions
2013-09-06 14:14:31 -07:00
Adam
3184939138
Merge pull request #885 from edx/release
...
Release
2013-09-06 13:51:03 -07:00
Adam
c5a732206c
Merge pull request #883 from edx/hotfix/cdodge/fix-tab-rename
...
fix edit tab bug and add unit test
2013-09-06 13:47:48 -07:00
Sarina Canelake
d84de2f890
Merge pull request #884 from edx/sarina/instrument-bulk-email
...
Add datadog tracking for bulk email
2013-09-06 13:28:07 -07:00
Sarina Canelake
4b9df2e998
Add datadog tracking for bulk email
2013-09-06 16:18:40 -04:00
Chris Dodge
10b7c13652
add comment
2013-09-06 16:05:41 -04:00
Chris Dodge
12bd7309d2
add content assertions
2013-09-06 16:03:09 -04:00
Jay Zoldak
5ece64433d
Fix certificates acceptance test after come css changes
2013-09-06 15:31:08 -04:00
David Baumgold
3b627e8c80
Merge pull request #879 from edx/db/remove-template-loader
...
Remove Studio JS template loader
2013-09-06 12:26:50 -07:00
Don Mitchell
0848360436
Merge pull request #844 from edx/dhm/editable_metadata
...
refactoring of platform to xblock 0.3 w/ refactoring of inheritance in the platform to a consistent representation.
2013-09-06 11:58:36 -07:00
Chris Dodge
c7f2f27708
fix bug and add unit test
2013-09-06 14:47:59 -04:00
Calen Pennington
0cac1c3bee
Merge pull request #881 from cpennington/dhm/editable_metadata
...
Include mixins in advanced component class loading and preview modules
2013-09-06 10:52:03 -07:00
Diana Huang
ec67bf4bec
Only show start date on receipt if it's in the future.
2013-09-06 13:48:40 -04:00
Calen Pennington
38de05c76c
Include mixins in advanced component class loading and preview modules
2013-09-06 13:37:03 -04:00
Vik Paruchuri
d3580994c8
Merge pull request #870 from edx/fix/vik/oe-nopath
...
Fix nopathtoitem error
2013-09-06 10:01:19 -07:00
Adam Palay
8fe38236d0
Merge branch 'release' after hotfix 5c39c79
2013-09-06 12:36:53 -04:00
Adam
12e82221e5
Merge pull request #877 from edx/hotfix/jsa/FOR-150
...
update mitxmako lookup / fixes FOR-150
2013-09-06 09:33:50 -07:00
Will Daly
99b47da2f4
Merge pull request #878 from edx/will/static-page-test-fix
...
Updated static-pages test to add retry logic
2013-09-06 09:22:46 -07:00
Will Daly
e20f2109d2
Updated static-pages test to add retry logic
2013-09-06 12:21:02 -04:00
Don Mitchell
0099ee0970
Clarify repr by naming
2013-09-06 12:19:51 -04:00
Don Mitchell
b81e5504db
Fix pylint and typos
2013-09-06 12:19:51 -04:00
Don Mitchell
fc131fa841
Add InheritanceKVS and standardize inherited attr patterns
2013-09-06 12:19:50 -04:00
Brian Talbot
6084412544
Verification: changed page title, progress to reflect registration completion + I8TN copy changes
2013-09-06 12:12:58 -04:00
Brian Talbot
6a081ffc38
Verification: adds current step text into receipt view's progress nav
2013-09-06 12:12:58 -04:00
Brian Talbot
0c552141f2
LMS: revises right justification space of verified indicator on Student Dashboard
2013-09-06 12:12:58 -04:00
Frances Botsford
47df7e420f
ux adjustments to vcert flow
2013-09-06 12:02:37 -04:00
Diana Huang
6538e9899d
Fix some of the shopping cart tests.
2013-09-06 11:47:35 -04:00
David Ormsbee
ed508f8400
Merge pull request #556 from edx/ormsbee/requirments_notice
...
Dependency warning message on requirements files
2013-09-06 08:35:36 -07:00
Vik Paruchuri
0fbbaa83d6
Fix some staff-facing messages
2013-09-06 11:17:46 -04:00
Vik Paruchuri
66655080f6
Log a warning if assumption about path is not correct.
2013-09-06 11:12:10 -04:00
chrisndodge
b92d88fcbc
Merge pull request #401 from edx/feature/ichuang/cas-authentication
...
Provide CAS authentication integration
2013-09-06 07:36:28 -07:00
David Baumgold
bcef1994dd
remove load_templates.html template
2013-09-06 10:24:27 -04:00
Frances Botsford
af2424daf1
adjustments to choose and contribution for vcerts
2013-09-06 10:23:46 -04:00
David Ormsbee
90923f3e12
Add min_price var to _contribution.html template
2013-09-06 10:11:29 -04:00
Diana Huang
698872a810
Clean up names and links for receipts/emails.
2013-09-06 10:01:09 -04:00
