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

1647 Commits

Author SHA1 Message Date
Christina Roberts
475cf07700 Merge pull request #1393 from edx/christina/checklists-restful 
Include tail from header tag in course update.
 2013-10-21 06:28:36 -07:00
Calen Pennington
12cc4a19c0 Merge pull request #1224 from cpennington/lms-xblock-js-execution 
Add an XBlock javascript runtime, and use it to run XModules
 2013-10-21 05:53:36 -07:00
Calen Pennington
ce6fbae693 Add an XBlock javascript runtime, and use it to run XModules 
[LMS-57]
 2013-10-18 16:31:32 -04:00
Will Daly
2109fdb33f Disable test seen to fail in master 2013-10-18 15:45:49 -04:00
polesye
70e5e80e31 Merge pull request #1339 from edx/anton/fix-video-js-unit-tests 
Fix broken tests for video player
 2013-10-18 11:45:43 -07:00
polesye
eaf5eb2945 Enable acceptance test. 2013-10-18 19:58:18 +03:00
Will Daly
9f1c5dd1ce Merge pull request #1400 from edx/will/fix-grading-test 
Added explicit wait to avoid reading default grading value
 2013-10-18 09:15:00 -07:00
polesye
322b17ee0b Uncomment acceptance tests. 2013-10-18 18:44:48 +03:00
polesye
e95ee9948b Add acceptance test instead of broken js unit test. 2013-10-18 18:44:48 +03:00
Will Daly
14b5f42c7c Added explicit wait to avoid reading default grading value 2013-10-18 09:54:49 -04:00
Don Mitchell
8fe99a6be2 Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation"" 
This reverts commit a517dc2085.
 2013-10-18 09:22:30 -04:00
cahrens
0c5b511c57 Include tail from header tag in course update. 
Fixes bug STUD-590.
 2013-10-17 17:14:11 -04:00
Jay Zoldak
5d84cd0627 Add synchronization logic for waiting after adding components in acceptance tests 2013-10-17 16:48:40 -04:00
Don Mitchell
fe438bec27 Ensure contentstore has no assets before generating test set 2013-10-17 11:08:25 -04:00
Don Mitchell
978c19dd2c Merge pull request #1325 from edx/dhm/paginate_assets 
Add asset pagination
 2013-10-17 07:16:09 -07:00
Don Mitchell
ee2a3750ac Test leaving /start out of url. 2013-10-17 09:51:56 -04:00
Don Mitchell
a6ad531d50 Merge pull request #1287 from edx/dhm/restful_crud 
Restful api prototype
 2013-10-17 05:50:05 -07:00
Jay Zoldak
33f6d3b819 Address code review comments 2013-10-16 17:08:32 -04:00
Don Mitchell
d45beaebfa Test the new RESTful course index and outline views. 2013-10-16 16:54:32 -04:00
Don Mitchell
fbc68df88b Ensure bootstrapping tests start w/ clean slate. 2013-10-16 16:54:31 -04:00
Don Mitchell
010905eb99 RESTful api for getting course listing and opening course in studio. 
Pattern for how to do refactoring from locations to locators and from
old style urls to restful ones.
 2013-10-16 16:54:31 -04:00
Jay Zoldak
751994b9aa pep8 and pylint fixes 2013-10-16 15:03:14 -04:00
Jay Zoldak
37933cb5f9 refactor studio component creation in acceptance tests 2013-10-16 15:02:49 -04:00
Will Daly
fd49f09284 Merge pull request #1358 from edx/will/fix-course-overview 
Wait for non-blank link in course-overview test
 2013-10-16 05:24:28 -07:00
Valera Rozuvan
a7f3bb2b00 Added back on hover CC button functionality. 
Fixing falling test. Added fix for RequireJS & XModule loader video race condition.
Removed unnecessary comments from SCSS and JS files.
Added entry to Change Log.
 2013-10-16 12:02:19 +03:00
Will Daly
adc46716b6 Wait for non-blank link in course-overview test 2013-10-15 21:21:09 -04:00
Christina Roberts
ccd692dd86 Merge pull request #1133 from edx/jkarni/fix/customtag-error 
Jkarni/fix/customtag error
 2013-10-15 14:23:45 -07:00
Julian Arni
d9ba410388 Review fixes 2013-10-15 16:52:35 -04:00
Julian Arni
9798da413d Review fixes 2013-10-15 16:16:10 -04:00
Julian Arni
b7485fd812 Review fixes 2013-10-15 16:16:09 -04:00
Frances Botsford
9f188ed20c additional copy and styling for component syntax error in studio 2013-10-15 16:16:09 -04:00
Julian Arni
2721966d76 Added acceptance tests for get_html exception handling 
Make tests conform to new import UI
 2013-10-15 16:16:09 -04:00
Julian Arni
62a8c420ed Check for exceptions when rendering studio and students views. 
Otherwise it's possible to reach stuck states.
 2013-10-15 16:16:09 -04:00
Ned Batchelder
25a027475d Rename contentstore/views/requests to helpers 
This has caused confusion, since this file gets imported when trying to
import the requests library.  And besides, how was this file about
requests in the first place?  Helpers is a much better name.
 2013-10-15 15:53:48 -04:00
Carlos Andrés Rocha
f7ff8f8b6a Delete dump_course_structure django command on cms 
Replaced by dump_course_structure on lms
 2013-10-15 10:48:59 -04:00
Carlos Andrés Rocha
15852cd816 Modify export_to_xml to take an optional contentstore and work with xml courses 2013-10-15 10:48:59 -04:00
David Baumgold
fb01d8fa81 Fixes to avoid CSRF error in acceptance tests 2013-10-11 17:11:59 -04:00
Don Mitchell
8cf4f80d50 Test 100 assets w/ pagination 2013-10-11 12:58:10 -04:00
Christina Roberts
11142c7cbb Merge pull request #1300 from edx/christina/fix-rounding-error 
Grading rounding error.
 2013-10-11 07:33:26 -07:00
Don Mitchell
70f77ce4bf Add pagination to asset retrieval 
and push sorting down to the query
 2013-10-10 17:26:23 -04:00
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