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

1051 Commits

Author SHA1 Message Date
Brian Wilson
07f94d46a6 Move Pearson courseware imports to function level. 2013-09-27 12:43:27 -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
Jay Zoldak
8e6c0ea937 Wrap logic for selecting options in acceptance tests 2013-09-26 16:07:20 -04: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
Will Daly
2b54922285 Fix intermittent failure in OpenID test 2013-09-25 13:05:56 -04: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
Diana Huang
4ee9ef61cf Clean up some old pep8/pylint violations 
Also, deletes some unused code.
 2013-09-24 17:12:31 -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
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
Julian Arni
b4e6a8b209 Fix order-dependency in tests 2013-09-23 10:52:05 -04:00
Julian Arni
268b5b47ae Remove cache workaround 2013-09-20 17:25:43 -04:00
Julian Arni
bf633f9c5d Perform auth checks in middleware 
Includes static server tests.
 2013-09-20 17:22:08 -04:00
Jason Bau
b48e3a9661 fix some shib signup session related bugs 2013-09-20 11:53:32 -07:00
Jason Bau
11ecd162d4 fix _flatten_to_ascii for str inputs 2013-09-20 11:53:09 -07:00
Jay Zoldak
be51ee2c46 Speed up lms login 2013-09-18 15:51:31 -04:00
Jay Zoldak
9e368b8d9a Quiet the output of passing acceptance tests 2013-09-18 15:51:10 -04:00
Jay Zoldak
4c411e2121 Add ability to run against generic selenium grid 2013-09-18 13:49:34 -04:00
Jay Zoldak
fe71ace529 Improve retry logic for Stale Element Exceptions 
Better exception retry logic

Change methods to lambdas
 2013-09-17 12:49:46 -04:00
Diana Huang
d191847ff5 Merge branch 'release' 
Conflicts:
	lms/static/sass/views/_verification.scss
 2013-09-17 10:55:22 -04:00
David Ormsbee
135f7e3b80 Make sure audit enrollments are really marked audit. 2013-09-17 10:16:22 -04:00
Jay Zoldak
30b13d3cf1 Improve code clarity and error messages for css selection 2013-09-16 16:49:18 -04:00
Jay Zoldak
2ff056df8c Simplify retry logic for ui helper functions 2013-09-16 16:49:17 -04:00
John Jarvis
39d441e132 Merge pull request #765 from edx/jarv/grade-dump 
Jarv/grade dump
 2013-09-13 12:31:25 -07:00
Gabe Mulley
761a4dcc97 Make URL patterns to exclude from tracking configurable 
* Add unit test coverage for this "exclusion from tracking" logic
* Exclude based on regex match instead of raw string comparison
* Exclude heartbeat requests from tracking
 2013-09-13 11:24:51 -04:00
chrisndodge
b6761498a3 Merge pull request #954 from edx/fix/cdodge/remove-forum-permissions-on-delete 
define a unseeding forums permissions and call into it from delete_cours...
 2013-09-13 07:23:14 -07:00
Jason Bau
c86a56e6d9 Merge pull request #959 from edx/jbau/fix/anonymous-index-with-startdate 
fix bug with anonymous access to / with future start courses
 2013-09-12 17:33:55 -07:00
Diana Huang
90951a7bdb Merge branch 'release' 
Conflicts:
	CHANGELOG.rst
	common/lib/xmodule/xmodule/js/fixtures/lti.html
	common/lib/xmodule/xmodule/js/spec/lti/constructor.js
	common/lib/xmodule/xmodule/js/src/lti/lti.js
	common/lib/xmodule/xmodule/lti_module.py
	lms/djangoapps/courseware/features/certificates.py
	lms/djangoapps/courseware/mock_lti_server/mock_lti_server.py
	lms/djangoapps/courseware/tests/test_lti.py
	lms/djangoapps/shoppingcart/models.py
	lms/envs/aws.py
 2013-09-12 16:03:39 -04:00
Chris Dodge
481cbfd8a5 consolidate delete role logic 2013-09-12 15:57:13 -04:00
Jason Bau
7668ef6f31 fix bug with anonymous access to / with future start courses 2013-09-12 11:43:21 -07:00
Chris Dodge
bd69db4410 switch to using get() rather than get_or_create(). Also add a test case with a different casing on the courseId 2013-09-12 14:27:57 -04:00
Chris Dodge
41be20a000 define a unseeding forums permissions and call into it from delete_course 
define a unseeding forums permissions and call into it from delete_course

define a unseeding forums permissions and call into it from delete_course
 2013-09-12 14:27:57 -04:00
Will Daly
2677598a53 Merge pull request #938 from rocha/mock-mongo-on-event-tracking-tests 
Mock mongo event tracking backend during tests
 2013-09-12 11:27:22 -07:00
Carlos Andrés Rocha
6a64b404a1 Mock mongo event tracking backend during tests 2013-09-12 13:36:49 -04:00
Carlos Andrés Rocha
979ec89f0e Fix error encoding datetime objects in the event track logger backend 
The function json.dumps was being called with incorrect arguments,
causing an infinite recursion when serializing an event containing
datetime objects
 2013-09-12 12:21:08 -04:00
Carlos Andrés Rocha
87fcf1ab9e Merge pull request #905 from rocha/datadog-statsd 
Remove dogstatsd-python in favor of dogapi
 2013-09-12 06:53:02 -07:00
Carlos Andrés Rocha
ee0004e2f8 Remove dogstatsd-python in favor of dogapi 
Also added datadog application to commom django apps and set it to use
a local statsd server by default.
 2013-09-11 19:28:58 -04:00
David Baumgold
049aa3bbfd Merge pull request #880 from edx/db/update-requests-lib 
Update `requests` library to 1.2.3
 2013-09-11 13:03:55 -07:00
Carlos Andrés Rocha
11db4e3773 Use datetime objects in time field in event tracking 2013-09-11 10:02:16 -04:00
Carlos Andrés Rocha
6de25bf5fe Monitor event tracking time by backend using statsd 2013-09-11 10:02:15 -04:00
Carlos Andrés Rocha
fbc243dbeb Add event tracking with configurable backends 2013-09-11 10:02:15 -04:00
Calen Pennington
e415d2c264 Merge pull request #923 from cpennington/fix-mitxmako-middleware-import 
Add mitxmako.middleware to fix workers
 2013-09-10 13:54:23 -07:00
Calen Pennington
2ddaf9089d Merge pull request #891 from cpennington/fix-mitxmako-middleware-import 
Add mitxmako.middleware to fix workers
 2013-09-10 13:40:27 -07:00
Jason Bau
f3af24f692 Merge pull request #842 from edx/jbau/shib-revamp 
Revamped + Enhanced Shibboleth support
 2013-09-10 12:27:07 -07:00
Diana Huang
b597cdfdae If user has previously selected a price, show it on the choose page 2013-09-10 14:35:57 -04:00
Jason Bau
7b9c6fbe5f remove spaces from usename suggestion 2013-09-10 10:42:19 -07:00
David Ormsbee
740e5bace7 Prevent being able to click on disabled button in IE. 
Enable display of course org, num in receipt page.
 2013-09-10 13:32:52 -04:00