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

4005 Commits

Author SHA1 Message Date
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
brianhw
f831a0adcb Merge pull request #1406 from edx/post-release-2013-10-17-master 
Post release 2013 10 17 master
 2013-10-18 11:16:24 -07:00
David Baumgold
97941530e3 Configure MathJax using require.js 2013-10-18 13:31:51 -04: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
Brian Wilson
aa172272f3 Update master with hotfixes from release-2013-10-17. 2013-10-18 11:50:42 -04: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
Jay Zoldak
70cea99856 Merge pull request #1394 from edx/zoldak/fix-cms-problem-acceptance 
Add synchronization logic for waiting after adding components
 2013-10-18 05:36:48 -07:00
Will Daly
7aff8a7791 Merge pull request #1362 from edx/will/acceptance-test-logs 
Write Django logs to file during acceptance tests
 2013-10-18 05:07:53 -07:00
Gabe Mulley
d2b03e28fb add course_id to event context 2013-10-17 17:44:01 -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
frances botsford
9f5bd4e65b Merge pull request #1373 from edx/frances/fix/studio-grading-helptext 
Bug fix STUD-771: updated grading help text...
 2013-10-17 07:42:16 -07: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
David Baumgold
b0689a4ed5 Merge pull request #1375 from edx/db/requirejs-load-tender 
Fix up Tender load order
 2013-10-17 06:29:15 -07: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
dbfc38dfa9 Merge pull request #1370 from edx/zoldak/refactor-cms-acceptance-js 
refactor studio component creation in acceptance tests
 2013-10-16 14:47:29 -07:00
David Baumgold
76e6f8bc0d Fix up Tender load order 
So that tender_widget.js loads after we've defined window.Tender
 2013-10-16 17:25:58 -04:00
Jay Zoldak
33f6d3b819 Address code review comments 2013-10-16 17:08:32 -04:00
Adam Palay
1fc993ce18 add functionality to disable users 
add middleware to detect students with disabled accounts

add tests
 2013-10-16 16:57:11 -04:00
Don Mitchell
d45beaebfa Test the new RESTful course index and outline views. 2013-10-16 16:54:32 -04:00
Don Mitchell
095a4e3d93 Remove IDE-specific placeholder from before we had manage.pyUse manage.py instead (with cms --settings dev runserver --noreload --traceback 8001) 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
Frances Botsford
ff52afbd79 i18n the tip text on studio grading page, and adding a missing space on the 'New Assignment' button 2013-10-16 16:26:09 -04:00
Frances Botsford
f90e336b18 updated grading help text on weight of total grade to be more clear that it should be an integer without the percent sign 2013-10-16 15:52:05 -04:00
Will Daly
f2c417b638 Write Django logs to file during acceptance tests 2013-10-16 15:44:35 -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
David Baumgold
e363e5a72d Merge pull request #1337 from edx/db/fix-video-requirejs 
fix video module issue with require.js
 2013-10-16 09:40:48 -07:00
Christina Roberts
637b66197b Merge pull request #1331 from edx/christina/index 
Move index code into index.js.
 2013-10-16 07:24:30 -07:00
polesye
2e216a2c14 Clean up the code. 2013-10-16 15:45:04 +03:00
polesye
46abe397e2 Fix acceptance tests. 2013-10-16 15:44:59 +03:00
polesye
0bd706b6a1 Tidy up the code. 2013-10-16 15:44:55 +03:00
Valera Rozuvan
55fde6e5a7 Updated acceptance tests. 2013-10-16 15:44:30 +03:00
Valera Rozuvan
1f84053046 Updated acceptance tests. 2013-10-16 15:44:25 +03:00
Valera Rozuvan
e1e0cba033 Added acceptance tests. 2013-10-16 15:44:21 +03: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
David Baumgold
40e540284f wait to load video module until YT API is ready 2013-10-16 13:28:28 +03: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
Will Daly
52a475885c Merge pull request #1350 from edx/db/enable-tender 
re-enable tender
 2013-10-15 14:10:43 -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