Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,355 Commits 1 Branch 0 Tags
20d87061d428fb554bfbd3e904b1dcd052d6f934
Commit Graph

19226 Commits

Author SHA1 Message Date
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
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
f63aa0f547 Pylint and pep8 hygiene 2013-09-26 12:57:40 -04: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
Don Mitchell
d328c53dff Cached course entry: separate structure from identity 
Don't undo inheritance by unsetting course_entry structure
Do finer-grained cache clearing
 2013-09-26 12:57:40 -04:00
Don Mitchell
c1789adfd9 Always return a Locator: cases weren't exhaustive. 2013-09-26 12:57:39 -04:00
Don Mitchell
934b3ca7c0 Check has_children before accessing children 2013-09-26 12:57:39 -04:00
Don Mitchell
b4fa316294 Migrate data from old mongo to split mongo 
Create location mapping
Create draft and published course with proper content in split.
 2013-09-26 12:57:39 -04:00
Giulio Gratta
bbd902f87e Last Changes before Merge 
- Change variable name to make it more clear
 2013-09-26 09:52:30 -07: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
Don Mitchell
190b418387 Merge pull request #1121 from edx/dhm/timezone_display 
Replace date lib w/ simpler tzAbbr
 2013-09-26 07:43:22 -07:00
Diana Huang
78829a37b5 Merge pull request #1127 from edx/diana/modes-expiration-dates 
Add the ability to set expiration dates on course modes.
 2013-09-25 14:22:22 -07:00
Diana Huang
37d906e4db Add the ability to set expiration dates on course modes. 2013-09-25 16:15:42 -04:00
Don Mitchell
ef26e8baa3 Just write the loc name as the key in the policy file 2013-09-25 14:41:42 -04:00
Will Daly
2338ed2d8a Merge pull request #1126 from edx/will/fix-openid-test 
Fix intermittent failure in OpenID test
 2013-09-25 11:36:02 -07:00
Calen Pennington
f4b37b28b1 Merge pull request #1060 from cpennington/lazy-textbooks 
Make Textbooks properly lazy
 2013-09-25 11:32:09 -07:00
Usman Khalid
d0f0e59272 Fixed js coding style for pdf arrows toggle 2013-09-25 22:52:51 +05:00
Will Daly
2b54922285 Fix intermittent failure in OpenID test 2013-09-25 13:05:56 -04:00
jkarni
7bd54546e3 Merge pull request #597 from edx/feature/msteele/scrollup 
Add scroll-to-top when switching verticals from bottom nav buttons.
 2013-09-25 08:38:24 -07:00
Valera Rozuvan
a8349a06cd Merge pull request #1120 from edx/valera/fix_for_unnecessary_outline_around_video 
Fix for bug BLD-359: Unnecessary focus outline around Video Player.
 2013-09-25 07:00:47 -07: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
Don Mitchell
dd788c8fb2 Merge pull request #1107 from edx/dhm/bug_attrs 
Ensure location is valid before trying to fetch
 2013-09-25 05:50:49 -07:00
Valera Rozuvan
8b4489233e Fix for bug BLD-359: Unnecessary focus outline around Video Player. 2013-09-25 14:53:46 +03:00
Diana Huang
4ee9ef61cf Clean up some old pep8/pylint violations 
Also, deletes some unused code.
 2013-09-24 17:12:31 -04:00
Don Mitchell
20e4d585c8 Add documentation and comments. 2013-09-24 16:31:21 -04:00
Don Mitchell
d1a82f2ac5 Import/export static content properties 
Even though xml based courses will ignore.
 2013-09-24 16:31:20 -04: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
Julian Arni
1a0b752a81 Review fixes 2013-09-24 14:59:07 -04:00
Jay Zoldak
002f3ef9e2 Speed up waiting for elements not present on remote webdriver sessions. 2013-09-24 11:27:42 -04:00
Don Mitchell
3b61d5721a Ensure location is valid before trying to fetch 
Prevent accidental wildcarding.
 2013-09-24 09:03:36 -04:00
jmclaus
3a5d7d8638 Addressed PR comments 2013-09-24 12:12:10 +02:00
jmclaus
feb95eb869 Fixed tests 2013-09-24 10:31:37 +02:00
jmclaus
2cc9679ea8 Used Jasmine jQuery for tests instead 2013-09-24 10:31:37 +02:00
jmclaus
ffa49b0391 Added tests 2013-09-24 10:31:37 +02:00
jmclaus
9836fd51c7 Speed control now regains focus after a speed entry has been selected with the keyboard 2013-09-24 10:31:36 +02:00
Greg Price
4a2a6fba80 Merge pull request #1103 from edx/dhm/asset_bug 
Dhm/asset bug
 2013-09-23 14:24:19 -07:00
Don Mitchell
f8cd482621 Replace date lib w/ simpler tzAbbr 2013-09-23 16:56:30 -04:00
Will Daly
5347a49975 Disable test that fails intermittently in master 2013-09-23 16:50:02 -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
jkarni
199f898d23 Merge pull request #1087 from edx/jkarni/fix/revert-xml-comments 
Jkarni/fix/revert xml comments
 2013-09-23 12:18:21 -07:00
Don Mitchell
a4ee129f04 Merge pull request #1095 from edx/dhm/asset_bug 
Fixed missing read (cut/paste f'up)
 2013-09-23 12:17:56 -07:00
Julian Arni
e5c90d33fc Fix middleware order in CMS. 
And include Don's fix for partial course_id lookup.
 2013-09-23 15:11:06 -04:00
Calen Pennington
63b841bca9 Merge pull request #1062 from cpennington/speed-up-location-creation 
Speed up Location creation returning existing locations where possible
 2013-09-23 11:55:36 -07:00
Calen Pennington
25ea91ed4a Merge pull request #1061 from cpennington/faster-location-urls 
Turn Locations into dicts less often
 2013-09-23 11:55:00 -07:00
Don Mitchell
3daeb59aca Fixed missing read (cut/paste f'up) 2013-09-23 14:09:58 -04:00
Calen Pennington
cfa2b27f26 Turn Locations into dicts less often 2013-09-23 13:46:48 -04:00
Calen Pennington
ad2da44cb1 Make Textbooks properly lazy 2013-09-23 13:44:34 -04:00
Don Mitchell
379a147a57 Begin transactional with_version impl 
Change create_item to optionally add the item to the head version and not create a new version.
 2013-09-23 11:35:53 -04:00