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

3588 Commits

Author SHA1 Message Date
cahrens
2cbdaaee7d Updates based on switching to checkbox for locking. 2013-09-25 17:29:47 -04:00
Frances Botsford
79c2cdc7ba switching studio assets lock to use checkbox instead of link 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
Frances Botsford
7700ec68bb addressing PR sass/html comments on studio assets 2013-09-25 17:29:27 -04:00
cahrens
f10cf29425 Update upload test for what actually works now. 2013-09-25 17:29:27 -04:00
Frances Botsford
370872f274 ui changes from design team feedback on studio assets page 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
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
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