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

37418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris
ff242a3eac Merge pull request #12694 from edx/clrux/ac-454-repeat 
AC-454 visual indicator in video menus + safe transcripts
 2016-06-14 08:46:47 -04:00
Chris Rodriguez
55d84d34b8 AC-454 adding visual clarify for selected menu options 2016-06-14 07:53:15 -04:00
Ehtesham Kafeel
f4e6cbba9e Merge pull request #12710 from edx/ekafeel/clean-karma-log 
Make karma logs cleaner
 2016-06-14 14:10:55 +05:00
Awais Qureshi
a361d44bfd Merge pull request #12666 from edx/awais786/ECOM-4217-certs-invalidate-by-instructor 
Adding logic to check if cert is invalidate then user cannot see the …
 2016-06-14 13:50:17 +05:00
Ehtesham
f83efed9f6 making karma logs cleaner by limiting stack trace and browser log 2016-06-14 11:59:30 +05:00
Ben Patterson
6bc0fa2bd3 Merge pull request #12737 from edx/benp/disabled-parallel 
Disable parallelization for lms unit tests.
 2016-06-13 16:25:46 -04:00
Simon Chen
8d672bc832 ECOM-3206 allow run selection and enrollment (#12685) 2016-06-13 15:08:00 -04:00
Ben Patterson
6ccf7cf6fb Disable parallelization for lms unit tests. 2016-06-13 15:05:51 -04:00
Brian Jacobel
781a20497b Merge pull request #12735 from edx/bjacobel/dsc-image-overflow 
Fix overflowing images in forum posts/responses
 2016-06-13 14:25:42 -04:00
Cliff Dyer
2337b80af5 Merge pull request #12722 from edx/tnl/splittest-zerogroup-test 
modified tests to directly address split test group 0 issues.
 2016-06-13 13:26:29 -04:00
Brian Jacobel
5e0e337654 Fix overflowing images in forum posts/responses 2016-06-13 12:30:13 -04:00
Robert Raposa
9eaa1acdea Merge pull request #12730 from edx/robrap/linter-thresholds 
Reduce linter thresholds.
 2016-06-13 12:24:24 -04:00
Awais Jibran
1e67ec66cd Merge pull request #12702 from edx/aj/PLAT-1032-fix-export 
Fix course export on edge
 2016-06-13 18:46:56 +05:00
Awais Jibran
fc885cbcea Merge pull request #12662 from edx/aj/fix-email-opt-in-list 
Fix email opt in list managemnet command
 2016-06-13 18:46:06 +05:00
Robert Raposa
f7042d748d Reduce linter thresholds. 2016-06-13 09:42:00 -04:00
Sofiya Semenova
0431bacbe1 Merge pull request #12656 from edx/ssemenova/tabindex 
Removing instances of positive integer tab index values
 2016-06-13 09:23:48 -04:00
Asad Iqbal
d52851066a Merge pull request #12690 from edx/asadiqbal08/update-recommender-xblock-version 
WL-507: Update the version of Recommender XBlock
 2016-06-13 17:36:35 +05:00
asadiqbal
d932e09c22 updated the version of recommeder xblock 2016-06-13 16:51:44 +05:00
Asad Iqbal
03a610db4d Merge pull request #12715 from edx/asadiqbal08/update_drag_and_drop_version 
updated the version from 2.0.6 to 2.0.7
 2016-06-13 09:46:25 +05:00
Awais
112aa71fe0 Adding logic to check if cert is invalidate then user cannot see the regen button. 
ECOM-4217
 2016-06-11 15:26:30 +05:00
Robert Raposa
84726d6e1b Merge pull request #12723 from edx/release 
Merge hotfix-2016-06-10 release into master
 2016-06-10 16:01:23 -04:00
ssemenova
e7e1f647aa replace positive tab index values in the platform 
TNL-4705
 2016-06-10 15:35:51 -04:00
clrux
0aa87b8a22 Merge pull request #12452 from edx/clrux/ac-414 
AC-414 adding headings as first child to sections
 2016-06-10 15:23:10 -04:00
Robert Raposa
7d4a8a20fa Merge pull request #12719 from edx/hotfix-2016-06-10 
Hotfix for GET to POST
 2016-06-10 15:11:02 -04:00
J. Cliff Dyer
2696650437 modified tests to directly address split test group 0 issues. 2016-06-10 17:59:02 +00:00
Peter Desjardins
b4d330bcd4 Merge pull request #12718 from edx/pdesjardins/DOC-2315 
Repair platform API documentation build
 2016-06-10 13:42:42 -04:00
Cliff Dyer
cdf5dea2db Merge pull request #12717 from edx/tnl/splittest-zerogroup 
Ensure split-test group zero content is protected
 2016-06-10 13:33:45 -04:00
Robert Raposa
d54f79f5bf Switch dashboard from GET to POST. 2016-06-10 13:14:19 -04:00
Chris Rodriguez
257903fe15 AC-414 adding headings as first child to sections 2016-06-10 12:30:03 -04:00
Peter Desjardins
7ff463c0e9 Mocked some Python modules when running a Sphinx documentation publishing build. Updated an autoclass class name that changed." 2016-06-10 12:27:51 -04:00
Christina Roberts
81e5be2246 Merge pull request #12699 from edx/christina/config-models 
New XBlock Configuration Models
 2016-06-10 10:49:50 -04:00
J. Cliff Dyer
4212a3c326 Ensure split-test group zero content is protected 
TNL-4771
 2016-06-10 14:00:17 +00:00
cahrens
39cf70ecf4 Add new xblock config models. 
TNL-4666
 2016-06-10 09:52:57 -04:00
David Ormsbee
249467c9bb Merge pull request #12527 from cpennington/enable-concurrency-in-lms-tests 
Enable concurrency (but not randomization) in LMS unit tests
 2016-06-10 09:19:59 -04:00
asadiqbal
fbafa72993 updated the version from 2.0.6 to 2.0.7 2016-06-10 17:35:49 +05:00
clrux
4a53f78129 Merge pull request #12676 from edx/clrux/ac-473 
AC-473 fixing width of closed captions in fullscreen
 2016-06-10 06:32:21 -04:00
AlasdairSwan
1ff0a3b45e Merge pull request #12709 from edx/alasdair/ECOM-4469-modals-sass-cleanup 
Clean up the help tab Sass included on Pattern Library pages
 2016-06-10 06:22:23 -04:00
Awais Jibran
ba6ef624c2 PLAT-1032 2016-06-10 11:38:20 +05:00
Awais Jibran
2648a63903 Fix email opt in list 2016-06-10 11:33:55 +05:00
Calen Pennington
a173270ef1 Fix pylint-identified issues in i18n_tests 2016-06-09 16:26:21 -04:00
PaulWattenberger
f5b42c8955 Initial lms changes for Sailthru (#12706) 
* Initial lms changes for Sailthru

* Fix identified code quality issues

* Fix migration failure

* Fix code quality identified issue
 2016-06-09 16:21:11 -04:00
Calen Pennington
e7caf9b0ca Rename i18n.tests to i18n_tests, so that the i18n.tests package can be a package without squashing the python i18n package namespace 2016-06-09 15:25:37 -04:00
AlasdairSwan
a856325731 Stay Clean 2016-06-09 14:49:37 -04:00
Calen Pennington
a7ed99ba79 Add __init__.py to tests folders to make them proper modules 2016-06-09 14:38:33 -04:00
Peter Fogg
14fcb3a11b Merge pull request #12708 from edx/peter-fogg/fix-catalog-404 
Fix 500 error when searching for a user without catalogs.
 2016-06-09 14:30:49 -04:00
Ned Batchelder
b4248d28e1 Merge pull request #12707 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-06-09 14:25:09 -04:00
Renzo Lucioni
1a7e1a3125 Merge pull request #12700 from edx/renzo/local-program-completion 
Use cached data to find completed programs on LMS
 2016-06-09 13:58:16 -04:00
Peter Fogg
c43d8e1566 Fix 500 error when searching for a user without catalogs. 
ECOM-4653
 2016-06-09 13:22:51 -04:00
Calen Pennington
98bf9f9dea Enable concurrency (but not randomization) in LMS unit tests 2016-06-09 13:14:36 -04:00
Calen Pennington
9ba7048415 Merge pull request #12528 from cpennington/enable-randomization-in-lms-tests 
Enable randomization (but not concurrency) in LMS unit tests
 2016-06-09 13:05:01 -04:00