Don Mitchell
8e7fc1537f
Test asset import/export roundtrip w/ lock setting.
2013-09-24 16:31:21 -04:00
Greg Price
7275f85232
Merge branch 'release'
2013-09-24 15:27:18 -04:00
jkarni
ad939b1e7c
Merge pull request #1090 from edx/jkarni/feature/middleware-locked-assets
...
Jkarni/feature/middleware locked assets
2013-09-24 12:25:05 -07: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
Christina Roberts
908371ea0b
Merge pull request #1113 from edx/christina/fix-asset-index
...
Put the non-Backboned assets JavaScript back into its own file.
2013-09-24 09:18:54 -07:00
cahrens
ab6af2b586
Put assets JavaScript code back in something that goes through pipelining.
2013-09-24 11:49:54 -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
cahrens
3f23b82a05
Back out USER_ID help text.
2013-09-24 10:20:58 -04:00
Don Mitchell
f8cd482621
Replace date lib w/ simpler tzAbbr
2013-09-23 16:56:30 -04:00
jkarni
97cd5a8555
Merge pull request #1013 from edx/jkarni/fix/import-warnings
...
Jkarni/fix/import warnings
2013-09-23 13:15:55 -07: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
Don Mitchell
e993a00d21
Test import-export-import assets
2013-09-23 14:34:36 -04:00
cahrens
9b076464f4
Moving unregistration of change listener into asset_index.html.
...
Fixes broken integration test on master.
2013-09-23 10:25:06 -04:00
Julian Arni
c196d1895a
i18n fix
2013-09-23 10:13:33 -04:00
Don Mitchell
464e0c77f4
Merge pull request #1045 from edx/assets/persist_lock
...
save lock state in contentstore
2013-09-20 10:51:31 -07:00
Nick Parlante
43c73b2df9
Merge pull request #1049 from edx/nick/html-help
...
Mention in studio UI that %%USER_ID%% works
2013-09-20 09:48:21 -07: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
d11c92d799
Set the URL on the collection instead of the model.
2013-09-20 10:44:55 -04:00
cahrens
9ceee3627f
Simplify how we determine if asset is already showing.
2013-09-20 10:44:54 -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
Nick Parlante
357156b58a
Mention in studio UI that %%USER_ID%% works
2013-09-19 14:28:10 -07:00
Jay Zoldak
da538b8770
Merge pull request #1044 from edx/zoldak/acceptance-grid
...
Add ability to run against generic selenium grid
2013-09-18 12:07:21 -07: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
Brian Talbot
8815962356
Studio: Converts all class-based Sass archetype-focused @extends to use Sass placeholder syntax
2013-09-18 14:14:11 -04: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
Jay Zoldak
4c411e2121
Add ability to run against generic selenium grid
2013-09-18 13:49:34 -04: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
Julian Arni
4fdf7a4849
Prompt before leaving page
2013-09-17 15:55:30 -04:00
cahrens
e65e9b53a3
Minor cleanup.
2013-09-17 14:40:15 -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
Julian Arni
0f81bdcefd
Properly handle error responses
2013-09-17 09:46:10 -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
Julian Arni
cdf0eef5ca
Consider redirect code as succcesful
2013-09-16 15:06:51 -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
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
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
Sarina Canelake
484bc91ab3
Don't assign variable to .update() call
2013-09-12 16:03:22 -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
