Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,160 Commits 1 Branch 0 Tags
5550ca30b1778d34f99db7f1a67c91dcf4dafd8e
Commit Graph

33160 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
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
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
Sarina Canelake
241ce4a6b1 Merge pull request #10004 from Gadal/master 
Update AUTHORS
 2015-10-02 11:08:37 -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
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
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
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
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
Matt Drayer
7557620d59 Merge pull request #9967 from edx/ziafazal/SOL-1247 
SOL-1247: use overridden course number and org
 2015-10-01 10:10:13 -04:00
Matt Drayer
635e54918d Merge pull request #9968 from edx/asadiqbal08/SOL-1225 
SOL-1225: Pressing tab button does not takes user to next field
 2015-10-01 10:02:38 -04:00
Zia Fazal
fcb3a64f1d use overridden course number and org 
renamed test's name
 2015-10-01 18:22:09 +05:00
Mushtaq Ali
11741f118f 'force_publish' command for publishing a course forcefully by making the published branch point to the same structure as the draft branch. add force_publish functionality to split courses. 2015-10-01 15:46:37 +05:00
Muzaffar yousaf
772b0bff31 Merge pull request #9982 from edx/muzaffar/DRF-change-query-params 
DRF uses query_params instead of QUERY_PARAMS.
 2015-10-01 15:38:33 +05:00
asadiqbal
b09c20f02f SOL-1225 2015-10-01 15:12:13 +05:00
Ahsan Ulhaq
74d668ec29 Merge pull request #9952 from edx/ahsan/ECOM-2338-Messaging-and-text-improvements 
Messaging and text improvements dashboard
 2015-10-01 13:46:54 +05:00
Ahsan Ulhaq
65b8bf8c40 Messaging and text improvements 
ECOM-2338
 2015-10-01 12:41:56 +05:00
Sarina Canelake
062e979e0e Merge pull request #9993 from edx/add-folsom 
Add myself to AUTHORS
 2015-09-30 22:19:34 -04:00
Jamie Folsom
20bfec766f Add myself to AUTHORS 2015-09-30 22:17:11 -04:00
Syed Hassan Raza
42662426c3 Revert "prevent delete public oprhans" 
This reverts commit 3849a8fa81.
 2015-09-30 13:40:22 -07:00
Christine Lytwynec
4aceb33c70 Merge pull request #9985 from edx/clytwynec/html-fixes 
fix typo in course_info.html
 2015-09-30 16:18:18 -04:00
Ben Patterson
df821f35ee Add node_modules to the path via the jenkins-common script instead of all-tests. 
The jenkins-common script is the better place for this particular setup, since that
script is doing similar setup steps to prepare the environment for running
various tests/subsequent scripts. This also will resolve downstream processes,
such as our jenkins AMI builder (for jenkins-worker images).
 2015-09-30 15:57:02 -04:00
Matt Drayer
220fb3df90 Merge pull request #9395 from edx/asadiqbal08/MAYN-116 
asadiqbal08/MAYN-116 Including GTM code from microsite
 2015-09-30 15:40:00 -04:00