Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,783 Commits 1 Branch 0 Tags
5faaca0d017c458191131ffd138ec4fa342523fe
Commit Graph

11224 Commits

Author SHA1 Message Date
Will Daly
5198257cbe Merge pull request #8461 from edx/will/verify-student-cleanup 
Remove unused code left over from ECOM-188.
 2015-06-10 14:44:51 -04:00
Matt Drayer
4dd55609ab Merge pull request #8430 from edx/asadiqbal08/SOL-971 
SOL-971
 2015-06-10 14:21:42 -04:00
Will Daly
69306da49a Remove unused code left over from ECOM-188. 2015-06-10 13:08:23 -04:00
Awais
d5ca25e197 ECOM-1644 minor message updation. 2015-06-10 22:08:23 +05:00
Ben Patterson
2e9759ee43 Merge pull request #8451 from edx/benp/cohort-search-flakiness-jun2015 
Fix for flaky behavior in cohort search tests. TNL-2362
 2015-06-10 11:46:08 -04:00
Ben Patterson
35aed4bf87 Fix for flaky behavior in cohort search tests. TNL-2362 2015-06-10 11:44:56 -04:00
asadiqbal
302d7a0152 SOL-971 
Allow microsites to override content

more test checks

Fix pylint error (duplicate import)

SOL-971 Changes
 2015-06-10 19:26:30 +05:00
Awais Qureshi
16bbdc7fca Merge pull request #8329 from edx/awais786/ECOM-1494-remove-midcourse-models 
ECOM-1494 removing models.
 2015-06-10 18:24:39 +05:00
Tyler Nickerson
767ccbd1e7 Merge pull request #8235 from edx/nickersoft-include-expired 
Added optional GET parameter to the enrollment API that includes expired course modes
 2015-06-10 09:01:04 -04:00
Awais
ed02d9cc5c ECOM-1494 removing models only. 2015-06-10 11:19:51 +05:00
Nickersoft
8c1d3ae412 Added includes_expired parameter to enrollment API 
- Adding ?include_expired=1 to course detail requests will now include expired course verifications
 2015-06-09 17:12:30 -04:00
David Baumgold
77facf13ba Merge pull request #8419 from edx/sass-output-to-css-dir 
Compile Sass to CSS dirs, move Creative Commons CSS into Sass
 2015-06-09 17:00:15 -04:00
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
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
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
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
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