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

40279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Beggs
5550ca30b1 Merge pull request #9999 from edx/bbeggs/TNL-3452-master 
Fixed select_related fields for course embargos and the mobile user api. TNL-3452
 2015-10-02 13:55:30 -04:00
Mark Hoeber
35034841fb Doc Label fix for Intersphinx 2015-10-02 13:48:35 -04:00
Usman Khalid
0ce679fc06 Merge pull request #9934 from edx/usman/use-included-staticfiles-app 
Upgrade django-pipeline and staticfiles.
 2015-10-02 22:37:24 +05:00
Ben Patterson
ecdba7301a Flag test as flaky. See TNL-3492. 2015-10-02 13:21:26 -04:00
Alison Hodges
eab5c60752 Merge pull request #9984 from edx/ahodges/enroll_api 
Updates the description provided for a new enrollment report
 2015-10-02 13:10:35 -04:00
David Baumgold
0219e18fa8 Merge pull request #10023 from edx/release 
Release into master
 2015-10-02 12:58:50 -04:00
David Baumgold
a3f8ed3f47 Merge pull request #10022 from edx/rc/2015-10-01 
Rc/2015 10 01
 2015-10-02 12:57:43 -04:00
Afeef Janjua
6cc8c47ca0 TNL-3258 Reset group configuration model when a child content group is deleted (+5 squashed commits) 
Squashed commits:
[450761c] found an alternative way to restore model when any of the nested model is deleted
[1b7eb85] passed the context to the inner functions
[c87dafd] refactored the model access using encapsulation instead of directly accessing it
[5d025ff] return the promise
[d8d1f50] fixup! quality (+1 squashed commit)
Squashed commits:
[daa7f81] reset the configuration when the model is deleted (+1 squashed commit)
Squashed commits:
[c7f41f7] reverted: skip test_can_delete_unused_content_group due to flakiness
 2015-10-02 21:57:32 +05:00
Calen Pennington
ac507c3d22 Upgrade AboutItemSemantics test to verify for all direct-only categories 2015-10-02 12:51:50 -04:00
Calen Pennington
a7c7ceb975 Use super(...) to call delete_item from split_draft.py 2015-10-02 12:51:50 -04:00
Calen Pennington
f19605af1a Use a clearer error message when split is unable to delete an XBlock 2015-10-02 12:51:50 -04:00
Calen Pennington
6da7bff185 Allow test_mixed_modulestore to be run without django setup 2015-10-02 12:51:49 -04:00
Calen Pennington
92eadf1afb Delete DIRECT_ONLY_CATEGORIES from published and draft branches. 
This fixes https://openedx.atlassian.net/browse/PLAT-858.
 2015-10-02 12:51:49 -04:00
Calen Pennington
1f7082ebfe Add a test of the semantics of About items 
These are XBlocks that are detached (not part of the course content hierarchy),
and are also DIRECT_ONLY_CATEGORIES (meaning they are always autopublished).

https://openedx.atlassian.net/browse/PLAT-858 identifies a bug
where an About item isn't correctly deleted in SplitDraft, and this test
reproduces that case.
 2015-10-02 12:51:40 -04:00
Sarina Canelake
241ce4a6b1 Merge pull request #10004 from Gadal/master 
Update AUTHORS
 2015-10-02 11:08:37 -04:00
Ben Patterson
ed13815b4f TNL-3489. Flag test as flaky. 
See ticket for details.
 2015-10-02 10:57:57 -04:00
Fred Smith
9d13ccdb50 Merge pull request #10016 from edx/bderusha/segment-fix 
Rename SEGMENT_KEY to have a unique key name for both CMS and LMS
 2015-10-02 09:56:23 -04:00
Diana Huang
7bfb1127f5 Merge pull request #9771 from edx/diana/add-team-to-reports 
Add team column to grade reports.
 2015-10-02 09:35:25 -04:00
Usman Khalid
2b59d46a31 Use django.contrib.staticfiles instead of django-staticfiles. 
TNL-3137
 2015-10-02 18:26:25 +05:00
Usman Khalid
98df2336f3 Upgrade to django-pipeline v.1.5.3. 
TNL-3137
 2015-10-02 18:26:25 +05:00
Saleem Latif
4725f7f579 favicon display bug corrected 2015-10-02 18:15:49 +05:00
Peter Pinch
94d5f736bf Merge pull request #9986 from mitocw/fix/jf/enroll-ccx-coaches 
Enroll CCX coaches in the courses to which they're added
 2015-10-02 08:13:32 -04:00
Zia Fazal
460b19fa1b fixed form submit selector 
reduced left margin
 2015-10-02 16:57:23 +05:00
Dustin Gadal
5106c7c6fa Update AUTHORS 2015-10-02 00:22:29 -04:00
Sarina Canelake
4f34377bce Merge pull request #10003 from Gadal/master 
Fix import error
 2015-10-01 23:54:21 -04:00
Dustin Gadal
dfc0a35799 Fix import error 
See also:
https://github.com/edx/edx-platform/pull/9969

I'm not at a linux box to do a rebase from the command line, so I'm creating a new PR.
 2015-10-01 22:33:39 -04:00
chrisndodge
4b37d788eb Merge pull request #9977 from edx/cdodge/flaky-test 
Mark test_can_add_remove_allowance Bokchoy test as flaky for now
 2015-10-01 22:07:20 -04:00
Bill DeRusha
ca6633bd98 Add IP to all python Segment tracking calls 2015-10-01 21:21:16 -04:00
Bill DeRusha
bcb71a3255 Rename SEGMENT_KEY to have a unique key name for both CMS and LMS 2015-10-01 19:40:27 -04:00
Cliff Dyer
b85ea12a15 Merge pull request #9958 from edx/cdyer/MA-1280-restful-conventions 
Make the profile_image api more restful.
 2015-10-01 17:13:33 -04:00
Clinton Blackburn
d1f4d3a67b Merge pull request #9997 from edx/clintonb/credit-grade-length 
Limited grades to seven characters
 2015-10-01 16:55:35 -04:00
Calen Pennington
8267a762c0 Move *ModuleStoreBuilders into xmodule.modulestore.tests.utils 2015-10-01 16:52:39 -04:00
Alison Hodges
adffb10cbe Updates the description provided for a new enrollment report 
https://github.com/edx/edx-platform/pull/9345
 2015-10-01 16:28:42 -04:00
Sarina Canelake
972196fe3f Merge pull request #9978 from mitocw/fix/gs/min_count_keyerror 
Fixed KeyError in CCX
 2015-10-01 15:43:28 -04:00
Sarina Canelake
cdd59b5a10 Merge pull request #9950 from lduarte1991/lti-allow-fullscreen 
Allow fullscreen within lti
 2015-10-01 15:42:15 -04:00
David Baumgold
ed7d8577e7 Merge branch 'release-2015-10-01-resolve-merge-conflicts' 2015-10-01 15:29:46 -04:00
David Baumgold
69bc10235e Merge remote-tracking branch 'remotes/origin/release' into release-2015-10-01-resolve-merge-conflicts 2015-10-01 15:28:55 -04:00
Clinton Blackburn
8f1ff11b47 Limited grades to seven characters 
ECOM-2433
 2015-10-01 15:10:48 -04:00
J. Cliff Dyer
e200015cfc Make the profile_image api more restful. MA-1280 
Deprecate the views at /api/profile_images/v1/{username}/upload and
/api/profile_images/v1/{username}/remove and replace them with GET and
POST methods at /api/user/v1/accounts/{username}/image
 2015-10-01 18:39:24 +00:00
Brian Beggs
619768f741 removed course_enrollment hint from UserDetail mobile api view. TNL-3452 2015-10-01 13:50:58 -04:00
Brian Beggs
b73bf35899 fixed snapshot functionality for RestrictedCrouse embargo, select_related is now passed the proper hint. TNL-3452 2015-10-01 13:50:46 -04:00
Mushtaq Ali
42c02c8036 Merge pull request #9809 from edx/mushtaq/force-publish-command 
'force_publish' command for publishing a course forcefully by making …
 2015-10-01 22:42:54 +05:00
Jamie Folsom
c9fc35d253 Enroll CCX coaches in courses as they're added as coaches. 
Remove log statements.

Add test for CCX coach access addition.

Email CCX coaches when they're enrolled.

Remove ccx_coach from list of roles which can perform access maintenance.

Remove unused variables.

Remove unused import (unenroll_email)

Fix long line in instructor/access.py.

Address long line formatting issue.
 2015-10-01 13:23:34 -04:00
Adam
54ede57c15 Merge pull request #9946 from edx/rc/2015-10-01 
Weekly release for 2015-10-01
 2015-10-01 13:19:48 -04:00
Peter Fogg
c67bcaefc5 Merge pull request #9948 from edx/peter-fogg/fix-team-membership-count 
Fix displaying wrong membership on "My Team" view.
 2015-10-01 12:51:32 -04:00
Peter Fogg
ffe2aef41e Fix displaying wrong membership on "My Team" view. 
The heart of this fix is to change the "My Team" view to use a
collection of teams instead of memberships. The team card is
refactored to only take a team, rather than attempt to be polymorphic
over teams and team memberships. This change enabled removing a good
amount of old code. This also requires adding a `username` parameter
to the teams list endpoint which allows getting a list of all teams
for a single user, in order to allow refreshing the "My Teams" view
correctly. Currently this list is of length at most one.

TNL-3410
 2015-10-01 11:56:15 -04:00
George Schneeloch
3284b7e449 Added myself to AUTHORS 2015-10-01 11:29:46 -04:00
Ben Patterson
82b199b64f Merge pull request #9908 from edx/benp/flaky-pythontest-sep2015 
Flag test as flaky.
 2015-10-01 11:23:16 -04:00
George Schneeloch
c6c92230c5 Fixed min_count KeyError 2015-10-01 10:56:13 -04:00
Ben Patterson
11fb4f6696 Merge pull request #9990 from edx/benp/improve-node-js-path 
Add node_modules to the path via the jenkins-common script instead of…
 2015-10-01 10:18:00 -04:00