Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,147 Commits 1 Branch 0 Tags
8bd686d63cbd46775f35faddddcf0baaffcba310
Commit Graph

278 Commits

Author SHA1 Message Date
Will Daly
cadb81355e Merge pull request #548 from edx/will/fix-auto-auth-csrf-2 
Ensure auto-auth feature flag actually disables CSRF
 2013-08-01 08:20:32 -07:00
Will Daly
ab1461542d Moved CSRF override into its own settings file 2013-08-01 09:27:46 -04:00
e0d
ef75f9bb2c adding migrate env for cms 
cleanup
 2013-08-01 08:43:20 -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
aad6dc4345 Merge pull request #417 from edx/ihoover/feature_flag_auto_auth 
Ihoover/feature flag auto auth
 2013-07-25 08:11:22 -07: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
Jason Bau
6c3de222cc Merge pull request #450 from edx/jbau/configure-session 
Allow session backend to be configurable
 2013-07-21 20:44:15 -07:00
ihoover
a4ed24bd4b Merge branch 'master' into ihoover/feature_flag_auto_auth 2013-07-20 16:15:26 -04:00
Jason Bau
034de2cfd2 Allow session backend to be configurable and also add PLATFORM_NAME 
to cms settings (it was throwing 500s for Stanford when the CMS
calls render_from_lms)
 2013-07-19 17:43:37 -07:00
Don Mitchell
df7b917b40 Implement next generation modulestore 
A new modulestore backed by mongo that changes the data format to
facilitate easy versioning, sharing content between courses, and fast
lookup of course structure and Scope.settings data.

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
 2013-07-19 13:10:14 -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
John Jarvis
67f8d48840 Merge pull request #367 from edx/jarv/gce-email-backend 
adding option for file based backend
 2013-07-11 08:02:47 -07:00
Jonah Stanley
786f422ffa Merge pull request #298 from edx/jonahstanley/acceptance-tests-unique-database 
Jonahstanley/acceptance tests unique database
 2013-07-10 14:09:28 -07:00
JonahStanley
a0900f09cc Commented why Acceptance_static is needed 2013-07-10 16:23:26 -04:00
John Jarvis
5b16fbe369 adding option for file based backend 2013-07-10 16:05:37 -04:00
JonahStanley
4685cacc7b Databases are now cleaned properly 
Acceptance_static is used to prevent collect static from using a seed
test.py had its seed removed due to redundancy
 2013-07-10 15:28:23 -04:00
Adam Palay
d056c8a8f2 replace test setting changes with test-specific mock.patch.dicts 2013-07-10 10:18:58 -04:00
David Baumgold
437e658f98 pylint fixes 2013-07-09 19:16:44 -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
Chris Dodge
b43f1c7331 add a new cms ENV configuration to use a slow upload file handler to help test progress bars in uploads 2013-07-09 19:15:59 -04:00
JonahStanley
0bd1e78e03 Acceptance tests use random ports 2013-07-09 12:18:30 -04:00
JonahStanley
a21303ba96 Found some other places where the name should be unique 2013-07-09 10:49:19 -04:00
JonahStanley
a2020aad03 Changed the lms database name to be different for the acceptance tests 2013-07-09 09:31:37 -04:00
JonahStanley
1eaa0317c4 Using parent process id for random number 
This is to allow acceptance tests to properly link and know the names of its other parts
 2013-07-09 08:57:05 -04:00
JonahStanley
b0d70008e4 Changed when the databases are reset 
This might allow parallel features in the future
 2013-07-09 08:54:20 -04:00
JonahStanley
789b711023 Acceptance tests now pull from their own unique database 
These databases/collections are cleared after harvest
 2013-07-09 08:54:19 -04:00
cahrens
2cceda948c Disable test point when run under CMS. 
The template exists when django admin is enabled, but the mappings in CMS' urls.py do not exist.
 2013-07-08 13:12:44 -04:00
cahrens
b53899aa54 Merge branch 'master' into christina/course-creator-table 2013-07-08 12:12:04 -04:00
Carlos Andrés Rocha
1fbab8e9fa Merge pull request #295 from edx/rocha/celery-virtual-host 
Add setting to set the virtual host of a Celery broker
 2013-07-08 06:58:31 -07:00
Chris Dodge
a224c1e8a3 need to change aws.py to take the COURSES_WITH_UNSAFE_CODE from the envs.json file 2013-07-03 14:01:33 -04:00
cahrens
2970f24245 Initial admin table view. 2013-07-03 09:24:02 -04:00
Adam Palay
03aee3ed79 add tests 2013-07-01 18:21:47 -04:00
Don Mitchell
ddfbe59814 Make DraftModuleStore mongo only 
DraftModuleStore was originally designed as a mixin, but never used that
way, and with the upcoming changes to use the versioned module store,
never will be. This changes removes a circular dependency between
mongo.py and draft.py.
 2013-07-01 12:33:08 -04:00
cahrens
72999e8417 Initial model. 2013-06-28 12:19:51 -04:00
Carlos Andrés Rocha
a844548fb8 Add setting to set the virtual host of a Celery broker 2013-06-27 17:58:51 -04:00
cahrens
f095c5fec6 Add ENABLE_CREATOR_GROUP (set to False). 2013-06-27 11:00:43 -04:00
Don Mitchell
b42fe277d4 Add serial commas to modulestore definitions 2013-06-25 22:34:36 -04:00
Jay Zoldak
6c66736e3c Specify a different xcontent mongo db for the acceptance tests 2013-06-25 16:56:36 -04:00
Jonah Stanley
b14553d867 Merge pull request #220 from edx/jonahstanley/make-units-parallel 
Jonahstanley/make units parallel
 2013-06-25 11:44:01 -07:00
Ned Batchelder
5a5d425eb3 Files that may not exist need F0401 suppressed during import. 2013-06-21 17:33:23 -04:00
JonahStanley
e4af7287b6 Initial testing for parallelization 2013-06-21 08:51:43 -04:00
Ned Batchelder
bc2f7b96ec Remove a redundant pylint suppression. 2013-06-19 22:31:05 -04:00
Ned Batchelder
645d847bb1 Remove unused imports from cms, as detected by pylint. 2013-06-19 16:56:34 -04:00
David Baumgold
cb3d46d815 Merge pull request #199 from edx/db/notifications-refactor 
Refactor Backbone notifications
 2013-06-19 08:04:18 -07:00