Commit Graph

3927 Commits

Author SHA1 Message Date
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
Will Daly
54ea98d249 Merge pull request #1219 from edx/will/run-individual-tests
Allow rake test to run individual tests again
2013-10-04 07:27:30 -07:00
Jay Zoldak
cce3758363 Modify acceptance tests to account for the new text_customization capa field 2013-10-04 09:38:40 -04:00
Will Daly
b0878d3d43 Allow rake test to run individual tests again 2013-10-03 16:15:33 -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
Brian Talbot
39b578c066 Studio: adds JS/functionality dependent class to course updates <body> elem 2013-10-03 15:29:42 -04:00
Calen Pennington
230bf0c643 Switch get_html replacement out for using wrap_child 2013-10-03 14:28:19 -04:00
Brian Talbot
0dfe4a3243 Merge pull request #1214 from edx/talbs/fix-studio-bodyclasses
Studio: Fix - HTML <body> class regressions
2013-10-03 09:08:16 -07:00
Brian Talbot
38b04f2a9e Studio: adds in older styling dependent class to unit <body> elem 2013-10-03 11:53:10 -04:00
Brian Talbot
3bec8c66d2 Studio: adds JS/functionality dependent class to course updates <body> elem 2013-10-03 11:52:26 -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
Brian Talbot
9d87a03134 Merge pull request #1192 from edx/talbs/studio-viewnames
Studio: HTML body class and view-styling naming conventions
2013-10-02 13:17:43 -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
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