Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

1757 Commits

Author SHA1 Message Date
John Jarvis
a517dc2085 Revert "Merge pull request #1240 from edx/dhm/config_separation" 
This reverts commit ec01253e30, reversing
changes made to ae8c9710e5.
 2013-10-10 13:14:08 -04:00
cahrens
8c080b6fb6 Acceptance test for fixing rounding error on weight. 2013-10-10 12:02:21 -04:00
Christina Roberts
94ed3c6abb Merge pull request #1275 from edx/christina/delete-static-tabs 
Delete unused static-pages.html.
 2013-10-10 08:28:24 -07:00
Don Mitchell
ec01253e30 Merge pull request #1240 from edx/dhm/config_separation 
Segregate the mongo db config from the modulestore config
 2013-10-09 13:24:30 -07:00
cahrens
70cb24a37f Delete unused static-pages.html. 2013-10-09 15:06:58 -04:00
Will Daly
34c081d34b Add retry logic if element not found 2013-10-09 09:14:50 -04:00
Will Daly
95b284f80f Wait between clicks for new component 2013-10-08 22:46:10 -04:00
Calen Pennington
658810a94f Use xblock render shortcuts 2013-10-08 15:58:23 -04:00
Calen Pennington
6b474724ac Make XModuleDescriptor and XModule act as a single class 
By transparently proxying between the XModuleDescriptor and the XModule,
and between their runtimes, we can make them act as a single class, so
that we can swap in an actual XBlock instead.
 2013-10-08 15:29:17 -04:00
Don Mitchell
44d0494d33 Segregate the mongo db config from the modulestore config 
as a first step to separating db connection from modeling
and to support location mapper and contentstore using same db config as modulestore
 2013-10-08 15:01:48 -04:00
Will Daly
774dd03668 Disable another video caption test 2013-10-08 14:07:35 -04:00
Will Daly
7eb4522b32 Disabled video caption acceptance tests 2013-10-08 13:28:45 -04:00
Ned Batchelder
a03a11e0e7 Merge pull request #1253 from edx/ned/use-assertisinstance 
Use assertIsInstance where we can
 2013-10-08 07:47:21 -07:00
Will Daly
560dac6ac5 Merge pull request #1242 from edx/will/disable-broken-tests 
Disable non-deterministic test to get stability on master
 2013-10-08 07:43:35 -07:00
Will Daly
c3bd7d3db8 Merge pull request #1243 from edx/will/fix-course-image-test 
Use wait_for to allow course image time to update
 2013-10-08 07:40:07 -07:00
Valera Rozuvan
e3c0bb839b Merge pull request #1183 from edx/valera/add_option_transcripts_remove_onhover 
Valera/add option transcripts remove onhover
 2013-10-08 07:37:02 -07:00
Christina Roberts
c5733015fd Merge pull request #611 from edx/peter-fogg/draggabilly 
Rework drag/drop on overview and subsection pages.
 2013-10-08 07:14:34 -07:00
polesye
20c2b3dc71 Clean up the code. 2013-10-08 12:00:08 +03:00
polesye
a667349d85 Fix acceptance tests. 2013-10-08 12:00:08 +03:00
polesye
f57d5a61d3 Tidy up the code. 2013-10-08 12:00:08 +03:00
Valera Rozuvan
968215dd9f Updated acceptance tests. 2013-10-08 12:00:07 +03:00
Valera Rozuvan
b7e82ed15e Updated acceptance tests. 2013-10-08 12:00:07 +03:00
Valera Rozuvan
de1381dbfc Added acceptance tests. 2013-10-08 12:00:07 +03:00
Ned Batchelder
9103fa393c Use assertIsInstance. 2013-10-07 18:17:40 -04:00
Will Daly
9a6f976d69 Disable non-deterministic video caption test to get stability on master 2013-10-07 17:57:51 -04:00
Will Daly
b7856d96bf Use wait_for to allow course image time to update 2013-10-07 17:44:16 -04:00
cahrens
61cfb91218 Cleanup to drag and drop implementation. 
Also includes RequireJS changes.

Fixes bugs:
STUD-755, STUD-152, STUD-700, STUD-699
 2013-10-07 17:18:40 -04:00
Peter Fogg
cbd066da04 Address PR comments. 
Remove unused variables; some changes to match existing BDD spec for
drag/drop (expand-on-hover timeout and dropping with mouse outside of
element); bugfix for section expand; some code cleanup; update and
re-enable acceptance test.
 2013-10-07 17:17:46 -04:00
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