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

33056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam
e8b1608f16 Revert "Fix Mathjax rendering bug" 2015-09-29 09:26:59 -04:00
Brian Beggs
a4c99964cc Merge pull request #9937 from edx/bbeggs/2015-09-22-release-to-master 
Merge patch/2015-09-22 (Django rest framework) to master
 2015-09-29 09:24:01 -04:00
Matt Drayer
d3c50ee3a2 Merge pull request #9884 from edx/saleem-latif/SOL-1190 
SOL-1190: line breaks in signatory title are not reflected in the cert
 2015-09-29 08:50:25 -04:00
Matt Drayer
b12d6c8371 Merge pull request #9938 from edx/saleem-latif/MAYN-131-follow-on 
reverting the changes sent in PR#9925
 2015-09-29 08:48:16 -04:00
Saleem Latif
d91aa83af5 reverting the chnages sent in MAYN-131, final solution will be submitted in a separate PR 2015-09-29 14:03:19 +05:00
Saleem Latif
abfa6d9ad1 Line breaks in signatory title issue fixed 2015-09-29 12:38:58 +05:00
Brian Beggs
14d7a7525b fixed PEP-8 violations 2015-09-28 21:42:28 -04:00
Brian Beggs
cc73bc0b61 added test to discussions_api client to test JSON response that is absent of the resp_total key 2015-09-28 21:03:19 -04:00
Brian Beggs
d9de52751d Merge remote-tracking branch 'origin/release' into bbeggs/2015-09-22-release-to-master 2015-09-28 20:58:34 -04:00
Ben Patterson
cebc4ae0f8 Merge pull request #9936 from edx/revert-9929-bbeggs/merge-DRF-3.1 
Revert "Merge DRF 3.1 in to master"
 2015-09-28 19:19:19 -04:00
Ben Patterson
2fd6add524 Revert "Merge DRF 3.1 in to master" 2015-09-28 17:12:43 -04:00
Brian Beggs
00473d44ac Merge pull request #9929 from edx/bbeggs/merge-DRF-3.1 
Merge DRF 3.1 in to master
 2015-09-28 11:56:18 -04:00
Brian Beggs
53524efbd8 Fixes for rebasing of the release on 2015-09-23 2015-09-28 11:52:33 -04:00
Will Daly
322db6de7a TNL-3316: Error on Insights performance report 
Preserve DRF v2 behavior of defaulting to None
for missing keys in the grading policy dictionary.
 2015-09-28 11:52:32 -04:00
Will Daly
d11ccad0fc Upgrade djangorestframework to v3.1 
* Upgrade edx-submissions
* Upgrade edx-ora2
* Upgrade edx-val
* Upgrade edx-proctoring
* Update all edx-platform code that depends on DRF, including:
  - auth_exchange
  - cors_csrf
  - embargo
  - enrollment
  - util
  - commerce
  - course_structure
  - discussion_api
  - mobile_api
  - notifier_api
  - teams
  - credit
  - profile_images
  - user_api
  - lib/api (OAuth2 and pagination)
 2015-09-28 11:52:30 -04:00
David Baumgold
78f8fc39e8 Merge pull request #9922 from edx/cdodge/proctoring-2015-10-01 
bump version of edx-proctoring to 0.9.11
 2015-09-28 11:37:11 -04:00
Brian Beggs
7bac818395 Merge pull request #9831 from edx/patch/2015-09-22 
Patch: Upgrade djangorestframework to v3.1
 2015-09-28 11:17:01 -04:00
Brian Beggs
fd7fe3d04d Merge pull request #9915 from edx/release 
Merging hotfix 2015-09-24 back in to master
 2015-09-28 11:11:41 -04:00
Matt Drayer
63ac2f1457 Merge pull request #9860 from edx/saleem-latif/SOL-1189 
SOL-1189: when a signature image file is uploaded, the preview image looks distorted
 2015-09-28 10:05:28 -04:00
Matt Drayer
5374f10daa Merge pull request #9925 from edx/saleem-latif/MAYN-131 
MAYN-131: Update Unsupported Browser message
 2015-09-28 10:01:44 -04:00
Marco Morales
ad5aab4cc1 Merge pull request #9666 from edx/marco/UX-2586/discussions-profile-photos 
Discussion post cleanup (in preparation for post author images support)
 2015-09-28 09:12:42 -04:00
Saleem Latif
5b985a5914 updated error message 2015-09-28 16:20:57 +05:00
Syed Hasan raza
d570866c69 Merge pull request #9432 from edx/shr/bug/PLAT-799-prevent-published-orphan-creation 
Prevent publish orphans
 2015-09-28 02:16:25 -07:00
Chris Dodge
3b650133bf bump version of edx-proctoring to 0.9.11 2015-09-27 17:53:13 -04:00
chrisndodge
e58fe799d8 Merge pull request #9917 from edx/cdodge/put-back-icon-indicator 
edx-procoting will be passing back which font-awesome icon to use
 2015-09-25 20:16:28 -04:00
Chris Dodge
8a796675c9 bump edx-proctoring to 0.9.10 2015-09-25 12:40:58 -04:00
Brian Beggs
144c347387 Fixes for rebasing of the release on 2015-09-23 2015-09-25 12:40:58 -04:00
Will Daly
d6c7d8d383 TNL-3316: Error on Insights performance report 
Preserve DRF v2 behavior of defaulting to None
for missing keys in the grading policy dictionary.
 2015-09-25 12:40:57 -04:00
Will Daly
8555630df7 Upgrade djangorestframework to v3.1 
* Upgrade edx-submissions
* Upgrade edx-ora2
* Upgrade edx-val
* Upgrade edx-proctoring
* Update all edx-platform code that depends on DRF, including:
  - auth_exchange
  - cors_csrf
  - embargo
  - enrollment
  - util
  - commerce
  - course_structure
  - discussion_api
  - mobile_api
  - notifier_api
  - teams
  - credit
  - profile_images
  - user_api
  - lib/api (OAuth2 and pagination)
 2015-09-25 12:40:57 -04:00
Chris Dodge
7b980b82e8 edx-procoting will be passing back which font-awesome icon to use 2015-09-25 12:17:00 -04:00
Christine Lytwynec
80dafc2133 Merge pull request #9506 from edx/clytwynec/AC-157 
Manage focus on delete component modal
 2015-09-25 08:58:26 -04:00
Braden MacDonald
b98956bdf6 Merge pull request #9672 from open-craft/tpa-providers-api 
Initial implementation of API for listing a user's third party auth providers
 2015-09-24 15:52:52 -07:00
Christine Lytwynec
2dc5b8e89c make verifyElementInFocus a ViewHelpers method 2015-09-24 16:25:49 -04:00
clrux
5ad3ed4d38 Merge pull request #9899 from edx/clrux/ac-76-fixup 
LMS: replacing proctoring markup from accordion
 2015-09-24 14:59:01 -04:00
Chris Rodriguez
b49f9104b8 LMS: replacing proctoring markup from accordion 2015-09-24 13:21:37 -04:00
Andy Armstrong
5316cbee02 Merge pull request #8809 from edx/zoldak/update-sinon 
Update Sinon library
 2015-09-24 13:17:03 -04:00
Mark Hoeber
858ad528f1 Merge pull request #9906 from edx/markhoeber-add-api-doc-label 
Add main index api doc label for inter sphinx
 2015-09-24 12:46:28 -04:00
clrux
8076da139c Merge pull request #9775 from edx/clrux/ac-147 
Addressing contrast and hover states for 'clear filters' button on the find courses page
 2015-09-24 12:08:14 -04:00
Ben Patterson
60c439c93b Merge pull request #9898 from edx/benp/fix-jshint-report-diff-qual 
Use correct reports for jshint diff-quality.
 2015-09-24 11:59:23 -04:00
Ben Patterson
c2c665cbf7 Merge pull request #9894 from edx/benp/diff-cover-js 
TE-1042 include diff-cover for js.
 2015-09-24 11:14:57 -04:00
Chris Rodriguez
e3035a8fab LMS: a11y contrast fixes for find course page 2015-09-24 11:11:07 -04:00
Eric Fischer
cf5d5666a3 Merge pull request #9794 from edx/efischer/prevent_doubleclick 
TNL 3294 - Prevent double click creating multiple teams
 2015-09-24 11:01:43 -04:00
clrux
56dae32308 Merge pull request #9773 from edx/clrux/ac-173 
LMS: increasing contrast of footer text
 2015-09-24 10:57:58 -04:00
clrux
29a7db12c3 Merge pull request #9772 from edx/clrux/ac-172 
Increasing contrast in gray meta/date text on course dashboard
 2015-09-24 10:57:03 -04:00
Jesse Zoldak
1aa181c90a Update sinon to version 1.17.0 2015-09-24 10:55:48 -04:00
Ned Batchelder
45176c7254 Merge pull request #9868 from louyihua/i18n_fix 
i18n fix
 2015-09-24 10:23:58 -04:00
Matt Drayer
e51c4f23d3 Merge pull request #9822 from edx/saleem-latif/SOL-565 
saleem-latif/SOL-565
 2015-09-24 10:19:43 -04:00
Eric Fischer
02b72abccb Disable button while running 
Now using withDisabledElement to prevent multiple event handling. I've
attempted to write this as a common function in view_utils, so that this
approach can be used more generally, wherever needed. Includes a unit test.

Thanks to Christina and Andy for all their help on this one.
 2015-09-24 10:13:30 -04:00
Mark Hoeber
334999180f Add main index api doc label for inter sphinx 2015-09-24 10:00:25 -04:00
louyihua
66678c103f i18n fix 
1. Add missing '_()' in capa_base.py & video_xfields.py
2. Fix a bug in instructor_dashboard.py that causes crash when ANALYTICS_DASHBOARD_NAME contains non-ascii characters.
3. Workaround for mis-extractions inside .underscore files when using gettext along with interpolate.
 2015-09-24 13:02:12 +08:00