Peter Fogg
2d3cba06d2
Rework course overview drag and drop.
...
Failed drags bring the element back to where it started; elements are
locked to the y-axis, states are represented as CSS classes for
styling, elements can be dragged across section/subsection borders,
and dragging to the top/bottom of a section Just Works™.
Needs some styling love to give visual representation of where the
dragged element will drop, though.
TODO: It'd be good to have auto expand/collapse for subsections.
2013-10-07 17:17:46 -04:00
Will Daly
b749300d43
Use css_has_value() to fix failure in course-overview.feature
2013-10-07 16:08:39 -04:00
jkarni
31980150f0
Merge pull request #1043 from edx/jkarni/feature/import-feedback
...
Jkarni/feature/import feedback
2013-10-07 12:13:07 -07:00
Julian Arni
bb00924917
Use requirejs for import.js
...
And fixes for rebase-breakage.
2013-10-07 14:07:26 -04:00
Julian Arni
57b38969e5
Move import-related js to import.js
2013-10-07 09:57:20 -04:00
Julian Arni
7b3c4945cf
Review fixes
...
Studio: revises import help/status copy to better reflect/generalize what is done with imported content
Add test cases for import status
2013-10-07 09:55:46 -04:00
Julian Arni
45ce8d30d9
Use swanky error css for error messages
2013-10-07 09:52:59 -04:00
Julian Arni
a108827564
Route ajax request to appropriate view, and show feedback only then
...
Hook up view
Fix getStatus function
2013-10-07 09:51:19 -04:00
Julian Arni
c62691e9fc
Scaffolding for import progress reporting
2013-10-07 09:49:59 -04:00
Will Daly
3257a7baf2
Refactored navigation feature
...
Fixed grading tests
2013-10-07 09:41:18 -04:00
Julian Arni
f095f3c8c8
Merge branch 'release'
2013-10-04 17:34:49 -04:00
Nick Parlante
5d995ddb5c
Merge pull request #1228 from edx/nick/fix-customization-visibility
...
Bug fix - text_customization should not show in settings
2013-10-04 13:50:49 -07:00
Nick Parlante
ad7c3f932b
Bug fix - text_customization should not show in settings
...
Also change test to not expect text_customization
2013-10-04 12:55:28 -07:00
Julian Arni
dadc766fc0
Use wrapped tar extraction
...
Signed-off-by: Julian Arni <julian@edx.org >
2013-10-04 15:47:58 -04:00
David Baumgold
d97921e6e2
Convert Studio JS to use require.js
2013-10-04 13:43:50 -04:00
Jay Zoldak
cce3758363
Modify acceptance tests to account for the new text_customization capa field
2013-10-04 09:38:40 -04:00
Jay Zoldak
855d5d9e4a
Fix the matcher for the word 'test' in the upload file step of acceptance tests
2013-10-03 16:14:30 -04:00
Calen Pennington
230bf0c643
Switch get_html replacement out for using wrap_child
2013-10-03 14:28:19 -04:00
Jay Zoldak
db4dfd147e
Change css locator for Course Outline page in acceptance test
2013-10-03 11:17:36 -04:00
Will Daly
86c6dd6e23
Merge pull request #1199 from edx/will/latex-test-timeout
...
Increased timeout in LaTeX acceptance test.
2013-10-03 04:42:43 -07:00
Jay Zoldak
8ab2e3c351
Merge pull request #1179 from edx/zoldak/enable-component-acceptance-tests
...
Re-enable the component acceptance tests
2013-10-02 14:17:05 -07:00
polesye
9a4633be86
Fix matchers.
2013-10-02 22:41:14 +03:00
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
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
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
