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

1549 Commits

Author SHA1 Message Date
Will Daly
3c88ccb4ff Use comments to skip tests instead of a tag 2013-09-26 16:37:25 -04:00
Don Mitchell
2379e7c3fc Merge pull request #1029 from edx/dhm/migrate_mongo 
Migrate courses from old mongo to split
 2013-09-26 10:35:52 -07:00
Don Mitchell
59b31474ca Separate db config from modulestore config parms 
use to instantiate loc_mapper
test loc_mapper injection into split modulestore
 2013-09-26 12:57:40 -04:00
cahrens
2cbdaaee7d Updates based on switching to checkbox for locking. 2013-09-25 17:29:47 -04:00
cahrens
1d7f891145 Delete asset from cache. 2013-09-25 17:29:47 -04:00
cahrens
5e475c8732 Code review feedback. 2013-09-25 17:29:47 -04:00
cahrens
6dce7f299f Asset locking feature. 2013-09-25 17:29:46 -04:00
cahrens
f10cf29425 Update upload test for what actually works now. 2013-09-25 17:29:27 -04:00
cahrens
c64e04d8c2 Add the ability to lock assets. 2013-09-25 17:29:27 -04:00
Don Mitchell
f932881424 Test importing exported course over a new course 2013-09-25 14:41:42 -04:00
Will Daly
47621b56ff Merge pull request #1112 from edx/will/shard-acceptance-tests 
Added tags to acceptance tests to define multiple shards.
 2013-09-25 11:36:18 -07:00
Jay Zoldak
cae6e82bf7 Knock 10 more seconds off the acceptance tests. 2013-09-25 09:46:18 -04:00
Don Mitchell
8e7fc1537f Test asset import/export roundtrip w/ lock setting. 2013-09-24 16:31:21 -04:00
Jay Zoldak
7669b4d777 Namespace the acceptance tests so they show up nicely in jenkins 
Conflicts:
	cms/djangoapps/contentstore/features/advanced-settings.feature
	cms/djangoapps/contentstore/features/checklists.feature
	cms/djangoapps/contentstore/features/component.feature
	cms/djangoapps/contentstore/features/course-overview.feature
	cms/djangoapps/contentstore/features/course-settings.feature
	cms/djangoapps/contentstore/features/course-team.feature
	cms/djangoapps/contentstore/features/course-updates.feature
	cms/djangoapps/contentstore/features/courses.feature
	cms/djangoapps/contentstore/features/discussion-editor.feature
	cms/djangoapps/contentstore/features/grading.feature
	cms/djangoapps/contentstore/features/html-editor.feature
	cms/djangoapps/contentstore/features/problem-editor.feature
	cms/djangoapps/contentstore/features/section.feature
	cms/djangoapps/contentstore/features/signup.feature
	cms/djangoapps/contentstore/features/static-pages.feature
	cms/djangoapps/contentstore/features/subsection.feature
	cms/djangoapps/contentstore/features/textbooks.feature
	cms/djangoapps/contentstore/features/upload.feature
	cms/djangoapps/contentstore/features/video-editor.feature
	cms/djangoapps/contentstore/features/video.feature
	lms/djangoapps/courseware/features/certificates.feature
	lms/djangoapps/courseware/features/help.feature
	lms/djangoapps/courseware/features/high-level-tabs.feature
	lms/djangoapps/courseware/features/homepage.feature
	lms/djangoapps/courseware/features/login.feature
	lms/djangoapps/courseware/features/lti.feature
	lms/djangoapps/courseware/features/navigation.feature
	lms/djangoapps/courseware/features/problems.feature
	lms/djangoapps/courseware/features/registration.feature
	lms/djangoapps/courseware/features/signup.feature
	lms/djangoapps/courseware/features/video.feature
	lms/djangoapps/courseware/features/word_cloud.feature
 2013-09-24 14:35:12 -04:00
Will Daly
f898f72920 Added tags to acceptance tests to define multiple shards. 2013-09-24 11:47:53 -04:00
Jay Zoldak
002f3ef9e2 Speed up waiting for elements not present on remote webdriver sessions. 2013-09-24 11:27:42 -04:00
Don Mitchell
e993a00d21 Test import-export-import assets 2013-09-23 14:34:36 -04:00
Don Mitchell
e69955b437 Pylint/pep8 fixes 2013-09-20 11:28:00 -04:00
cahrens
948615d66f Log warning if thumbnail cannot be deleted. 2013-09-20 10:44:55 -04:00
cahrens
fe6ed08518 Code review feedback. 2013-09-20 10:44:55 -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
Calen Pennington
1d2e0b6615 Merge pull request #930 from cpennington/rename-xblock-field-data 
Rename xblock_field_data to xmodule_field_data
 2013-09-18 11:33:25 -07:00
Jay Zoldak
35abac4770 Merge pull request #1036 from edx/zoldak/refactor-static-page-tests 
Simplify static page acceptance tests
 2013-09-18 11:14:01 -07:00
Calen Pennington
9643fd463f Rename xblock_field_data to xmodule_field_data 2013-09-18 10:49:41 -04:00
jkarni
0e2d833a2e Merge pull request #830 from edx/jkarni/fix/unicode-import 
Fix import errors with unicode filenames
 2013-09-18 07:23:43 -07:00
Jay Zoldak
2a0e2fd39d Simplify static page acceptance tests 2013-09-18 10:00:56 -04:00
Calen Pennington
d35a03a0d6 Merge pull request #908 from cpennington/reference-runtime 
Replace references to .system
 2013-09-18 05:43:20 -07: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
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
Diana Huang
47ce9082e4 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/courseware/tests/modulestore_config.py
 2013-09-13 17:15:44 -04:00
Calen Pennington
3f8a2f03ee Use a setter to make editing location possible 2013-09-13 15:05:17 -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
Chris Dodge
955e54c2e6 refactor some code out of the django-admin entry point into a help function in CMS. Update tests to use new method 2013-09-13 09:07:01 -04:00
Chris Dodge
2ac6d78a90 update comment 2013-09-12 16:01:51 -04:00
Chris Dodge
bf67c83340 update comment and verify seeding was done 2013-09-12 15:58:56 -04:00
Julian Arni
1813b22ab0 Fix import errors with unicode filenames 2013-09-12 15:47:59 -04:00
Chris Dodge
615341fb65 add one more test to verify that deleting one courses forum permissions does not accidentially delete another course's forum seeding 2013-09-12 15:03:00 -04:00
cahrens
2c9fc59d79 Unused import. 2013-09-12 14:30:00 -04:00
cahrens
ce4fb08bdf Style cleanup. 2013-09-12 14:30:00 -04:00
cahrens
95ad1826d4 Hide show_timezone from Advanced Settings and migrate courses with show_timezone=False to using due_date_display_format. 2013-09-12 14:30:00 -04: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
Christina Roberts
784115ac79 Merge pull request #901 from edx/christina/dont_import_checklists 
Do not store expanded action URLs.
 2013-09-12 07:54:25 -07:00
Julian Arni
ca2049abd3 Fixes extra 'file' that was leftover locally after import 2013-09-12 10:29:41 -04:00
cahrens
ea26b19d0b pylint/pep8 cleanup. 2013-09-12 09:47:30 -04:00
cahrens
1184a97b0b Do not store expanded action URLs. 
They are not portable. STUD-681.

Minor updates.
 2013-09-12 09:47:30 -04:00
Calen Pennington
58a5cdd81f Replace references to .system 2013-09-12 09:29:17 -04:00
cahrens
ff2d952d39 Change course id limit to 65. 
STUD-726
 2013-09-11 16:15:16 -04:00
jkarni
df72f02898 Merge pull request #931 from edx/jkarni/fix/itemsavelogging 
Add logging to save item
 2013-09-11 09:33:19 -07:00