Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
18,321 Commits 1 Branch 0 Tags
ffbb228acbacfbb472ac66200295e9f04e8f3018
Commit Graph

6533 Commits

Author SHA1 Message Date
Brian Wilson
ffbb228acb Add support for counting and reporting skips in background tasks. 2013-10-16 13:01:58 -04:00
Brian Wilson
8fddcdffcd Initial refactoring for bulk_email monitoring. 2013-10-16 13:01:57 -04:00
Brian Wilson
67a8ee1184 Revert remnants of disable-button, and how html editor is invoked. 2013-10-16 13:01:57 -04:00
Julia Hansbrough
9c94263d07 Removed email acceptance test 2013-10-16 13:01:57 -04:00
Julia Hansbrough
8a30e9ba8f Legacy email tests, removed duplicate code, updated comments, fixed CSS 2013-10-16 13:01:57 -04:00
Julia Hansbrough
fd54b060d8 added self to authors style, changed GET to POST 2013-10-16 13:01:57 -04:00
Julia Hansbrough
c7d4270ad4 API tests, email tests, working notifications 2013-10-16 13:01:57 -04:00
Julia Hansbrough
b8aff26ce8 Merged in email confirmation modal 2013-10-16 13:01:57 -04:00
Will Daly
3f88b87916 Added acceptance tests for bulk email (through beta dashboard) 2013-10-16 13:01:57 -04:00
Julia Hansbrough
d8a857dba2 Changed GET to POST and xmodule HTML editor call, section CSS 2013-10-16 13:01:52 -04:00
Julia Hansbrough
867d3ba1da Implemented bulk email interface for new dashboard 
Responses to Adam's comments; reset common.py, i18n compliance, deleted extraneous email.html file, fixed an HttpResponse, deleted unnecessary commented-out code, some small style tweaks
 2013-10-16 13:01:14 -04:00
Adam Palay
d69748ce7f disable buttons for large courses on legacy and beta instr dash 
set max enrollment for downloads to 200
 2013-10-16 13:01:14 -04:00
Julia Hansbrough
91c31e12d5 Implemented bulk email interface for new dashboard 2013-10-16 13:01:14 -04:00
Valera Rozuvan
e1e0cba033 Added acceptance tests. 2013-10-16 15:44:21 +03:00
Valera Rozuvan
a1e0f7116a Added hard-coded flag to video.html that turns on/off autohiding of captions. 
Front-end functionality was not removed. When flag is set to "True", old
behaviour of autohiding of controls and captions will be enabled.
 2013-10-16 15:43:58 +03:00
jmclaus
9d418755a6 Added changes made to video.html to fixtures. Addressed latest PR comments 2013-10-02 16:54:48 +02:00
jmclaus
d201ce1035 Addressed PR comments 2013-10-02 15:55:23 +02:00
jmclaus
e5895adb2b Progress slider announces its nabe and value to screen readers 2013-10-02 15:55:22 +02:00
jmclaus
ce976a80c8 All buttons have an ARIA role, name , and state 2013-10-02 15:55:22 +02:00
marco
81a2ac413d Merge branch 'release' 
Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py
 2013-10-01 17:05:02 -04:00
Jason Bau
829d0d5dd0 Merge pull request #1174 from edx/jbau/fix/optional-enable-shopping-cart 
make ENABLE_SHOPPING_CART truly optional
 2013-09-30 11:05:38 -07:00
Jason Bau
06cac195f0 make ENABLE_SHOPPING_CART truly optional 
course_about was throwing 500s if ENABLE_SHOPPING_CART=False
 2013-09-30 09:09:17 -07:00
Carlos Andrés Rocha
2e7e354076 Fix course enrollment count in instructor dashboard 
Fix AN-115
 2013-09-30 11:41:49 -04:00
Vik Paruchuri
c11f708d0f Merge pull request #1080 from edx/fix/vik/oe-problems 
Clean up open ended problems view and fix error.
 2013-09-27 14:12:15 -07:00
Calen Pennington
37627704dc Merge pull request #1117 from cpennington/manage.py-only-tests 
Move nose arguments around so that we can run tests with manage.py
 2013-09-27 13:13:03 -07:00
Vik Paruchuri
9a6ae8f740 Clean up open ended problems view and fix error. 2013-09-27 16:02:12 -04:00
Vik Paruchuri
4ab47c4d05 Fix mako syntax in rubric template. 2013-09-27 15:57:41 -04:00
Usman Khalid
bc56ab7c13 Merge pull request #1057 from edx/usman/lms-1114-pdf-arrows 
Disables the previous/next arrows on pdf books on the first/last pages
 2013-09-27 12:50:38 -07:00
Calen Pennington
67ccf1e3bb Move nose/django arguments for tests out of rake so that raw manage.py works when running tests 2013-09-27 15:41:58 -04:00
Usman Khalid
316b4eee95 Merge pull request #1073 from edx/usman/lms1026-find-courses-link-optional 
Added setting to disable 'find courses' links
 2013-09-27 12:40:07 -07:00
Greg Price
3e3ad4393e Merge pull request #1161 from edx/gprice/forums-labels 
Add accessible labels for forum post body inputs
 2013-09-27 11:37:45 -07:00
Giulio Gratta
d75cdda064 An assortment of small OE changes, both for ICE and standard 
- Changed save OE message text
- Fix ICE legend positioning and content
- Add space to "offensive" checkbox
- Change tracker variable in undo to correct one
 2013-09-27 11:29:06 -07:00
Greg Price
f4971e753b Add accessible labels for forum post body inputs 2013-09-27 13:47:45 -04:00
Greg Price
44b4204aa0 Merge pull request #1155 from edx/sarina/ins-dash-student-admin-2 2013-09-27 10:35:34 -07:00
Calen Pennington
d77491e46a Pull XModule attributes out into a mixin that can be applied to xblocks 2013-09-27 13:11:05 -04:00
Greg Price
6b5d12e491 Merge pull request #1159 from edx/gprice/forum-focus-color 
Make discussion elements change color on focus
 2013-09-27 09:55:14 -07:00
Sarina Canelake
3813e51cfb Add more feedback for instructors on Student Admin section of the dash. 2013-09-27 12:18:01 -04:00
Sarina Canelake
91d85f5c2a Enable alerts when a task succeeds. 
Note: Alerts are pop-up boxes. Not sure if this is desireable, but I couldn't figure out
how to make a success message show up in the same place that error messages do.
 2013-09-27 12:17:53 -04:00
Sarina Canelake
086f544a1a Fix, and add more, tests 2013-09-27 12:17:45 -04:00
Sarina Canelake
07e76b3b2f Enable use of student usernames on student admin page 
This is in addition to email addresses, which also work.
 2013-09-27 12:17:35 -04:00
Sarina Canelake
8a2bd25b7c Visual rearrangement of new dash "Student Admin" page 2013-09-27 12:17:24 -04:00
Usman Khalid
5ca778ef05 Display:none arrows in disabled state 2013-09-27 21:06:34 +05:00
Greg Price
bf5a801fa8 Make discussion elements change color on focus 
Previously, colors changed to afford interaction only on hover; now, all
elements with a hover color change behave the same way on focus.
 2013-09-27 11:04:51 -04:00
Calen Pennington
f500b72290 Make sure that we have the right set of fields available during xml parsing 
We had a bug where mixins weren't being applied before `load_from_xml`
was called. This meant that not all of the fields were being loaded
correctly. To fix it, we used the mixoligist from the runtime to apply
the mixins earlier in the process. However, that caused the mixins to be
applied twice.

The included fixes to xblock resolved the multiply-applied mixins, and
the fixes to the parsing code make it simpler to understand, and add
some unit tests of the parsing to boot.
 2013-09-27 10:57:39 -04:00
Calen Pennington
813795ddf4 Add a management command to dump xml courses 
This command loads the courses with the XMLModuleStore, and then exports
the fields contents as json in a diff-friendly way. This can then be
used to validate against regressions in the xml parsing code.
 2013-09-27 10:57:39 -04:00
Jason Bau
c1d555beef Merge pull request #1118 from edx/jbau/shoppingcart-stanford 
Stanford paid course registration
 2013-09-27 07:31:17 -07:00
Will Daly
9385b5764c Merge pull request #1143 from edx/will/skip-tests-with-comments 
Use comments to skip tests instead of a tag
 2013-09-27 05:33:49 -07:00
Usman Khalid
1737984b34 Merge pull request #1122 from edx/usman/lms1167-pdfjs-update 
PdfViewer: Added missing link to compatibility.js
 2013-09-27 02:49:06 -07:00
Jason Bau
667a1eadb5 Stanford paid course registration 
With tests, some settings changes
(all should default to not breaking anything for edx)

Added styling for shopping cart User Experience
- Styled shoppingcart list page
- Styled navigation shopping cart button
- Styled receipt page
- Styled course about page for shopping cart courses

Addressed HTML/SCSS issues

Remove offending body class and unnecessary sass changes

Addresses many review comments on stanford shopping cart

* framework for generating order instructions on receipt page
  in shoppingcart.models
* move user_cart_has_item into shoppingcart.models
* move min_course_price_for_currency into course_modes.models
* remove auto activation on purchase
* 2-space indents in templates
* etc

revert indentation on navigation.html for ease of review

pep8 pylint

move logging/error handling from shoppingcart view to model

Addressing @dave changes
 2013-09-26 18:25:00 -07:00
Greg Price
7aea7369a7 Merge branch 'release' 2013-09-26 18:12:31 -04:00