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

6486 Commits

Author SHA1 Message Date
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
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
Brian Talbot
b86ab28401 Merge pull request #1129 from edx/talbs/fix-lms-banners 
edx.org/LMS: Use/Style Semantic Text in Login and Registration Banners
 2013-09-26 14:06:24 -07:00
Will Daly
3c88ccb4ff Use comments to skip tests instead of a tag 2013-09-26 16:37:25 -04:00
Jay Zoldak
8e6c0ea937 Wrap logic for selecting options in acceptance tests 2013-09-26 16:07:20 -04:00
Don Mitchell
2379e7c3fc Merge pull request #1029 from edx/dhm/migrate_mongo 
Migrate courses from old mongo to split
 2013-09-26 10:35:52 -07:00
Don Mitchell
59b31474ca Separate db config from modulestore config parms 
use to instantiate loc_mapper
test loc_mapper injection into split modulestore
 2013-09-26 12:57:40 -04:00
Giulio Gratta
68ce6ed1c8 Second batch of ORA UI fixes: 
- Change wording when done with peer grading ("evals" -> "assessments")
- Added ICE legend item for comment syntax
- Added conditionals to display human readable 'grader_type' to alleviate confusion
- Rename 'Show/Hide Prompt' to 'Show/Hide Question'
- Reworded grading flags
- Make ICE grading container larger to more easily allow users to read and edit larger texts
- Adjusted lots of text and word choices to make them more user friendly
- Disable previous arrow on first grader feedback and next arrow on last grader feedback
- hide ORA instructions and ICE legend when calibrating so students don't feel like they need to write feedback

Changes after comments:

- Renamed instructions element and fixed casing issue
- Renamed legend class to ice-legend
- Changing condition from != to >= to not only fix incorrect one but also catch possible weirdness
- Grammar fix in a message
- Removing grader_type conditional in HTMl to give way to the one in python
- Moving ice feedback area height styling to CSS file

More changes:

- Update ICE version
- Modifying test to reflect code change
- Adding ICE undo feature
 2013-09-26 09:26:35 -07:00
Greg Price
407efdaae6 Merge pull request #1136 from edx/hotfix/lms-a11y 2013-09-26 06:39:05 -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
Nick Parlante
d225b85d1a Port get-anonymized-id feature to new instructor dashboard 2013-09-25 13:52:05 -07:00
Renzo Lucioni
c124a33036 Merge pull request #829 from edx/renzo/ab-testing 
Split Testing
 2013-09-25 13:29:46 -07:00
Renzo Lucioni
ac0e65ab2a Update CHANGELOG 2013-09-25 16:26:04 -04:00
Adam Palay
6a412f4df6 add ESC key functionality to forgot password modal 2013-09-25 16:24:25 -04:00
Adam Palay
9affd38d2b fix focus management for help modal 2013-09-25 16:24:24 -04:00
Chris Dodge
51d0dd121d LMS startup needs to initialize the modulestores so that we don't lazy load all of the XML courses on first HTTP request 2013-09-25 16:04:43 -04:00
Brian Talbot
982d22df38 edx.org/LMS: revises graphic-based login and registration banner text to render with system text 2013-09-25 16:00:08 -04:00
Adam Palay
1fe982fb16 fix a11y error in help modal 2013-09-25 15:56:45 -04:00
Will Daly
47621b56ff Merge pull request #1112 from edx/will/shard-acceptance-tests 
Added tags to acceptance tests to define multiple shards.
 2013-09-25 11:36:18 -07:00
Usman Khalid
cd696e76e9 PdfViewer: Added missing link to compatibility.js 2013-09-25 18:34:01 +05:00
Diana Huang
19ee540a33 Merge pull request #1115 from edx/diana/verify-pep8-pylint 
Clean up some old pep8/pylint violations
 2013-09-25 06:23:47 -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
Diana Huang
4ee9ef61cf Clean up some old pep8/pylint violations 
Also, deletes some unused code.
 2013-09-24 17:12:31 -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
Greg Price
7275f85232 Merge branch 'release' 2013-09-24 15:27:18 -04:00
jkarni
ad939b1e7c Merge pull request #1090 from edx/jkarni/feature/middleware-locked-assets 
Jkarni/feature/middleware locked assets
 2013-09-24 12:25:05 -07:00
Jay Zoldak
7669b4d777 Namespace the acceptance tests so they show up nicely in jenkins 
Conflicts:
	cms/djangoapps/contentstore/features/advanced-settings.feature
	cms/djangoapps/contentstore/features/checklists.feature
	cms/djangoapps/contentstore/features/component.feature
	cms/djangoapps/contentstore/features/course-overview.feature
	cms/djangoapps/contentstore/features/course-settings.feature
	cms/djangoapps/contentstore/features/course-team.feature
	cms/djangoapps/contentstore/features/course-updates.feature
	cms/djangoapps/contentstore/features/courses.feature
	cms/djangoapps/contentstore/features/discussion-editor.feature
	cms/djangoapps/contentstore/features/grading.feature
	cms/djangoapps/contentstore/features/html-editor.feature
	cms/djangoapps/contentstore/features/problem-editor.feature
	cms/djangoapps/contentstore/features/section.feature
	cms/djangoapps/contentstore/features/signup.feature
	cms/djangoapps/contentstore/features/static-pages.feature
	cms/djangoapps/contentstore/features/subsection.feature
	cms/djangoapps/contentstore/features/textbooks.feature
	cms/djangoapps/contentstore/features/upload.feature
	cms/djangoapps/contentstore/features/video-editor.feature
	cms/djangoapps/contentstore/features/video.feature
	lms/djangoapps/courseware/features/certificates.feature
	lms/djangoapps/courseware/features/help.feature
	lms/djangoapps/courseware/features/high-level-tabs.feature
	lms/djangoapps/courseware/features/homepage.feature
	lms/djangoapps/courseware/features/login.feature
	lms/djangoapps/courseware/features/lti.feature
	lms/djangoapps/courseware/features/navigation.feature
	lms/djangoapps/courseware/features/problems.feature
	lms/djangoapps/courseware/features/registration.feature
	lms/djangoapps/courseware/features/signup.feature
	lms/djangoapps/courseware/features/video.feature
	lms/djangoapps/courseware/features/word_cloud.feature
 2013-09-24 14:35:12 -04:00
Will Daly
f898f72920 Added tags to acceptance tests to define multiple shards. 2013-09-24 11:47:53 -04:00
Jay Zoldak
002f3ef9e2 Speed up waiting for elements not present on remote webdriver sessions. 2013-09-24 11:27:42 -04:00
Greg Price
fb4edab9f7 Merge pull request #1110 from edx/feature/kevin/forum_activity_accessibility 2013-09-24 08:23:01 -07:00
Kevin Chugh
4d78374b07 add unread comments count to sr block so user can hear unread comment count 2013-09-24 11:16:57 -04:00
Jay Zoldak
20ea28748b Speed up problems feature tests 2013-09-24 11:09:37 -04:00
Jay Zoldak
f30364906d Speed up lti acceptance test for remote webdriver. 2013-09-24 11:09:37 -04:00
Usman Khalid
761590bc8f Merge pull request #1053 from edx/usman/static-book-url 
Added missing test in StaticImageBookTest
 2013-09-24 06:24:43 -07:00
marco
b7aead39e2 updated new post forum dropdown menu for use with chromevox 2013-09-23 18:47:06 -04:00
Your Name
0a3ebf6a10 update discussion forums views to add accessibility information and add hidden accessibilty class to discussion scss, this comprises adding comments count and votes count verbiage and vote call to action 2013-09-23 17:46:13 -04:00
Greg Price
973751124d Merge pull request #1101 from edx/gprice/forum-a11y 
Improve forums nav accessibility
 2013-09-23 13:49:34 -07:00
Adam Palay
e9b15b6f02 add unicode support for course_wiki 2013-09-23 16:15:47 -04:00
David Ormsbee
88cae5436c Merge pull request #1085 from edx/ormsbee/ss_err_checking 
Add extra error checking and logging to Software Secure callback
 2013-09-23 07:38:39 -07:00
Adam
89c94b4f0a Merge pull request #1065 from edx/adam/password-modal 
manage focus to/from/within password reset modal appropriately
 2013-09-23 06:36:33 -07:00
Usman Khalid
3c3edac05f Fixed tests name in staticbook 2013-09-23 12:58:14 +00:00
Giulio Gratta
78ea6ef030 conditionalize written feedback area. 2013-09-22 17:23:22 -07:00