Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

17975 Commits

Author SHA1 Message Date
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
Zia Fazal
604ac8504c use platform_name template tag 2015-09-29 17:01:55 +05: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
2fd6add524 Revert "Merge DRF 3.1 in to master" 2015-09-28 17:12:43 -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
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
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
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
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
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
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
Bill DeRusha
c721ff5a82 Replace SEGMENT_IO_LMS & SEGMENT_IO_LMS_KEY with single key SEGMENT_KEY 2015-09-24 11:49:03 -04:00
Ben Patterson
a57802ebc7 Flag test as flaky. 2015-09-24 11:36:41 -04:00
Bill DeRusha
4f14d4f75b Bump version of segemnt's analytics-python package to 1.1.0 
Wrap 3rd Party Auth Pipeline with Segment enabled checks
 2015-09-24 11:27:24 -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
Brandon DeRosier
3ff344559c Revert "Revert "Add feature flag for Import/Export API in LMS"" 
This reverts commit 783e83deb0.
 2015-09-24 09:01:52 -04:00
Brandon DeRosier
edf7d9965e Revert "Revert "edX Course/Library Import/Export API"" 
This reverts commit 2bfbda3c1e.
 2015-09-24 09:01:00 -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
Andy Armstrong
b2a0b2f728 Improve response handling in AjaxHelpers 
I've changed the logic so that AjaxHelpers keeps
track of which requests have not yet had mock
responses sent. This ensures that every response
is handled before moving on to the next one,
rather than always handling the last request.
My intention is that this won't allow bugs to creep
in where a request isn't fired and instead the test
responds to an old request. It also should ensure
that extra events aren't accidentally fired.
 2015-09-23 20:23:09 -04:00
Andy Armstrong
7280a58711 Merge pull request #9885 from edx/andya/teams-router-testing 
Improve team testing of routers
 2015-09-23 19:53:30 -04:00
Akiva Leffert
5e2290f9ed Merge pull request #9726 from edx/aleffert/all-responsive 
Remove "responsive" check before deciding whether to add a viewport tag.
 2015-09-23 19:10:50 -04:00
Brian Beggs
a9643c6723 Merge pull request #9896 from edx/mattdrayer/release/SOL-1230 
mattdrayer/release/SOL-1230
 2015-09-23 18:49:32 -04:00
Brian Beggs
e9fceb8bc2 Merge pull request #9891 from edx/release 
merge release in to master for release 2015-09-22
 2015-09-23 18:09:01 -04:00
David Baumgold
9b758379d8 i18n course browse copy 2015-09-23 16:19:42 -04:00
Akiva Leffert
73e976ae85 Remove "responsive" check before deciding whether to add a viewport tag. 
We also need to ensure that this tag is presented when loading xblocks
via the mobile app anyway. Since we're fine just giving responsive
content to everyone we don't need this check any more.

JIRA: https://openedx.atlassian.net/browse/MA-960?filter=13805
 2015-09-23 16:07:41 -04:00