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

7114 Commits

Author SHA1 Message Date
Douglas Hall
f915befe93 Merge pull request #13359 from edx/release 
Merging rc/2016-08-31 into master
 2016-08-31 11:41:51 -04:00
George Song
4954928215 Merge pull request #13352 from edx/george/update-django-debug-toolbar 
Update to latest `django-debug-toolbar`
 2016-08-31 07:15:45 -07:00
Chris Rodriguez
37b42941f8 AC-570 courseware search contrast enhancement 2016-08-30 14:51:54 -04:00
George Song
194ace0ff0 Update to latest django-debug-toolbar 
Also make sure we set the recommended settings according to
<https://django-debug-toolbar.readthedocs.io/en/stable/installation.html#explicit-setup>
 2016-08-30 11:33:05 -07:00
Douglas Hall
98ec118915 Allow for site override of EDITABLE_SHORT_DESCRIPTION setting 2016-08-29 13:50:28 -04:00
Christina Roberts
3f173347eb Merge pull request #13259 from edx/christina/fix-video-bug 
Fix typo in class name, remove incorrect class.
 2016-08-29 08:53:35 -04:00
Mushtaq Ali
db8e26d10a Merge pull request #13300 from edx/mushtaq/sust-57 
Fix mongo store's has_course with a split course key
 2016-08-26 17:19:29 +05:00
Mushtaq Ali
ec13ba4340 Fix when checking in mongo store, has_course with a split course key returns False. 2016-08-26 15:49:34 +05:00
Ned Batchelder
d440124c1a Merge pull request #13316 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-08-26 06:49:22 -04:00
Ned Batchelder
c55dcc3080 Update translations (autogenerated message) 2016-08-25 13:57:01 +00:00
Qubad786
b25dc54d68 update library content block's children on branches 2016-08-25 16:44:52 +05:00
Chris Rodriguez
2255b5c83b AC-552 word cloud accessibility updates 2016-08-24 11:14:25 -04:00
Eric Fischer
719dff66fb Merge pull request #13093 from edx/beryl/grading 
Use Persistent Subsection Scores in Grading
 2016-08-22 13:57:30 -04:00
Eric Fischer
22046d4067 Use PersistentSubsectionGrade in grades application 
Hooks the pre-existing grades code into our new PersistentSubsectionGrade data
model. Includes test updates, and some minor changes to the data model that
were discovered in testing.
 2016-08-22 09:47:37 -04:00
Malik Shahzad
062230b6a4 SOL-2017: Unused code removed. 2016-08-19 16:03:57 +05:00
Ned Batchelder
411219aac8 Update translations (autogenerated message) 2016-08-18 17:05:20 +00:00
cahrens
239dde6326 Fix typo in class name, remove incorrect class. 
TNL-5101
 2016-08-17 15:39:23 -04:00
M. Rehan
ffbaf1fe54 Merge pull request #12813 from edx/aj/TNL4826-lib-problems-not-update-with-import 
Refersh library children for the block during import.
 2016-08-16 00:52:58 +05:00
Eric Fischer
501fc69d7f Messaging update to hide after due warning 2016-08-15 12:20:11 -04:00
Asad Iqbal
1a179289ab Merge pull request #13220 from edx/asadiqbal08/OLIVE-75 
OLIVE-75 - CourseID Term not rendering correctly.
 2016-08-15 19:19:06 +05:00
Qubad786
aca82be335 Move fix to importer module and fix branch_setting in MixedModuleStore. 2016-08-15 18:50:50 +05:00
asadiqbal
1e938162db OLIVE-75 - CourseID Term not rendering correctly 2016-08-15 17:48:25 +05:00
Ned Batchelder
f8cadf7481 Merge pull request #13221 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-08-11 13:59:17 -04:00
Ned Batchelder
8ee9fcd8b2 Update translations (autogenerated message) 2016-08-11 16:00:22 +00:00
Albert (AJ) St. Aubin
28922ca688 Merge pull request #13197 from edx/aj/TNL-5051_CourseInfoAcctptanceTest 
Aj/tnl 5051 course info acctptance test
 2016-08-11 11:40:31 -04:00
Renzo Lucioni
363f9e2cd5 Merge pull request #13170 from edx/renzo/dashboard-programs 
Display programs of all categories on the student dashboard
 2016-08-11 10:06:15 -04:00
Albert St. Aubin
b63bfbd5dd Replaced lettuce tests with bokchoy tests for the course updates page and improved flaky test issues. 
TNL-5051
 2016-08-11 10:04:57 -04:00
Renzo Lucioni
9c81ba47e2 Display programs from all categories on the student dashboard 
Removes most remaining hardcoded references to XSeries from the LMS. Part of ECOM-4638.
 2016-08-11 09:00:23 -04:00
Awais Jibran
878b9124ab Merge pull request #13111 from edx/aj/ECOM4890-make-studio-case-insensitive-for-create-course 
Make studio case-insensitive for course keys for creating courses.
 2016-08-10 16:20:36 +05:00
Awais Jibran
4bc5ded768 Make studio case-insensitive for course keys for creating courses. 
ECOM-4890
 2016-08-10 14:34:35 +05:00
Mushtaq Ali
95b16dba4d Merge pull request #13183 from edx/mushtaq/maintenance 
Maintenance app RequireJS
 2016-08-09 23:52:01 +05:00
Brian Jacobel
71b0ea8fef Merge pull request #13173 from edx/bjacobel/autofix-cms 
Run ESLint autofixer in CMS
 2016-08-09 12:20:45 -04:00
Mushtaq Ali
fb2f9948e1 Fix dynamic load RequireJs issue on Maintenance Dashboard 2016-08-09 13:48:20 +00:00
Mushtaq Ali
abb6af9789 Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46 2016-08-09 18:16:13 +05:00
Brian Jacobel
d43e915dab Run eslint autofixer on /cms 2016-08-08 15:04:06 -04:00
Brian Beggs
1182ae6c54 Adding edx-django-release-util to LMS and CMS 2016-08-05 13:50:05 -04:00
alisan617
46b94ec6be remove dropdown menu class that has pseudo border that double arrows 2016-08-05 11:46:26 -04:00
sanfordstudent
095bae1a2c Merge pull request #13129 from edx/sstudent/TNL-5099 
WIP: initial re-add with no extra work beyond merge conflicts
 2016-08-05 09:47:27 -04:00
Brian Jacobel
c7042c4879 Merge pull request #13159 from edx/bjacobel/jshint-directives-to-eslint 
JSHint directives to ESLint (WIP)
 2016-08-04 17:11:56 -04:00
Brian Jacobel
a32fd27d60 Replace JSHint ignore directives with ESLint ones 2016-08-04 16:22:59 -04:00
Sanford Student
fc943ff539 moving milestones check to access.py and upgrading milestones version 2016-08-04 14:47:15 -04:00
Ned Batchelder
02f378a6ff Update translations (autogenerated message) 2016-08-04 18:25:47 +00:00
Ned Batchelder
7a0d764ef3 Update translations (autogenerated message) 2016-08-04 17:42:48 +00:00
Nimisha Asthagiri
be5940e6f4 Robust Grades refactor 
Adds ENABLE_SUBSECTION_GRADES_SAVED feature flag to both lms and cms. Also
installs the wiring that will allow robust grades to be used for courses
that enable it. This functionality is still gated by the feature flag
and should not be used until the remaining robust grades work is finished.
 2016-08-03 15:47:16 -04:00
Chris
e641c0dcee Merge pull request #13134 from edx/clrux/ac-549 
AC-549 updating pink
 2016-08-03 14:34:30 -04:00
Ned Batchelder
76bc4fb98e Fix 29 anomalous-backslash-in-string errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
8571ceabeb Fix many wrong-assert-type errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
eef964f5f6 Fix unused-variable errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
1905f0c517 Fix simplifiable-range errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
8b1978ba6c Fix unused-import errors 2016-08-03 12:44:41 -04:00