Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5589 Commits

Author SHA1 Message Date
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
David Baumgold
45f38ddf81 Update requests library to 1.2.3 2013-09-10 09:59:21 -04:00
Calen Pennington
1255ab7514 Add mitxmako.middleware to fix workers 
If mitxmako.middleware has ever been imported, then render_to_string
works correctly (which is why we didn't see this in the rest of
edx-platform). However, if it hasn't (like in a celery worker), then
using mitxmako.middleware errors out.

[LMS-1085]
 2013-09-09 11:13:50 -04:00
David Ormsbee
48f867bd6b Merge branch 'master' into ormsbee/verifyuser3 
Conflicts:
	lms/envs/common.py
 2013-09-09 10:18:25 -04:00
Jason Bau
9dac2eff90 actually flatten username suggestion to ascii 2013-09-08 20:26:21 -07:00
Jason Bau
6a850e27bb Address @brianhw review comments 
* Fix open redirect vulnerability
* Add Logging To AUDIT_LOG : Note I had to change existing tests
  that mocked AUDIT_LOG with this
* Use external_auth.views.SHIBBOLETH_DOMAIN_PREFIX in student.views
* Add a bunch of documentation
* PEP8 / Pylint
 2013-09-06 15:37:27 -07:00
Jason Bau
4d656061be Removing handling for ExternalAuthMap.MultipleObjectsReturned 2013-09-06 15:36:22 -07:00
Jason Bau
948c07c493 Revamped + Enhanced Shibboleth support 
* If a shib users type in their email on the regular login page,
  redirects them to /shib-login/
* Modify student.views.accounts_login to handle redirects
  generated by @login_required for courses that use shib for
  access control.
  Redirect those logins to /shib-login/?next=
 2013-09-06 15:36:22 -07:00
Diana Huang
238a2d53e3 Don't allow people into the verification flow if they've already been verified 2013-09-06 17:20:24 -04:00
Don Mitchell
0848360436 Merge pull request #844 from edx/dhm/editable_metadata 
refactoring of platform to xblock 0.3 w/ refactoring of inheritance in the platform to a consistent representation.
 2013-09-06 11:58:36 -07:00
David Ormsbee
90923f3e12 Add min_price var to _contribution.html template 2013-09-06 10:11:29 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Chris Dodge
0847bc5e2b pep8/pylint violations fixes 2013-09-04 11:34:35 -04: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