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

11977 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
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
Christine Lytwynec
d3fefa5978 Merge pull request #9866 from edx/clytwynec/update-bokchoy 
Update bok-choy version to v0.4.5
 2015-09-30 11:17:07 -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
Christine Lytwynec
9387b60746 skip test_can_delete_unused_content_group due to flakiness 2015-09-30 10:12:54 -04:00
Christine Lytwynec
b84f35349a update bok-choy version to v0.4.5 2015-09-30 10:12:54 -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
Ned Batchelder
7b435e603b Merge pull request #9953 from edx/ned/drf-data-change 
DRF 3.1 now uses request.data instead of request.DATA
 2015-09-29 16:21:20 -04:00
Ned Batchelder
817347f7d3 Merge pull request #9939 from edx/ned/fix-broken-mocks 
Added autospec=True to mocks being used incorrectly.
 2015-09-29 15:44:56 -04:00
Ned Batchelder
8ec2de9359 DRF 3.1 now uses request.data instead of request.DATA 2015-09-29 15:25:55 -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
Adam
b2f1855e53 Merge pull request #9943 from edx/revert-9760-mushtaq/tnl3252-fix-mathjax-rendering 
Revert "Fix Mathjax rendering bug"
 2015-09-29 11:37:58 -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
Bill DeRusha
14e1ef13fe Merge pull request #9865 from edx/bderusha/segment-version-bump 
Bump version of segemnt's analytics-python package to 1.1.0
 2015-09-29 09:33:49 -04:00
Calen Pennington
64f3229ce0 Fix tests revealed to be in error by autospec. 2015-09-29 09:30:38 -04:00
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
Ned Batchelder
60c2e45fbc Added autospec=True to mocks being used incorrectly. 
The tests now fail!
 2015-09-29 06:56:30 -04:00
Saleem Latif
abfa6d9ad1 Line breaks in signatory title issue fixed 2015-09-29 12:38:58 +05: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
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
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
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
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
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
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
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
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
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
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
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
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
Bill DeRusha
d75a36a347 Merge pull request #9853 from edx/bderusha/mailchimp-sync 
Add mailchimp list fields and config for new users
 2015-09-23 12:44:57 -04:00
Syed Hassan Raza
3849a8fa81 prevent delete public oprhans 2015-09-23 05:53:42 -07:00
Saleem Latif
05a72486f3 date format "Monday at 3pm UTC" added for courses starting with-in 5 days 2015-09-23 12:17:08 +05:00
Sarina Canelake
d8d49f7544 Merge pull request #9606 from Colin-Fredericks/ColinF-PC-not-dropdown 
TNL-3197 Partial Credit (not Dropdown)
 2015-09-22 15:10:13 -04:00
Jim Abramson
358f8056dd Merge pull request #9345 from open-craft/smarnach/enrollment-api 
Allow staff users to request a list of courses a student is enrolled in via the Enrollment API.
 2015-09-22 13:22:50 -04:00