Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,939 Commits 1 Branch 0 Tags
2cd18dfad3bcda0bbca0ee4ea81eaef026c975f9
Commit Graph

1010 Commits

Author SHA1 Message Date
cahrens
e487521289 Update for change in add_user_to_creator_group API. 2013-06-26 10:52:26 -04:00
cahrens
4a697a8da1 Verify that caller of add or remove from creator group is staff. 2013-06-26 10:52:26 -04:00
cahrens
190c07d954 Add smoke coverage for add and remove of course group permissions. 2013-06-26 10:52:26 -04:00
cahrens
2c60a7dbc1 pep8 cleanup 2013-06-26 10:52:26 -04:00
cahrens
318372f2c0 Introduce course creator group. 2013-06-26 10:48:31 -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
Peter Fogg
d5d495c24d Fix acceptance tests expecting outdated CSS. 2013-06-24 16:57:14 -04:00
JonahStanley
3f9a72e6ce Consolidated imports 2013-06-21 16:32:13 -04:00
JonahStanley
5e6de488ab Fixed pylint/pep8 violations 2013-06-21 16:28:32 -04:00
JonahStanley
58fe6d4e83 Cleaned up import and comment 2013-06-21 16:17:33 -04:00
Jonah Stanley
26a05f2a45 Merge pull request #140 from edx/jonahstanley/add-courseteam-tests 
Jonahstanley/add courseteam tests
 2013-06-21 12:43:14 -07:00
David Baumgold
d632ffe9cd Make Course Team lettuce tests gender-neutral 
Because it bothers me, although I don't expect anyone else to care.
 2013-06-21 14:52:31 -04:00
JonahStanley
fa18b48f6e Contentstore singleton is now cleared during teardown 2013-06-21 08:51:44 -04:00
JonahStanley
51f8c0cfeb Added the beginnings of self cleanup 2013-06-21 08:51:44 -04:00
Jay Zoldak
f90ed69cd7 move override of MODULESTORE settings into ModuleStore test case class 2013-06-21 08:51:44 -04:00
JonahStanley
e4af7287b6 Initial testing for parallelization 2013-06-21 08:51:43 -04:00
Ned Batchelder
3eec09b87a Merge pull request #216 from edx/ned/remove-unused-imports 
Ned/remove unused imports
 2013-06-20 14:15:31 -07:00
JonahStanley
a52d0beb41 Got rid of leftover set_trace 2013-06-20 17:00:46 -04:00
JonahStanley
ec4547b51e Merge branch 'master' into jonahstanley/add-courseteam-tests 2013-06-20 16:55:37 -04:00
JonahStanley
70d48e2e9f Now referencing css element 2013-06-20 16:40:13 -04:00
Christina Roberts
e84ee873d0 Merge pull request #230 from edx/christina/pep8-again 
Pep8 cleaning.
 2013-06-20 13:34:50 -07:00
cahrens
34f8c044b8 Pep8 cleaning. 2013-06-20 16:06:00 -04:00
JonahStanley
b9d79aea60 A bunch of pylint fixes and explicit use case for uploads/test 2013-06-20 15:55:53 -04:00
Peter Fogg
1d8d507f49 Merge in master (again). 2013-06-20 12:21:16 -04:00
Christina Roberts
1a5b58acd6 Merge pull request #210 from edx/christina/course-settings-drupal 
On marketing site, disable course settings options that do not work.
 2013-06-20 09:15:18 -07:00
Jonah Stanley
9b478ff3e3 Merge pull request #115 from edx/jonahstanley/add-gradingsettings-tests 
Added testing for grading settings
 2013-06-20 08:31:31 -07:00
cahrens
a498fa52ba Modify after UX text changes. 2013-06-20 11:29:31 -04:00
cahrens
d601cee8e5 Merge branch 'master' into christina/course-settings-drupal 2013-06-20 11:00:12 -04:00
cahrens
9e69586bb3 pep8 fixes. 2013-06-20 10:31:44 -04:00
Peter Fogg
9c7be8b1dc Fix merge conflict in CHANGELOG.rst. 2013-06-20 09:58:22 -04:00
Christina Roberts
6fe56ac9f7 Merge pull request #205 from edx/christina/advanced-settings-test 
Sometimes the first click doesn't actually work, so call click up to 5 t...
 2013-06-20 05:48:13 -07:00
Ned Batchelder
645d847bb1 Remove unused imports from cms, as detected by pylint. 2013-06-19 16:56:34 -04:00
Ned Batchelder
df6d3f9b2f Fix strings that should be raw. 2013-06-19 16:56:34 -04:00
cahrens
29d93aff89 pep8 fixes. 2013-06-19 16:34:23 -04:00
cahrens
6643994348 Add an optional success lambda to css_click. 2013-06-19 13:51:40 -04:00
JonahStanley
0524ff53cc Merge branch 'master' into jonahstanley/add-courseteam-tests 
Conflicts:
	cms/djangoapps/contentstore/features/common.py
 2013-06-19 11:29:43 -04:00
cahrens
6e96b88518 On marketing site, disable course settings options that do not work. 
When on the marketing site (edx.org) disable portions of the course settings page in Studio that do not actually work in that environment.
 2013-06-19 11:28:16 -04:00
Don Mitchell
1ff022e181 Incidental pep8 changes 2013-06-18 17:25:06 -04:00
cahrens
9878c75b7a Sometimes the first click doesn't actually work, so call click up to 5 times. 
This seems to fix the sporadic failure (at least on my machine).
 2013-06-18 15:22:25 -04:00
Peter Fogg
7633968701 Merge branch 'master' into peter-fogg/remove-video-xml 2013-06-18 15:07:58 -04:00
JonahStanley
0b51f1bbba Merge branch 'master' into jonahstanley/add-courseteam-tests 2013-06-18 13:20:13 -04:00
JonahStanley
85e3062225 Fixed click to comply to new css_click 2013-06-18 12:51:18 -04:00
JonahStanley
ce3bc1e1cb Merge branch 'master' into jonahstanley/add-gradingsettings-tests 2013-06-18 12:47:30 -04:00
Don Mitchell
b151d6c155 Merge pull request #183 from edx/dhm/timeconv/bug0 
Fix a few remaining tz naive dates
 2013-06-18 09:09:24 -07:00
JonahStanley
650a2ba423 Added deletion tests 2013-06-18 11:20:23 -04:00
Peter Fogg
5cb456ba85 Fix merge conflict. 2013-06-17 16:49:22 -04:00
JonahStanley
15facf8fc0 Changed change_text to implement new type_in_codemirror function 2013-06-17 16:48:37 -04:00
Peter Fogg
56015e4b94 Update CHANGELOG.rst; move acceptance test methods into more appropriate files; docstring cleaning. 2013-06-17 16:47:15 -04:00
JonahStanley
46da897610 Merge branch 'master' into jonahstanley/add-courseteam-tests 
Conflicts:
	cms/envs/test.py
 2013-06-17 16:43:56 -04:00
Christina Roberts
080c5e4bc1 Merge pull request #186 from edx/christina/latex_and_click 
Bug fix for LaTeX source not saving
 2013-06-17 13:36:49 -07:00