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

165 Commits

Author SHA1 Message Date
David Baumgold
cbaa3089ba Updated comment 2013-10-09 15:54:01 -04:00
David Baumgold
16ca0252b3 Clarify USE_I18N settings 
@jzoldak showed me that setting `USE_I18N = DEBUG` didn't actually accomplish
what I had hoped it would -- changing DEBUG didn't also change USE_I18N.
This pull request accomplishes what I was trying to accomplish, without being
quite so clever about it.
 2013-10-09 09:04:12 -04:00
David Baumgold
4879b06c2a Merge pull request #1235 from edx/db/tie-i18n-to-debug 
Tie the USE_I18N setting to DEBUG setting
 2013-10-09 05:45:20 -07:00
David Baumgold
fd7e8baccb Tie the USE_I18N setting to DEBUG setting 
We want USE_I18N to be on in development, but off in production. Tying
this setting to the DEBUG setting accomplishes that neatly.
 2013-10-07 15:04:15 -04:00
Julian Arni
57b38969e5 Move import-related js to import.js 2013-10-07 09:57:20 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
Calen Pennington
d77491e46a Pull XModule attributes out into a mixin that can be applied to xblocks 2013-09-27 13:11:05 -04:00
Greg Price
7275f85232 Merge branch 'release' 2013-09-24 15:27:18 -04:00
cahrens
ab6af2b586 Put assets JavaScript code back in something that goes through pipelining. 2013-09-24 11:49:54 -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
cahrens
01d7d48f8f Create backbone models/views for assets. 
cleanup

Updates.

Testing changes.

Testing changes.

asset-index progress state cleanjup.

cleanup
 2013-09-20 10:44:54 -04: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
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
Carlos Andrés Rocha
fbc243dbeb Add event tracking with configurable backends 2013-09-11 10:02:15 -04:00
David Ormsbee
48f867bd6b Merge branch 'master' into ormsbee/verifyuser3 
Conflicts:
	lms/envs/common.py
 2013-09-09 10:18:25 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Chris Dodge
4a12cb60c9 due to the MixedModuleStore pending release, we need to make enrollment start/end dates editable in Studio 2013-09-05 12:43:24 -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
cahrens
a061c7ece7 Rewriting of links for Course Updates and Course Handouts. 
STUD-669.
 2013-08-29 14:35:16 -04:00
David Ormsbee
0dd5819683 basic flow from enroll mode selection to verify screen 2013-08-22 13:56:23 -04:00
Peter Fogg
7fc8fcde7b Merge pull request #752 from edx/peter-fogg/unlimited-graceperiod 
Allow grace periods of > 24 hours.
 2013-08-21 13:00:15 -07:00
Peter Fogg
eb5b6cc6ea Allow grace periods of > 24 hours. 2013-08-21 14:37:12 -04:00
Peter Fogg
e177270d0d Merge pull request #700 from edx/peter-fogg/course-image-upload 
WIP: Peter fogg/course image upload
 2013-08-21 11:17:12 -07:00
Diana Huang
70e1c70e4f Move course modes to common and enable in Studio 2013-08-21 09:59:15 -04:00
Peter Fogg
ce1a13f32c Generalize file uploader. 
Previously the file upload dialog was PDF- and textbook-specific. The
changes are adding parameters to the FileUpload model for the file
type, and adding an onSuccess callback to the UploadDialog view. Also
moved upload-specific SASS into its own file.
 2013-08-21 09:42:00 -04:00
Carlos Andrés Rocha
bbfe3662e2 Enable the django_nose app by default 
The django_nose it is very useful, even outside the test
environment. For example, it lets you to easily run test from
manage.py without additional changes to the test packages.
 2013-08-15 19:31:30 -04:00
Adam Palay
4855fd5af4 turn off i18n 2013-08-14 17:03:21 -04:00
Adam Palay
55ad55b9ca add PLATFORM_NAME and BUGS_EMAIL to cms/envs/common 2013-08-13 10:35:06 -04:00
chrisndodge
bb644bb6ae Merge pull request #645 from edx/fix/cdodge/add-tech-support-email-config 
Add new setting to cms project
 2013-08-12 11:10:53 -07:00
Chris Dodge
7fd5a00c2c import default TECH_SUPPORT_EMAIL setting from LMS 2013-08-12 14:07:03 -04:00
Chris Dodge
0231e64f36 also define TECH_SUPPORT_EMAIL in cms.envs.common config file 2013-08-12 13:41:05 -04:00
Anton Stupak
74f3595d54 Add acceptance tests for checking rendering. 2013-08-12 14:32:15 +03:00
Diana Huang
c867be7961 Limit the rate of logins. 2013-08-02 11:23:59 -04:00
John Jarvis
3d87dd8c58 Merge pull request #551 from edx/jarv/remove-ADMINS 
changing default ADMINS to an empty tuple
 2013-08-01 14:02:26 -07:00
David Baumgold
2ad78d949a Merge pull request #538 from edx/db/course-team-admin-grants 
Add error messaging to course team page
 2013-08-01 11:58:52 -07:00
David Baumgold
1eae675952 Create a dedicated CMS.Models.Course Backbone model 
Initialize on every page that has a context_course set
 2013-08-01 13:39:47 -04:00
John Jarvis
b93e1985fb changing default ADMINS to an empty tuple 
https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-ADMINS
https://docs.djangoproject.com/en/dev/howto/error-reporting/
 2013-08-01 12:50:23 -04:00
Will Daly
39030c6683 Remove CSRF middleware/processor in aws and dev settings, 
not common.  This ensures that we load the MITX_FEATURES
token BEFORE deciding to disable CSRF.
 2013-07-31 23:59:25 -04:00
Diana Huang
0d10a872c8 Merge pull request #499 from edx/diana/login-redirect 
Only redirect when redirect url is an internal page.
 2013-07-30 05:29:39 -07:00
Diana Huang
d1b503d53a Only redirect when redirect url is an internal page. 2013-07-29 14:18:04 -04:00
cahrens
23894d20f8 E-mail notifications to users when course creator status changes. 2013-07-29 09:49:37 -04:00
ihoover
56883d65a1 csrf test fix 
remove test that csrf middleware is disabled (since we can't seem to reload middleware between tests)

move definitions from setuo into test method
 2013-07-24 17:08:18 -04:00
ihoover
ee4bc424ce remove depracated feature flag GENERATE_RANDOM_USER_CREDENTIALS 2013-07-17 09:12:07 -04:00
Chris Dodge
b39edd821c seems like we need to define COURSES_WITH_UNSAFE_CODE in cms.envs.common.py, although cms.envs.common.py imports lms.envs.common (where this is defined). 2013-07-11 12:05:07 -04:00
David Baumgold
4bc109708f Use django-method-override module 
Replacing the get_request_method function everywhere
 2013-07-09 19:16:09 -04:00
David Baumgold
8227a8c3db Started adding tests for textbook backbone views 2013-07-09 19:16:03 -04:00
David Baumgold
001cd5d004 First few unit tests 2013-07-09 19:16:03 -04:00
cahrens
2970f24245 Initial admin table view. 2013-07-03 09:24:02 -04:00
cahrens
72999e8417 Initial model. 2013-06-28 12:19:51 -04:00