Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,854 Commits 1 Branch 0 Tags
3e8eac90d211237a236b3cd81ba90d07135b77d8
Commit Graph

31854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Daly
3e8eac90d2 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/github.txt
 2015-07-30 11:43:19 -07:00
Will Daly
50247472f0 Merge pull request #9136 from edx/patch/2015-07-29 
Multiple Patches
 2015-07-30 11:38:07 -07:00
Vedran Karačić
c9b65b0c2e Merge pull request #9131 from edx/revert-9037-vkaracic/TNL-394-confirmation-msg 
Revert "TNL-394: Fixed the confirmation message"
 2015-07-30 17:53:22 +02:00
Davorin Šego
65eb26b7b4 Merge pull request #9004 from edx/dsego/discovery-ui-improvements 
Improve course discovery filtering and empty search
 2015-07-30 17:34:39 +02:00
Jim Abramson
bf00fe0ecb Merge pull request #9124 from edx/jsa/no-course-discovery-in-devstack 
disable course discovery feature by default in devstack.
 2015-07-30 10:33:06 -04:00
Peter Fogg
7b01ed6171 Merge pull request #9102 from edx/peter-fogg/indices-teams 
Add index on CourseTeam name.
 2015-07-30 10:32:31 -04:00
Vedran Karačić
9ddf5c2e1e Revert "TNL-394: Fixed the confirmation message" 2015-07-30 16:09:48 +02:00
Ahsan Ulhaq
ea183283bb Merge pull request #9073 from edx/ahsan/ECOM-1917-Copy-styling-for-credit-messages-on-dashboard 
Copy & Styling for Credit messages on Dashboard
 2015-07-30 15:30:34 +05:00
Ahsan Ulhaq
08165e8823 Update ICRV version 2015-07-30 14:35:11 +05:00
Ahsan Ulhaq
ab69e0df1c Copy & Styling for Credit messages on Dashboard 
ECOM-1917
 2015-07-30 14:33:40 +05:00
John Baker
b5c2e9ccec Merge pull request #9108 from edx/merge-release-into-master 
Merge release into master
 2015-07-29 19:00:35 -04:00
jsa
ba239125f1 disable course discovery feature by default in devstack. 2015-07-29 17:40:57 -04:00
Peter Fogg
dfafb03ebc Add New Relic tracing to TeamsListView.get. 2015-07-29 17:38:41 -04:00
Peter Fogg
6473cd9bd8 Add index on CourseTeam name. 2015-07-29 17:38:41 -04:00
Ned Batchelder
e0edc51e07 Merge pull request #9120 from edx/ned/fix-djdt-circular-imports 
Fix Django Debug Toolbar circular imports
 2015-07-29 17:17:39 -04:00
Kevin Falcone
49e2750dbe Merge pull request #9119 from edx/jibsheet/rfc-requirements 
Pin the rc6266 fork release
 2015-07-29 16:59:29 -04:00
Christine Lytwynec
e793351576 Merge pull request #9101 from edx/clytwynec/update-testing-docs 
Update testing.rst with info about bok choy accessibility tests
 2015-07-29 16:35:47 -04:00
Ned Batchelder
7a7a867e6a Fix Django Debug Toolbar circular imports 
There's an "explicit" way to configure Django Debug Toolbar that isn't
prone to circular import errors:

http://django-debug-toolbar.readthedocs.org/en/1.0/installation.html#explicit-setup

Do that.
 2015-07-29 16:18:38 -04:00
Kevin Falcone
898a43c49f Pin the rc6266 fork release 
If we don't pin to the version, pip will see that we have a version of
rfc6266 installed and be fine with it.

Yes, you have to say it twice.
 2015-07-29 15:41:33 -04:00
Mushtaq Ali
40f8947334 Merge pull request #9100 from edx/mushtaq/tnl2593-fix-publish-automatically-after-deleting-unit 
Autopublish when vertical is deleted
 2015-07-29 23:02:54 +05:00
Mushtaq Ali
6964690097 Merge pull request #9096 from edx/mushtaq/tnl-2609-fix-url-link-issue-markdown-editor 
Fix markdown editor reference link having colon issue
 2015-07-29 22:05:46 +05:00
John Eskew
c2c609ac9e Merge pull request #9088 from edx/jeskew/PLAT-729_upgrade_mongoengine 
Bump mongoengine version to 0.10.0
 2015-07-29 13:02:33 -04:00
clrux
4e8aee7e85 Merge pull request #9067 from edx/clrux/ac-121-cms-modal-focus 
Sending focus to modal in CMS
 2015-07-29 12:47:51 -04:00
Ben McMorran
7794431fbb Merge pull request #9117 from edx/benmcmorran/team-api-docs 
Add discussion_topic_id to Team API docstrings
 2015-07-29 11:49:09 -04:00
Christine Lytwynec
5e1ba5897c Update testing.rst with info about bok choy accessibility tests 2015-07-29 11:44:15 -04:00
Ben McMorran
44d4e28053 Add discussion_topic_id to Team API docstrings 2015-07-29 14:52:58 +00:00
Chris Dodge
6c3a902482 switch to using tags 2015-07-29 10:49:34 -04:00
frances botsford
f8d1776698 Merge pull request #8972 from jolyonb/jolyonb/discussion 
Small printing fixes (LMS)
 2015-07-29 10:10:47 -04:00
frances botsford
cfe3acb7c4 Merge pull request #7594 from jolyonb/jolyonb/p-spacing 
Fixing paragraph spacing with inline class (capa)
 2015-07-29 10:06:28 -04:00
Chris Rodriguez
2bea68fc58 Sending focus to modal in CMS 2015-07-29 09:19:36 -04:00
David Baumgold
7a32fbc941 Merge pull request #9104 from edx/improve-learner-profile-tests 
Minor improvements to learner profile tests
 2015-07-29 09:05:21 -04:00
Aamir
487d8331d2 Merge pull request #9017 from edx/aamir-khan/ECOM-1817-instructions-on-receipt 
ECOM-1817: updated the course name and also styling for the provider
 2015-07-29 16:47:12 +05:00
aamir-khan
459ccae028 ECOM-1817: updated the course name and also styling for the provider 2015-07-29 15:12:07 +05:00
mushtaqali
edad392a26 Autopublish when vertical is deleted 2015-07-29 11:44:11 +05:00
Andy Armstrong
601f160271 Merge pull request #6503 from edx/pull-out-lms-underscore-templates 
Pull discussion underscore templates out into individual files
 2015-07-28 22:33:34 -04:00
Carson Gee
4b9792a149 Resolved LogHandler bug in rf6266 2015-07-28 19:14:51 -04:00
Christopher Lee
384fa77ee6 Merge pull request #8585 from edx/clee/discussion-api-order-and-sort-threads 
Thread sort key and direction for discussion api
 2015-07-28 18:50:48 -04:00
Will Daly
a1f79a3c03 Add in-course reverification to advanced components. 2015-07-28 17:17:49 -04:00
Will Daly
65367a2ded ECOM-1911: Fixes to credit requirements in Studio. 
* Exclude orphaned XBlocks from requirements because they have been deleted.
* Sort ICRV requirements by start date, then by display name.
 2015-07-28 17:17:43 -04:00
Braden MacDonald
9e00e2b397 Allow previewing cohorted content when masquerading 2015-07-28 17:17:34 -04:00
jsa
849ad8df94 commerce/api: Don’t allow setting expiration of prof modes. 
XCOM-497
 2015-07-28 17:17:13 -04:00
Carson Gee
1df53ac348 Merge pull request #9080 from mitocw/feature/cg/rfc6266_logger_issue 
Resolved LogHandler bug in rf6266
 2015-07-28 17:17:08 -04:00
jsa
7d8fb73934 commerce/api: pass expiration_datetime when updating modes 2015-07-28 17:17:05 -04:00
Clinton Blackburn
c2fdf8cb2a Corrected CourseMode Display Name 
The Commerce API now sets the correct display name for known course modes, but continues to default to the mode slug for unknown course modes.
 2015-07-28 17:16:43 -04:00
Chris Dodge
81502176e1 Integrate timed and proctored exam authoring into Studio 2015-07-28 17:16:06 -04:00
David Baumgold
263bcaf2fc Simplify birth_year variable 2015-07-28 16:47:03 -04:00
Carson Gee
c19a683f15 Resolved LogHandler bug in rf6266 2015-07-28 16:25:36 -04:00
Renzo Lucioni
dfbfabd8cd Merge pull request #9058 from edx/renzo/update-edx-oauth2-provider 
Update edx-oauth2-provider to 0.5.6
 2015-07-28 15:43:30 -04:00
John Baker
d96648dff1 fixed aws.py 2015-07-28 15:32:28 -04:00
christopher lee
ed3bb27df8 Thread sort key and direction for discussion api 
Discussion API for thread sorting now takes the sort_by
parameter for the sort key such as by comment_count or
vote_count. Also takes the sort_direction parameter for
sorting the thread results.
 2015-07-28 14:34:30 -04:00