Commit Graph

6100 Commits

Author SHA1 Message Date
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
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
Matt Drayer
65831c887d Merge pull request #9806 from edx/ziafazal/SOL-1185
ziafazal/SOL-1185: move SOCIAL_SHARING_SETTINGS out of FEATURES
2015-09-30 14:12:33 -04:00
chrisndodge
d9a21d72fc Merge pull request #9945 from edx/cdodge/credit-status-messaging
Make the message to the end user consistent across as requirement typ…
2015-09-30 12:40:59 -04:00
David Baumgold
3f6e39054e Merge pull request #9955 from edx/partially-revert-comprehensive-theming
Remove the edx.org comprehensive theme
2015-09-30 12:17:22 -04:00
muzaffaryousaf
b2ebb680de DRF uses query_params instead of QUERY_PARAMS.
TNL-3442
2015-09-30 20:45:40 +05:00
David Baumgold
7cd9db1216 Disable some tests for comprehensive theming
Depends on functionality that has been temporarily reverted
2015-09-30 11:33:41 -04:00
David Baumgold
116ca29189 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 11:04:28 -04:00
Peter Fogg
999c5d8c70 Merge pull request #9961 from edx/peter-fogg/add-ecommerce-service-user
Reserve ecommerce service username on edx-platform.
2015-09-30 10:45:48 -04:00
Awais Qureshi
c486f857ca Merge pull request #9881 from edx/awais786/ECOM-1988-upgrade-msg-with-credit-mode
Hide upgrade message on student dashboard for credit enrollments
2015-09-30 12:51:38 +05:00
Chris Dodge
799571b213 Make the message to the end user consistent across as requirement types, except for grade requirements 2015-09-29 22:24:59 -04:00
Peter Fogg
448f4d51e6 Reserve ecommerce service username on edx-platform. 2015-09-29 17:29:55 -04:00
Ned Batchelder
8ec2de9359 DRF 3.1 now uses request.data instead of request.DATA 2015-09-29 15:25:55 -04:00
frances botsford
be0b70bd06 Merge pull request #9910 from edx/frances/invalid-cert-styles
Styles and content adjustments for invalid cert view
2015-09-29 12:23:25 -04:00
Awais
0ca586f65b If enrollment mode is credit then upgrade message should not appear.
Fixing certificates for credit mode.
ECOM-1988
2015-09-29 20:56:32 +05:00
Frances Botsford
28d09a7233 styles and content adjustments for invalid cert view 2015-09-29 11:30:48 -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