Commit Graph

3000 Commits

Author SHA1 Message Date
polesye
2ea166313b Fix comment. 2013-12-11 16:52:46 +02:00
polesye
e5f583294a Address comments. 2013-12-11 13:28:34 +02:00
polesye
39e97225ff Fix tests. 2013-12-11 13:28:33 +02:00
polesye
2e87b1a66f BLD-543: Fix bug with reordering in Studio. 2013-12-11 13:28:33 +02:00
Julia Hansbrough
421f02518b Merge pull request #1744 from edx/flowerhack/feature/verified-cert-events
Events for entering verified flow & buying
2013-12-10 11:47:47 -08:00
Greg Price
c84164510e Merge pull request #1882 from edx/gprice/remove-moderator-toggle
Remove forum user profile moderator toggle button
2013-12-10 07:40:39 -08:00
Will Daly
9b4b3dfa12 Merge pull request #1903 from edx/will/fix-underscore-staff-grading
Add underscore to staff grading template
2013-12-10 06:29:46 -08:00
Will Daly
8374989c11 Add underscore to staff grading template 2013-12-09 23:55:29 +00:00
Sarina Canelake
b406ba0f83 Acceptance tests for grades download
Refactor instructor dash acceptance tests.
Add additional acceptance tests for buttons on 'Data Download' tab.

LMS-58
2013-12-09 18:28:41 -05:00
Diana Huang
1ee6d151e2 Merge pull request #1894 from edx/diana/remove-extraneous-text
Remove extraneous refund text
2013-12-09 13:24:09 -08:00
David Baumgold
b784979976 Merge pull request #1792 from edx/man2life-i18n-no-forums
i18n (no forums)
2013-12-09 11:28:18 -08:00
Diana Huang
12a771e2f3 Remove extraneous refund text
Bug: LMS-1603
2013-12-09 11:29:10 -05:00
Greg Price
cec58f885b Remove forum user profile moderator toggle button
This button has been broken for at least a year, so the code has
suffered from bit rot and should be reimplmemented if the feature is
necessary in the short term (which is unlikely since it has been broken
for so long).
2013-12-09 10:23:21 -05:00
Valera Rozuvan
9072b9cc5d e-reader error when popping out window
Moving work on BLD-465 from PR 1811.
Fixing missing import clause in Python.
Addressing DB's comment.

BLD-465.
2013-12-09 10:38:57 +02:00
Julia Hansbrough
3b9cd02bea response to cr 2013-12-06 22:57:06 +00:00
Julia Hansbrough
5aa1b231d1 Added segment.io tracking 2013-12-06 16:09:45 +00:00
Ned Batchelder
1cbc171616 Merge master in prep for merging back the hotfix changes. 2013-12-05 15:48:49 -05:00
Julia Hansbrough
2b7587d6a8 Added alternate upsell copy flag
For waffle / split testing purposes
2013-12-05 19:14:45 +00:00
Julia Hansbrough
83f42f5691 Response to CR 2013-12-05 19:14:45 +00:00
Julia Hansbrough
f880bcb652 Response to CR 2013-12-05 19:14:45 +00:00
David Baumgold
03d7d0e952 more i18n work 2013-12-05 14:03:02 -05:00
Will Daly
e0fe8bcdc7 Removed extra trailing slash from STATIC_URL in devstack
Let staticfiles determine the footer URLs
2013-12-05 13:47:10 -05:00
Adam Palay
9d48bb0ef1 removes temporary error messages 2013-12-05 12:08:39 -05:00
Adam Palay
a458b469d1 modify partial recovery message 2013-12-04 21:26:45 -05:00
Calen Pennington
b9926a2fd3 Add message explaining partial recovery 2013-12-04 16:42:57 -05:00
Adam Palay
175e1aab9e adds more temporary error messages 2013-12-04 14:30:09 -05:00
Adam Palay
eb23b65992 add temporary error message for ORA panel 2013-12-04 14:10:47 -05:00
David Baumgold
b32f2bc170 MITX_ROOT_URL => EDX_ROOT_URL 2013-12-04 12:59:35 -05:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
Greg Price
62a25824df Merge pull request #1765 from edx/gprice/inline-discussion-a11y
Improve accessibility of inline discussions
2013-12-02 15:12:19 -08:00
polesye
0dbb7603fb BLD-533: Improve calculator's tooltip accessibility. 2013-12-02 09:56:24 +02:00
Jay Zoldak
341875bb18 Remove code related to Pearson Testing Centers 2013-11-26 17:04:19 -05:00
Jason Bau
f94565d699 Merge pull request #1685 from edx/jbau/shopping-cart/report
CSV Reporting of Shopping Cart Purchases, with tests
2013-11-26 11:45:59 -08:00
Greg Price
81798dd8be Improve accessibility of inline discussions
The show/hide toggle now properly acts like a button, and focus is now
trapped on the loading element for both the show/hide action and loading
of a new page.
2013-11-26 14:12:34 -05:00
David Baumgold
389df17320 Merge pull request #1748 from puntxo/patch-1
Update course_navigation.html #os
2013-11-26 07:28:04 -08:00
Brian Talbot
d2a2aaa716 LMS: adds in collapse/expand UI for dashboard view upsell 2013-11-25 16:40:32 -05:00
Ned Batchelder
cccd61ebf3 Make remaining dialogs in wiki accessible.
All the dialogs in the wiki are now accessible to screen readers.

Also, the "Switch to selected version" button did the odd thing of
reloading the page with the new version selected, but inside a dialog.
That is now fixed.

The merge dialog has a warning that looks kind of funky still, but you
can read it, unlike the previous code.

LMS-1337
2013-11-25 16:05:05 -05:00
Ned Batchelder
9a106a32d5 Merged master to rc/2013-11-21 2013-11-25 14:56:09 -05:00
Diana Huang
7a56e00d53 Merge pull request #1604 from edx/jarv/verified-certs
Jarv/verified certs
2013-11-25 07:37:13 -08:00
Sarina Canelake
e2423386cb UX for Data Download tab on instructor dash
Restrict grade report generation to 'is_superuser' users (can be overridden with
feature flag ALLOW_COURSE_STAFF_GRADE_DOWNLOADS); all staff users can download
generated files.

LMS-58
2013-11-22 10:06:22 -05:00
David Ormsbee
e0aa8cf78a Grade report celery task and direct file push to S3 from the new instructor dashboard.
Hook up display of grade files ready for download to new instructor dashboard.

LMS-58
2013-11-22 10:06:10 -05:00
polesye
b7438bc9a4 BLD-400: Update the calculator hints tooltip. 2013-11-22 12:18:52 +02:00
puntxo
7606810c30 Update course_navigation.html
The tab names are not being translated
2013-11-22 10:10:06 +01:00
Diana Huang
1656876699 If student has not passed verification, issue an honor code cert.
Also, display a message on their dashboard.
2013-11-19 17:12:49 -05:00
Jason Bau
c8a98051dd CSV Reporting of Shopping Cart Purchases, with tests
squashing to one commit to make cherry-picking by feature possible
2013-11-18 14:45:41 -08:00
David Baumgold
957f318485 Merge pull request #1594 from neurolit/csrf_accessibility
LMS: add CSRF token to register form
2013-11-18 12:41:02 -08:00
Giulio Gratta
122e0d4a7d Stop video skipping links from showing up when not needed and address the issue of skip links for multiple videos.
Fixes BLD-521
2013-11-18 08:12:06 -08:00
dcadams
ddd9e0e451 Merge pull request #1643 from edx/dcadams/fix_invitation_emails
Email port to beta dash and new option for shibboleth courses
2013-11-15 13:49:36 -08:00
David Adams
ed980f2189 Port of invitation/enroll/unenroll email functionality
into beta dashboard.

Also includes new functionality, in both legacy and beta
dashboard, to include appropriate email text for a
Shibboleth course.
2013-11-15 10:10:04 -08:00
polesye
153bc25d8c BLD-502: Add improvements to Video player. 2013-11-15 18:12:51 +02:00