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

6092 Commits

Author SHA1 Message Date
Calen Pennington
7e55437db6 Allow retry_failed_photo_verifications to take a list of receipt_ids to retry 2015-10-05 22:46:45 -04:00
Calen Pennington
e57619b007 When retrying, use the previously copied photo_id 2015-10-05 22:46:45 -04:00
Peter Fogg
7f4bd900d1 Add management command to set SoftwareSecure verification status. 2015-10-05 22:46:45 -04:00
zubair-arbi
c78b1be515 add new column 'copy_id_photo_from' for 'SoftwareSecurePhotoVerification' model to track initial verification with 'photo_id_key' 2015-10-05 22:46:45 -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
chrisndodge
cc15a9ada8 Merge pull request #9975 from edx/cdodge/bump-proctoring 
update reference to edx-proctoring to account for requested iconograp…
 2015-09-30 12:38:31 -04:00
David Baumgold
459f2e0705 Disable some tests for comprehensive theming 
Depends on functionality that has been temporarily reverted
 2015-09-30 12:18:09 -04:00
David Baumgold
aa8ecca536 Remove the edx.org comprehensive theme 
There's a lot of useful things in PR #8271 that provide a framework
for the comprehensive theming system. If we need to remove the edx.org
theme from the codebase, we can leave most of PR #8271 in, to make it
easier to build on top of and get this feature back in.
 2015-09-30 12:18:01 -04:00
Chris Dodge
bf26b09265 update reference to edx-proctoring to account for requested iconography changes from UX team. Also update test to conform with changes 2015-09-30 10:10:23 -04:00
Bill DeRusha
a6873cb883 Merge pull request #9875 from edx/bderusha/segment-cleanup 
Segment Clean Up
 2015-09-29 10:33:03 -04: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
Chris Dodge
3b650133bf bump version of edx-proctoring to 0.9.11 2015-09-27 17:53:13 -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
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
Andy Armstrong
5316cbee02 Merge pull request #8809 from edx/zoldak/update-sinon 
Update Sinon library
 2015-09-24 13:17:03 -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
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
Jesse Zoldak
1aa181c90a Update sinon to version 1.17.0 2015-09-24 10:55:48 -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
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
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
Brian Beggs
c26bb9188a Revert "Upgrade django-pipeline and staticfiles" 2015-09-23 15:52:24 -04:00
Brian Beggs
4c05fa4f49 Merge pull request #9803 from edx/usman/use-included-staticfiles-app 
Upgrade django-pipeline and staticfiles
 2015-09-23 15:50:39 -04:00
Zia Fazal
2bd26fc0e4 fixed bug in certificate html view 
Fixed bug: When certificate id previewed by a user who already has a
certificate generated with different mode it would not display
certificate in right preview mode.
 2015-09-23 15:12:32 -04:00
clrux
0b64f2d612 Merge pull request #9525 from edx/clrux/ac-76 
LMS: Course navigation revamp
 2015-09-23 14:26:10 -04:00
Ahsan Ulhaq
508ded2673 LMS: course navigation menu refactor 2015-09-23 13:13:18 -04:00
Andy Armstrong
d09034e065 Improve team testing of routers 2015-09-23 13:10:46 -04:00
Matt Drayer
fac7b24872 Merge pull request #9863 from edx/ziafazal/SOL-1230 
SOL-1230: fixed bug in certificate html view
 2015-09-22 12:30:21 -04:00
Usman Khalid
158bdf4d09 Use django.contrib.staticfiles instead of django-staticfiles. 
TNL-3137
 2015-09-22 20:39:44 +05:00
wajeeha-khalid
242c4c83f6 Merge pull request #9759 from edx/jia/MA-1212 
MA-1212 - Discussion API: add response_count field in GET single thread
 2015-09-22 19:43:05 +05:00
wajeeha-khalid
ab4d85a5d1 MA-1305 - formatted author label to Staff & Community TA 
refactor community_ta and staff in docstrings
 2015-09-22 17:03:04 +05:00
wajeeha-khalid
3f453e892d added response count in thread 
MA-1212 - added response count field in tests

removed unneccessary function

"MA-1212 - added response count in thread retrieval service and updated tests"

updated serializerz test for response count

MA-1212

exclude response count from thread get list

removed response_count field from update and create thread services

made resp_total dynamic for cs thread in test_serielizer

quality fixed

improved quality

add TODO JIRA ticket on removed fields
 2015-09-22 16:55:36 +05:00
Zia Fazal
2a523848b9 fixed bug in certificate html view 
Fixed bug: When certificate id previewed by a user who already has a
certificate generated with different mode it would not display
certificate in right preview mode.
 2015-09-22 16:08:56 +05:00
Nimisha Asthagiri
946102a3e0 Merge pull request #9823 from edx/mobile/xblock-rendering-api 
MA-1337 xBlock Rendering View
 2015-09-21 17:00:05 -04:00
Nimisha Asthagiri
31d5d513f8 MA-1337 xBlock Rendering View 2015-09-21 16:17:11 -04:00
Daniel Friedman
3c70af3ba8 Merge pull request #9814 from edx/dan-f/update-course-structure-api-doc 
Document child order in course structure api docs
 2015-09-21 15:16:53 -04:00
Christine Lytwynec
f96d4b7142 Manage focus on modal confirmation prompt 2015-09-21 13:36:02 -04:00
David Baumgold
03aeae4bd7 Merge pull request #8271 from edx/sass-theming 
Comprehensive Theming
 2015-09-21 10:55:18 -04:00
Awais Jibran
13e8761aa4 In cohort courses, student progress pages differ from the grade report. 
TNL-3204
 2015-09-18 23:43:26 +05:00
Muhammad Ammar
edf88962b5 Merge pull request #9534 from edx/ammar/update-factory-boy 
Update factory_boy
 2015-09-18 19:04:48 +05:00