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

29297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Dodge
b6a333f323 do the ORG filtering as part of the mongo query. Also, don't trigger metadata inheritence calculations when just trying to load 'about' information, which is not tied into the course tree anyhow (i.e. no parent/child relationship) 2015-03-23 12:28:20 -04:00
Sarina Canelake
8710c63839 Merge pull request #7447 from edx/sarina/20150323-update-translations 
Update translations (autogenerated message)
 2015-03-23 10:51:08 -04:00
Sarina Canelake
71486fc45b Update translations (autogenerated message) 2015-03-23 10:49:44 -04:00
Usman Khalid
6fb48eb159 Merge pull request #6706 from edx/ammar/tnl-181 
Allow Instructor To Rename Cohorts And Set Cohort Assignment Method.
 2015-03-23 19:49:03 +05:00
Martyn James
e8cf0a35df Merge pull request #7423 from edx/mjames/update_search_hash 
Updating edx-search hash to include bugfixes
 2015-03-23 10:39:31 -04:00
Martyn James
775de9e818 Merge pull request #7150 from edx/dcikatic/courseware_search_tracking 
SOL-217 Adding basic analytics events logging for courseware search - In discussing with @mulby, we agreed to allow this to go in , and we'll add a story to improve the tests at a later time.
 2015-03-23 10:37:23 -04:00
Usman Khalid
7426102de1 Merge pull request #7017 from edx/ammar/move-cohort-management-tnl-1268 
Enable/disable cohorts from the instructor dashboard and move cohorts management to its own tab.
 2015-03-23 19:05:53 +05:00
Usman Khalid
c50f828187 Fixes after rebase. 2015-03-23 19:03:31 +05:00
Will Daly
3f2cd706e8 Merge pull request #7437 from edx/will/ecom-1229 
Course info page no longer creates enrollments.
 2015-03-23 08:32:15 -04:00
muzaffaryousaf
e6c75529c0 Cohort discussion topics via UI in instructor dashboard. 
TNL-1256
 2015-03-23 14:28:22 +05:00
Usman Khalid
e07f45b5dd Removed cohort_config from advanced settings page. 
TNL-1258
 2015-03-23 09:58:25 +05:00
Usman Khalid
eee6250fb2 Use RequestCache to cache cohorts information. 
TNL-1258
 2015-03-23 09:57:16 +05:00
Usman Khalid
d382f569c8 Refactor django_comment_client.utils.prepare_content() to query 
course cohort settings only once.

TNL-1258
 2015-03-23 09:57:07 +05:00
Usman Khalid
a9e0082c7c Cache cohort info during requests to reduce SQL queries. 
TNL-1258
 2015-03-23 09:44:23 +05:00
Usman Khalid
d59be9949e Use cohort settings from CourseCohortSettings. 
TNL-1258
 2015-03-23 09:43:00 +05:00
muhammad-ammar
b56e123350 Change labels 2015-03-23 09:21:23 +05:00
muhammad-ammar
9ce66c78fd Rename Cohort Management to Cohorts 
Move `Cohorts` section after `Membership` section
 2015-03-23 09:21:22 +05:00
Muhammad Ammar
70efd28483 Changes after Andy's Review 2015-03-23 09:21:21 +05:00
Muhammad Ammar
3ce494f5c5 Enable/disable cohorts from the instructor dashboard and move cohorts management to its own tab 
TNL-1268
 2015-03-23 09:21:15 +05:00
muzaffaryousaf
d839692437 Added get_cohort_associated_assignment_type method. 2015-03-23 09:10:59 +05:00
muhammad-ammar
0ebd8c29b0 Allow Instructor To Rename Cohorts And Set Cohort Assignment Method 
TNL-181
 2015-03-23 09:10:59 +05:00
Nimisha Asthagiri
ec6cc04b90 Merge pull request #7440 from edx/nimisha/fix-account-creation-merge-issue 
Fixes merge conflict with account creation transaction.
 2015-03-21 14:06:56 -04:00
Nimisha Asthagiri
dd8aba8fc9 Fixes merge conflict with account creation transaction. 2015-03-21 09:23:27 -04:00
Braden MacDonald
c35cd5d841 Merge pull request #7420 from open-craft/fix-library-analytics 
Fix two content library analytics issues (SOL-521)
 2015-03-20 21:40:35 -07:00
Braden MacDonald
7764f364cd Fix two content library analytics issues (SOL-521) 2015-03-20 20:47:03 -07:00
Nimisha Asthagiri
289469dd3a Merge pull request #7353 from edx/mobile/third-party-oauth-reg 
Mobile registration with Google/FB
 2015-03-20 17:04:37 -04:00
Ned Batchelder
8a1877f0ad Merge pull request #7436 from edx/ned/upgrade-pylint 
Upgrade pylint
 2015-03-20 16:34:52 -04:00
Ned Batchelder
5a414914e4 Lower the pylint threshold 2015-03-20 15:49:47 -04:00
Ned Batchelder
f396c11579 Fix unidiomatic type checking 2015-03-20 15:48:54 -04:00
Nimisha Asthagiri
dfcef9ddcb MA-95: Update Registration endpoint to support 3rd party credentials 
Automatically link edX account with social account in login mobile API path
 2015-03-20 15:43:40 -04:00
Brian Talbot
c01ab4a824 Merge pull request #7430 from edx/talbs/fix-certs-csspath 
Certificates: Revising compiled CSS paths to match existing LMS patterns
 2015-03-20 15:41:44 -04:00
Clinton Blackburn
89620a33c3 Merge pull request #7378 from edx/clintonb/pay-with-oscar 
Creating orders with E-Commerce API
 2015-03-20 15:39:34 -04:00
Will Daly
704e8836f0 Course info page no longer creates enrollments. 
The course info page was getting-or-creating
a course enrollment with is_active=0.  This commit
changes the operation to a "get" so that extra
enrollment records are not created.
 2015-03-20 15:22:20 -04:00
Clinton Blackburn
306a267de7 Updated create_order endpoint to use E-Commerce API for order creation and enrollment 
This functionality is activated by adding a SKU to a non-honor course mode. When the feature is activated, verified orders will be created by the E-Commerce Service instead of LMS. After payment, the E-Commerce Service will also create the enrollment.
 2015-03-20 14:53:23 -04:00
Ned Batchelder
6c70f30dec pylint --> 1.4.2, and pin astroid 2015-03-20 14:35:11 -04:00
Jesse Zoldak
5d65f577eb Merge pull request #7431 from edx/zoldak/SOL-336 
Decorate flaky test SOL-336
 2015-03-20 13:20:22 -04:00
Adam
d012428c34 Merge pull request #7426 from edx/adam/merge-release-to-master 
Adam/merge release to master
 2015-03-20 10:42:22 -04:00
Jesse Zoldak
bb4e57762f Decorate flaky test SOL-336 2015-03-20 10:13:11 -04:00
Brian Talbot
f4c3a732be certificates: revising compiled CSS paths to match existing LMS patterns 2015-03-20 09:54:58 -04:00
Ahsan Ulhaq
60cb7cf33a Merge pull request #7325 from edx/ahsan/tnl-1693-standarize-button-on-assessment-types 
Standrize buttons in assessment problems
 2015-03-20 18:50:27 +05:00
Sarina Canelake
90a0459e50 Merge pull request #7380 from OmarIthawi/edraak/platform-name-in-password-reset-confirm 
Keep platform_name in the password_reset_confirm.html always TNL-1654
 2015-03-20 09:14:40 -04:00
Shrhawk
1e73c272f5 Merge pull request #7405 from edx/shr/bug/PLAT-466-Bad-course-about-page-value-500-error 
handle invalid-key exception for split courses
 2015-03-20 17:57:48 +05:00
Syed Hassan Raza
d17a0c6ad2 handle invalid-key exception for split courses 2015-03-20 16:18:27 +05:00
Martyn James
5d54036090 Fix pylint violation 2015-03-20 10:41:56 +01:00
Dino Cikatic
ee90c5fe36 SOL-217 Remove Google Analytics calls 2015-03-19 21:52:24 +00:00
Martyn James
dd34bada71 pylinty minty 2015-03-19 21:52:24 +00:00
Dino Cikatic
2117d168a4 SOL-217 Adding basic analytics events logging for courseware search and index 2015-03-19 21:52:23 +00:00
Adam Palay
35e4e9d81f resolve more merge conflicts 2015-03-19 17:22:29 -04:00
Adam Palay
b5c4b6388c Merge remote-tracking branch 'origin/release' into adam/merge-release-to-master 
Conflicts:
	common/djangoapps/cors_csrf/helpers.py
	common/djangoapps/enrollment/views.py
	lms/djangoapps/commerce/constants.py
	lms/djangoapps/commerce/tests.py
	lms/djangoapps/commerce/views.py
 2015-03-19 16:30:46 -04:00
Adam
7abcfddf51 Merge pull request #7421 from edx/hotfix/2015-03-19 
Hotfix/2015 03 19
 2015-03-19 14:54:00 -04:00