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

38923 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Zoldak
d3b2d88361 Merge pull request #13732 from edx/zoldak/no-migrations-in-unittests 
Disable migrations by default in python unit tests
 2016-10-12 14:06:30 -04:00
Brian Beggs
fa81f303f5 Merge pull request #13735 from edx/release 
Merge release -> master for release-2016-10-12
 2016-10-12 14:06:17 -04:00
Jesse Zoldak
4465373177 Disable migrations by default in unittests 
Rendering model states when running migrate in Django 1.8 consumes
on the order of 4x-6x more memory than <1.8.

References:
* https://code.djangoproject.com/ticket/24745
* https://code.djangoproject.com/ticket/24743

This is causing failures in Jenkins as the workers run out of memory
and either processes cannot fork or the Out Of Memory Killer
kills a process that is running tests.

Disabling migrations until we do either or both of these:
* Upgrade to Django 1.9 and turn them back on. See EV-92 "Discovery: Upgrade edx-platform to Django 1.9"
* Address TE-1310 "Unit tests should be able to run without migrations"
 2016-10-12 14:02:19 -04:00
sanfordstudent
a9c548c3fa Merge pull request #13728 from edx/sstudent/hack-instructor-task 
Sstudent/hack instructor task
 2016-10-12 13:16:17 -04:00
Nimisha Asthagiri
e0b3866123 Merge pull request #13640 from edx/beryl/grading_policy_api 
Grading Policy endpoint in Grades API
 2016-10-12 13:14:06 -04:00
Brian Beggs
9629e5bdca Merge pull request #13709 from edx/release-candidate 
Release Candidate rc/2016-10-12
 2016-10-12 12:36:14 -04:00
Nimisha Asthagiri
dea4147232 Grading Policy endpoint in Grades API 
This copies the grading policy endpoint currently in the
course_structures django app to its new location, in preparation
to remove the old app.

TNL-5701
 2016-10-12 11:43:12 -04:00
Sanford Student
54d34e834d update all references to instructor module 2016-10-12 11:35:02 -04:00
sanfordstudent
83011e1c36 Merge pull request #13666 from edx/sstudent/hack-python-paths 
update all references to instructor module
 2016-10-12 11:31:29 -04:00
Sanford Student
79eaa4e2e9 update all references to instructor module 2016-10-12 10:04:32 -04:00
Robert Raposa
3f7503336e Merge pull request #13672 from edx/robrap/urls 
Move student.views to student/urls.py
 2016-10-12 08:47:53 -04:00
Andy Armstrong
172ea1a913 Merge pull request #13700 from edx/andya/move-session-inactivity-timeout 
Move session_inactivity_timeout to openedx/core
 2016-10-12 07:18:13 -04:00
Syed Hasan raza
97ebdb0301 Merge pull request #13633 from edx/shr/bug/TNL-557-conditional-module-children-modules-empty-context 
Fix empty context KeyError for conditional module
 2016-10-12 13:04:34 +05:00
Andy Armstrong
0b24614d6f Move session_inactivity_timeout to openedx/core 2016-10-12 00:17:54 -04:00
Jillian Vogel
3b7ca029c9 Merge pull request #13713 from open-craft/fix-reverted-itsjeyd/inline-discussion-assets 
Fix Reverted: Have DiscussionXBlock take care of loading JS and CSS files it depends on
 2016-10-12 13:38:48 +10:30
Nimisha Asthagiri
7c4b60bc8c Merge pull request #13694 from edx/common_cleanup/header_control 
Move header_control from common to openedx/core
 2016-10-11 23:00:27 -04:00
Albert (AJ) St. Aubin
62423ffb95 Merge pull request #13719 from edx/christina/tnl-5737 
Corrected issue with the Show Hint button enabled state with single hint.
 2016-10-11 20:29:36 -04:00
Nimisha Asthagiri
27c99e1cf2 Move header_control from common to openedx/core 2016-10-11 17:56:56 -04:00
Andy Armstrong
fbdc34e7f4 Merge pull request #13699 from edx/andya/move-contentserver 
Move contentserver to openedx/core
 2016-10-11 16:10:28 -04:00
Albert St. Aubin
088b5c6615 Corrected issue with the Show Hint button enabled state with single hint. 
TNL-5737
 2016-10-11 15:50:40 -04:00
alisan617
f8589e4df8 Merge pull request #13714 from edx/alisan/bookmark-btn-TNL5734 
Bookmarks button style fix
 2016-10-11 14:06:08 -04:00
Nimisha Asthagiri
f5ef22adeb Merge pull request #13695 from edx/common_cleanup/audit_log 
Move audit_log utility function to openedx/core
 2016-10-11 13:33:00 -04:00
alisan617
69b5a4adfc classname clash in uxpl shims TNL-5534 2016-10-11 12:51:01 -04:00
Andy Armstrong
684aec8740 Move contentserver to openedx/core 2016-10-11 12:49:33 -04:00
Joel Barciauskas
9fa126dfac Merge pull request #13642 from edx/jbarciauskas/upgrade-dop-1.1.4-add-index 
Upgrade django-oauth2-provider to 1.1.4
 2016-10-11 12:42:18 -04:00
Robert Raposa
fea03e466c Move student.views to student/urls.py 2016-10-11 11:41:16 -04:00
Adam
05440f7502 Merge pull request #13609 from edx/dump-to-neo4j-updates-plus-signals 
Dump to neo4j updates plus signals
 2016-10-11 11:34:53 -04:00
Tim Krones
3649f8181d Have DiscussionXBlock take care of loading JS and CSS files it depends on. 
* Add openedx.core.lib.xblock_builtin.get_css_dependencies and get_js_dependencies,
  which respect PIPELINE_ENABLED setting when determining dependencies.
* Move new discussion-related Sass files into discussion subdirectory.
* Use "load_unicode" instead of "render_template" to load JS to add to fragment for DiscussionXBlock.
* Remove unused "course" parameter from context for DiscussionXBlock.student_view.
* Add RTL stylesheet for DiscussionXBlock, and enable the block to load correct stylesheet.
* Load MathJax only once, and include code for configuring MathJax in discussion bundle.
* Make sure username renders correctly in DiscussionXBlock response header.
* Move WYSIWYIG Markdown editor styles to _build-discussion.scss.
* Remove unnecessary import of discussion/utilities/v1-compatibility from _build-discussion.scss.
* Keep courseware-chromeless.html in sync with courseware.html.
* Load CSS for discussions on Teams tab.  This makes it possible to remove CSS for discussions from Sass files for "Course" tab.
* Load js/src/tooltip_manager.js, jquery.autocomplete.js and jquery.autocomplete.css on "Course" tab.
 2016-10-12 01:22:42 +10:30
Andy Armstrong
51167aedef Merge pull request #11710 from raccoongang/kssl/ui_conditional_module 
Add ui in studio for conditional_module.
 2016-10-11 10:45:39 -04:00
Syed Hassan Raza
c41db159f4 Fix empty context KeyError for conditional module 2016-10-11 19:15:06 +05:00
Simon Chen
b4dd18b16a Merge pull request #13578 from edx/tasawer/ecom-2979/learner-reverification-flow-update 
Fixing issues with photo verification flow
 2016-10-11 09:16:15 -04:00
Adam Palay
da58ad2a2b only dump courses to neo4j if they've been updated since the last time they were dumped 
improvements to the command line interface for caching
 2016-10-11 08:20:23 -04:00
Ahsan Ulhaq
b5e0d547fd Merge pull request #13649 from edx/ahsan/ECOM-5758-user-menu-role-information 
User Menu Added Role information missing from menu items
 2016-10-08 12:28:28 +05:00
Tasawer
1ac94921c3 Show verification expiration message on learner dashboard and allow them to reverify if expiration is X days away. 
ECOM-2979
 2016-10-08 11:32:02 +05:00
Brandon DeRosier
6e23a2ca95 Merge pull request #13196 from open-craft/haikuginger/change-coaches-to-staff 
Change CCX coaches to have staff role on CCX courses.
 2016-10-07 18:29:14 -04:00
Bill DeRusha
a776733d51 Merge pull request #13638 from edx/bderusha/utm-tracking 
Add UTM tracking for registrations
 2016-10-07 17:45:43 -04:00
Edward Zarecor
ed7f32ee27 Merge pull request #13678 from edx/e0d/ignore-email-case 
comparison should be case-insensitive
 2016-10-07 16:42:09 -04:00
Adam Palay
01a0f6d6ee allow ability to specify which courses to write to neo4j 2016-10-07 14:22:32 -04:00
Nimisha Asthagiri
cf2c48ab8f Merge pull request #13688 from edx/common_cleanup/datadog 
Move datadog from common to openedx/core
 2016-10-07 14:13:34 -04:00
Nimisha Asthagiri
5cb129e222 Merge pull request #13690 from edx/common_cleanup/heartbeat 
Move heartbeat from common to openedx/core
 2016-10-07 13:59:25 -04:00
Nimisha Asthagiri
0df9fb355b Merge pull request #13692 from edx/common_cleanup/monitoring 
Move monitoring from common to openedx/core
 2016-10-07 13:52:00 -04:00
Edward Zarecor
569e6745ef is 2016-10-07 13:46:26 -04:00
Nimisha Asthagiri
3b304029e6 Merge pull request #13679 from edx/common_cleanup/remove_old_one_off_script 
Move sync_user_info management command from common to LMS
 2016-10-07 13:44:43 -04:00
Nimisha Asthagiri
010f7eb5c8 Merge pull request #13684 from edx/student_cleanup/decoupled_dependencies 
Decouple student's dependency on badges with django signals
 2016-10-07 13:44:11 -04:00
Nimisha Asthagiri
2112e7f8c8 Merge pull request #13659 from edx/common_cleanup/external_auth 
Moves external_auth from common to openedx/core
 2016-10-07 13:39:21 -04:00
e0d
1841fe9b92 comparison should be case-insensitive 
test

quality
 2016-10-07 13:38:00 -04:00
Nimisha Asthagiri
84bdd8598b Merge pull request #13686 from edx/openedx_cleanup/misc 
Remove few LMS references from openedx/core
 2016-10-07 13:33:51 -04:00
Brian Beggs
8371e21b3c Merge pull request #13701 from edx/edx-django-release-util/0.1.2 
Change edx-django-release-util version.
 2016-10-07 13:30:12 -04:00
Nimisha Asthagiri
2b9e60ad17 Merge pull request #13691 from edx/common_cleanup/performance 
Move performance from common to openedx/core
 2016-10-07 13:25:51 -04:00
Nimisha Asthagiri
6793c8f6ab Move audit_log utility function to openedx/core 2016-10-07 13:25:08 -04:00