polesye
298e0a9b16
Add $.
2013-10-02 21:50:51 +03:00
polesye
2a2c9d1989
Fix regexp.
2013-10-02 21:45:38 +03:00
polesye
960c2ec472
Fix acceptance tests.
2013-10-02 20:23:42 +03:00
Will Daly
f1d4e49168
Increased timeout in LaTeX acceptance test.
2013-10-02 08:22:57 -04:00
Jay Zoldak
6e3ece92e3
Refactor upload acceptance tests and add locked asset tests for registered user
2013-10-02 08:12:58 -04:00
Nick Parlante
67722f1a81
Merge pull request #1147 from edx/nick/tab-edit
...
Create management command to edit course's tabs
2013-10-01 14:31:40 -07:00
Brian Talbot
c2507ddc21
Studio: revises class naming conventions applied to the <body> element and used for view specific styling
2013-10-01 16:53:41 -04:00
Nick Parlante
0ed1ee917e
Create edit_course_tabs management command
...
Just works on the tabs list in mongo, nothing
deeper than that.
Added implementation functions in tabs.py,
providing a first step for some future
GUI editor.
2013-10-01 10:49:51 -07:00
Jay Zoldak
50dc93dcbf
Re-enable the component acceptance tests
2013-10-01 11:59:19 -04:00
Calen Pennington
67ccf1e3bb
Move nose/django arguments for tests out of rake so that raw manage.py works when running tests
2013-09-27 15:41:58 -04:00
Calen Pennington
d77491e46a
Pull XModule attributes out into a mixin that can be applied to xblocks
2013-09-27 13:11:05 -04:00
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
Christina Roberts
42f286b325
Merge pull request #1069 from edx/christina/lock-assets
...
Add asset locking to the Studio asset page.
2013-09-26 07:54:29 -07:00
Don Mitchell
190b418387
Merge pull request #1121 from edx/dhm/timezone_display
...
Replace date lib w/ simpler tzAbbr
2013-09-26 07:43:22 -07:00
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
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
