Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
39,994 Commits 1 Branch 0 Tags
322ac8a468c2d861643efb139db57408872679e7
Commit Graph

14320 Commits

Author SHA1 Message Date
Sarina Canelake
85f5708d6b Merge pull request #8388 from edx/sarina/allow-preview-of-launched-langs 
Allow released languages to be previewed under dark lang
 2015-06-09 15:04:46 -04:00
Christine Lytwynec
65b4e33629 Merge pull request #8422 from edx/clytwynec/rebalance_bokchoy_shards 
Clytwynec/rebalance bokchoy shards
 2015-06-09 12:45:16 -04:00
Syed Hassan Raza
ecc3473d36 transcript name param url 2015-06-09 20:04:16 +05:00
David Baumgold
a7c710a0de Moved Creative Commons CSS into Sass 
Also reconfigured paver to compile Sass into CSS directories
 2015-06-09 10:55:20 -04:00
Christine Lytwynec
570c524b0e move lms edx notes tests to shard_4 2015-06-09 10:13:31 -04:00
Christine Lytwynec
73ce054c54 Merge pull request #8415 from edx/clytwynec/re-enable_acid_block_tests 
unskip acid xblock tests
 2015-06-09 09:31:34 -04:00
Awais Qureshi
ab46de59c2 Merge pull request #8407 from edx/awais786/ECOM-1644-course-access-roles 
ECOM-1644 Implementing course-access roles.
 2015-06-09 18:23:03 +05:00
Awais Jibran
fee8f6db64 Merge pull request #8037 from edx/aj/tnl2167-pause-vide-event-not-emitting-at-video-end 
pause_video event does not emit when a video ends
 2015-06-09 16:18:51 +05:00
Awais
956e41348e ECOM-1644 Implementing course-access roles. 2015-06-09 15:29:19 +05:00
Peter Fogg
8ffe7c65e6 Merge pull request #8397 from edx/peter-fogg/category-subnavigation 
TNL-1891 Browse Teams: Category Subnavigation
 2015-06-08 16:32:41 -04:00
Chris
a5204310b1 Merge pull request #8267 from edx/clrux/UX-2078-error-heading-reduction 
Reducing size of error message heading
 2015-06-08 16:12:57 -04:00
Diana Huang
cddd387beb Merge pull request #8367 from edx/diana/merge-course-view-and-tab 
Refactor and merge CourseViewType and CourseTab.
 2015-06-08 16:08:27 -04:00
Christine Lytwynec
659c72a03e move bok choy studio split tests to shard_2 2015-06-08 15:53:34 -04:00
Christine Lytwynec
e31a78cbb7 move bok choy video license tests to shard_2 2015-06-08 15:51:13 -04:00
Christine Lytwynec
2005734e1c move bok choy discussion tests to shard_2 2015-06-08 15:45:46 -04:00
Diana Huang
7461a2fd37 Refactor and merge CourseViewType and CourseTab. 
TNL-2321
 2015-06-08 15:18:39 -04:00
Peter Fogg
17d3906c86 TNL-1891 Browse Teams: Category Subnavigation 
Introduces a tabbed view component which displays its subviews and
handles Backbone navigation between each tab. This is used to implement
the "My Teams" and "Browse" areas of the Teams tab. Right now the
content of both tabs is stubbed out with a placeholder view which should
be replaced by TNL-1893 and TNL-1892.
 2015-06-08 15:05:11 -04:00
Chris Rodriguez
4fd1ebce1c Fixing test to match CSS 2015-06-08 14:55:56 -04:00
Jim Abramson
a7ebe17dfb Merge pull request #8414 from edx/jsa/fix-deactivate-enrollment 
Jsa/fix deactivate enrollment
 2015-06-08 13:09:54 -04:00
Adam
d0f7a08cc4 Merge pull request #8408 from edx/release 
Release
 2015-06-08 11:00:20 -05:00
Christine Lytwynec
7e19142b01 unskip acid xblock tests 2015-06-08 11:57:18 -04:00
Sarina Canelake
c9796b83a9 Merge pull request #8403 from edx/sarina/remove-redefine-django14-cors 
Use Django 1.4 @ensure_csrf_cookie method PLAT-664
 2015-06-08 11:44:25 -04:00
jsa
445d0dabb6 Correct deactivation logic in enrollment api and test. 
XCOM-396
 2015-06-08 11:06:52 -04:00
Marko Jevtic
9e30bdb2c7 (SOL-835) Addressing flakiness of the reindex acceptance test 2015-06-08 14:27:11 +02:00
Ben Patterson
f37fdaf47d Merge pull request #8386 from edx/benp/lint-fix-test_import_export 
Follow imports order guidelines.
 2015-06-07 17:13:16 -04:00
Ben Patterson
dc4b4f9022 Merge pull request #8404 from edx/benp/skip-settings-test-jun2015 
Skip test that has become too flaky. SOL-449.
 2015-06-07 13:32:04 -04:00
Ben Patterson
d3f7bdc1e8 Skip test that has become too flaky. SOL-449. 2015-06-07 10:43:53 -04:00
Matt Drayer
3e52b8fad1 mattdrayer/SOL-947: Refactor Web/HTML certificate URL patterns 2015-06-06 23:15:17 -04:00
Sarina Canelake
780ec6ee2c Allow released languages to be previewed under dark lang 2015-06-06 09:49:06 -04:00
Sarina Canelake
e53b9c83d9 Use Django 1.4 @ensure_csrf_cookie method PLAT-664 2015-06-06 08:48:36 -04:00
Waheed Ahmed
f9fe00ff6c Fixed youtube video was not loading even youtube is available. 
TNL-2361
 2015-06-05 22:42:26 +05:00
Nimisha Asthagiri
65bcc50e9b Merge pull request #8240 from edx/mobile/render_xblock 
MA-722 Render xBlock API
 2015-06-05 12:13:05 -04:00
Nimisha Asthagiri
d240785b17 MA-722 Render xBlock API Support 2015-06-05 11:18:48 -04:00
Ben Patterson
b7f8bd3c80 Follow imports order guidelines. 
https://github.com/edx/edx-platform/wiki/Python-Guidelines#imports-order

Follow-up to #8368
 2015-06-05 09:43:49 -04:00
Ben Patterson
8d1651cc19 Merge pull request #8381 from edx/benp/flaky-milestones-jun2015 
Flag test as flaky. SOL-449
 2015-06-05 09:16:42 -04:00
Ben Patterson
03c0159029 Merge pull request #8368 from edx/benp/flag-flaky-import-export 
Flag test as flaky.
 2015-06-05 09:15:46 -04:00
Ben Patterson
4e39799f49 Flag test as flaky. SOL-449 2015-06-04 20:16:26 -04:00
Ben Patterson
8e37e68c3f Flag test as flaky. TNL-2386 2015-06-04 19:20:31 -04:00
Tim Krones
f711a32e3d TNL-1652: Allow instructors to obtain CSV file listing students who may 
enroll in a course but have not signed up yet.
 2015-06-04 20:50:04 +02:00
Jim Abramson
373d948c8b Merge pull request #8356 from edx/jsa/xcom-388 
Add tests for enrollment deactivation under various modes.
 2015-06-04 10:48:12 -04:00
David Baumgold
32749a661a Merge pull request #8351 from edx/learners-dont-need-to-be-lean 
Learners don't need to be lean
 2015-06-04 10:43:27 -04:00
Calen Pennington
7c0709ce5b Merge pull request #8322 from cpennington/document-read-metrics 
Add metrics around all split-mongo database operations measuring coun…
 2015-06-04 10:08:10 -04:00
David Baumgold
37064cf191 Learners don't need to be lean 2015-06-04 09:42:27 -04:00
jsa
445a0c938b Add tests for enrollment deactivation under various modes. 
A bug with the creation of inactive honor enrollment modes was caught and fixed along the way.

XCOM-388
 2015-06-04 09:40:54 -04:00
Colin-Fredericks
cc2d4cad01 DOC-2044 Fixing factor-of-ten error 2015-06-04 07:14:28 -04:00
Calen Pennington
94185e9c6f Add metrics around all split-mongo database operations measuring count, duration, and approximate size 
[PLAT-645]
 2015-06-04 07:12:45 -04:00
Peter Fogg
63c3af737c Add student bio max_length to migrations. 2015-06-03 17:07:02 -04:00
Ben McMorran
f01b2f4311 Merge pull request #8243 from edx/benmcmorran/team-api-a 
TNL-1897: Implement Course Team API, Part A
 2015-06-03 14:59:36 -04:00
Ben McMorran
9d336c33eb TNL-1897 Implement Course Team API 2015-06-03 18:04:17 +00:00
Shrhawk
ef500514c1 Merge pull request #7970 from edx/shr/bug/TNL-2038-Remove-table-of-contents-transcript-languages 
Remove "table of contents" from transcript upload languages
 2015-06-03 22:39:39 +05:00