Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

341 Commits

Author SHA1 Message Date
David Baumgold
389df17320 Merge pull request #1748 from puntxo/patch-1 
Update course_navigation.html #os
 2013-11-26 07:28:04 -08: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
Sarina Canelake
9cea6ab599 Copy changes to Inst Dash email 2013-10-30 10:03:29 -04:00
Greg Price
54ad411078 Remove unused code 2013-10-28 11:58:43 -04:00
Giulio Gratta
5a46177a5e A11Y changes: better :focus styling, increased contrast, and added image alt texts 
- Doubled up :hover and :focus styling to improve a11y
- Increase contrast of certain UI elements for improved a11y
- Added some image alt text for a11y
- Changed video caption styling to blue and made them underline on hover and added a skip link before video for screenreaders.

Fixes Bugs:
- LMS-1336
 2013-10-24 12:47:19 -07:00
Sarina Canelake
aabe8fc6b4 UX explaining inst dash email subject length (128 characters) 2013-10-23 23:18:24 -04:00
Julia Hansbrough
9123186050 Fixed indentation 2013-10-22 17:39:48 +00:00
Julia Hansbrough
eb4081115d Fixed a bug where legacy instructor dash's email editor failed to load 2013-10-22 14:27:40 +00:00
Calen Pennington
12cc4a19c0 Merge pull request #1224 from cpennington/lms-xblock-js-execution 
Add an XBlock javascript runtime, and use it to run XModules
 2013-10-21 05:53:36 -07:00
Calen Pennington
ce6fbae693 Add an XBlock javascript runtime, and use it to run XModules 
[LMS-57]
 2013-10-18 16:31:32 -04:00
Brian Wilson
aa172272f3 Update master with hotfixes from release-2013-10-17. 2013-10-18 11:50:42 -04:00
brianhw
97e01be147 Merge pull request #1359 from edx/brian/bulk-email-rc 
Bulk Email improvements for release
 2013-10-16 10:26:28 -07:00
Brian Wilson
ffbb228acb Add support for counting and reporting skips in background tasks. 2013-10-16 13:01:58 -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
8a30e9ba8f Legacy email tests, removed duplicate code, updated comments, fixed CSS 2013-10-16 13:01:57 -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
Brian Talbot
ef2218296f LMS: revises CSS reference/pipeline architecture to handle IE9 selector limits 2013-10-16 12:29:49 -04:00
polesye
9c7418e0a8 Fix tabindex to -1. 2013-10-16 09:43:44 +03:00
polesye
6d52d56b50 Change aria-label attribute to title. 2013-10-16 09:43:44 +03:00
polesye
524388dbb8 Add a11y. 2013-10-16 09:43:44 +03:00
Brian Wilson
8f31acbeb4 Add support for counting and reporting skips in background tasks. 2013-10-10 15:32:58 -04:00
Julia Hansbrough
47685af07d Defined baseUrl in the legacy instructor dashboard template, fixing a bug where the HTML editor would fail to load 2013-10-09 21:32:50 +00:00
Calen Pennington
2514dca550 Put XBlock css and javascript onto the LMS courseware page 
This required changing structural XModules to fully implement
student_view, rather than just returning the HTML of their children in a
get_html call.

[LMS-223]
[LMS-1170]
 2013-10-09 09:40:47 -04:00
Adam Palay
c64399424e re-enable some buttons on instr dash 2013-10-07 18:13:21 -04:00
Brian Talbot
8ec583c355 LMS: abstracts consistent message/copy color styling from Instructor Dashboard view 
LMS: adds message styling to the separate instructor_2 Sass file
 2013-10-07 10:14:10 -04:00
Adam Palay
197f9015aa disable buttons for large courses on legacy and beta instr dash 
set max enrollment for downloads to 200
 2013-10-07 10:11:08 -04:00
marco
81a2ac413d Merge branch 'release' 
Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py
 2013-10-01 17:05:02 -04: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
Sarina Canelake
8a2bd25b7c Visual rearrangement of new dash "Student Admin" page 2013-09-27 12:17:24 -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
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
Nick Parlante
08cb469409 Merge pull request #1104 from edx/nick/anon-userids 
Add "Download CSV of all student anonymized IDs" button to instructor dashboards
 2013-09-25 20:58:34 -07:00
Renzo Lucioni
e7e03f10fb Refactor tab tests 2013-09-25 00:27:36 -04:00
Renzo Lucioni
f1ccf1c06b Integrate split testing and LMS tabs experiments 2013-09-25 00:27:36 -04:00
Nick Parlante
1b5903935e Add "Download CSV of all student anonymized IDs" button to instructor dashboard 
This is a recurrent ops problem, so we wanted to make it available
on the instructor dashboard.
 2013-09-24 12:59:42 -07:00
Felipe Montoya
c6f4c8b2b8 i18n: staff/student toggle link 2013-09-12 18:13:12 -05:00
cahrens
95ad1826d4 Hide show_timezone from Advanced Settings and migrate courses with show_timezone=False to using due_date_display_format. 2013-09-12 14:30:00 -04:00
cahrens
08d9942993 Allow custom formatting of due date strings. 
STUD-724

Test course for allowing custom formatting of due date strings.

STUD-724

Try making the name of the course match the folder name.

More cleanup.

More cleanup.

updates.
 2013-09-12 14:30:00 -04:00
David Ormsbee
48f867bd6b Merge branch 'master' into ormsbee/verifyuser3 
Conflicts:
	lms/envs/common.py
 2013-09-09 10:18:25 -04:00
Brian Talbot
70cdc9a705 edx.org: addresses vertical scrollbar on course register button when placed in iframe 2013-09-05 08:49:02 -04:00
Brian Talbot
d4e849d2b2 edx.org: adds custom styling for register button in case of verified option/content displayed 2013-09-04 15:30:10 -04:00
Jason Bau
ec989e4999 Address review comments for lms_link_to_cms 
* Uses override_settings to provide test variable
* Move location of cms link to upper right
* PEP8 / Pylink
 2013-09-04 11:29:22 -07:00
David Ormsbee
78acd083be Merge branch 'master' into ormsbee/verifyuser3 
Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss
 2013-09-04 10:58:30 -04:00
Jason Bau
b0f9fd0df5 Add link in lms legacy instructor dashboard to cms course_index 
A one-click way of getting to editing the course
 2013-08-31 01:07:34 -07:00
Sarina Canelake
e6bde93837 Change bulk email model field names and add migrations 2013-08-29 12:40:33 -04:00
Sarina Canelake
f98d6764b2 Disable bulk email for XML-backed courses 2013-08-29 12:40:32 -04:00
Sarina Canelake
65f7b098dd Bulk Email: Add design styling 
Switch to using decorators; refactor and cleanup tests.
 2013-08-29 12:40:32 -04:00
Kevin Luo
3b32d4216c Add delay to course bulk email task and use SITE_NAME for site url 
Delay for possible race condition with fetching course email object.
 Use settings.SITE_NAME for host name to generate email footer url.
 2013-08-29 12:40:32 -04:00
Kevin Luo
3ea2b24b98 Add HTML editor for authoring bulk email message (adopted from CMS) 2013-08-29 12:40:32 -04:00