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

3839 Commits

Author SHA1 Message Date
polesye
6c08708131 Merge pull request #1111 from edx/anton/video_subtitles 
Add Timed Transcripts Editor.
 2013-10-23 02:38:39 -07:00
Valera Rozuvan
ba5f337fdb Fix bug. Add validation to HTML5 sources field. 2013-10-23 11:52:22 +03:00
Christina Roberts
9936fc0a15 Merge pull request #1448 from edx/christina/checklists 
Change checklist URL.
 2013-10-22 12:49:54 -07:00
cahrens
2c07bf7124 checklist_index is an integer. 2013-10-22 15:26:19 -04:00
Anton Stupak
aecc20af6b Add Timed Transcripts Editor. 2013-10-22 21:45:03 +03:00
John Jarvis
c59ecc9068 Merge pull request #1433 from edx/jarv/static-root 
Jarv/static root
 2013-10-22 09:09:07 -07:00
John Jarvis
1ac732abb4 adding git.revision for cms 2013-10-22 12:08:48 -04:00
cahrens
ca5d0e8973 Do need context_course variable for segment io. 2013-10-22 11:34:15 -04:00
cahrens
a6faa163f3 Convert checklists to new URL scheme. 2013-10-22 11:34:05 -04:00
Don Mitchell
8902a89fbc Have urls.py fully parse locator url 2013-10-22 10:44:03 -04:00
Don Mitchell
1db76191ac Merge pull request #1434 from edx/dhm/bug_has_access 
Use known translation if exists to get groupname
 2013-10-22 07:18:32 -07:00
Don Mitchell
4f60a30afc Remove as_old_location methods 
They were incorrect if there were periods in the org or name.
 2013-10-21 17:17:20 -04:00
Jay Zoldak
ecea49ba2d Refactor wait_for methods in ui_helpers for acceptance tests. 2013-10-21 17:14:01 -04:00
Don Mitchell
7aae62230e Test that instructors can access courses 2013-10-21 17:06:00 -04:00
Don Mitchell
1561ca917f Use known translation if exists to get groupname 2013-10-21 15:50:18 -04:00
John Jarvis
8ca156bd00 adding STATIC_ROOT to cms 2013-10-21 14:41:00 -04:00
Don Mitchell
8dc9fa8861 Test providing a collection in doc_store_config to contentstore. 2013-10-21 12:15:51 -04:00
Carlos Andrés Rocha
0be9daf9d5 Merge pull request #1419 from rocha/fix-config-root-env 
Fix error when reading tokens on aws configuration
 2013-10-21 08:24:15 -07:00
e0d
a5715bf243 Merge pull request #1425 from edx/e0d/remove-default 
The default value was removed from common.
 2013-10-21 07:57:38 -07:00
polesye
fa23543682 Merge pull request #1418 from edx/anton/restore-cc-button-mouseover 
Added back on hover CC button functionality.
 2013-10-21 07:47:55 -07:00
e0d
e6955c641f The default value was removed from common. 2013-10-21 10:45:05 -04:00
David Baumgold
68f6aa8c98 Merge pull request #1404 from edx/db/requirejs-configure-mathjax 
Configure MathJax using require.js
 2013-10-21 07:33:08 -07:00
e0d
fb62f0c52a Merge pull request #1417 from edx/e0d/config-fix 
E0d/config fix
 2013-10-21 07:29:52 -07:00
e0d
5adf524ad6 removing redundant default. 2013-10-21 09:55:27 -04:00
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
Carlos Andrés Rocha
b764b9b4cf Fix error when reading tokens on aws configuration 
The error was caused by the CONFIG_ROOT environmental variable,
which was incorrectly assumed to be a path.py valid path.
 2013-10-21 03:19:22 -04:00
polesye
a1f8aca6c9 Restore functionality. 2013-10-19 09:32:36 +03: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
e0d
5995a76254 sanity restored. 2013-10-18 16:26:23 -04:00
e0d
a008cc6b74 path fix. 2013-10-18 16:12:51 -04:00
cahrens
a8ad56fa0e Remove pipeline config not needed with RequireJS. 
Was re-introduced in a bad merge.
 2013-10-18 15:57:50 -04:00
e0d
6700a3ec14 Fixes for the AWS environment config. 2013-10-18 15:56:15 -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
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