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

11992 Commits

Author SHA1 Message Date
Calen Pennington
ac507c3d22 Upgrade AboutItemSemantics test to verify for all direct-only categories 2015-10-02 12:51:50 -04:00
Calen Pennington
a7c7ceb975 Use super(...) to call delete_item from split_draft.py 2015-10-02 12:51:50 -04:00
Calen Pennington
f19605af1a Use a clearer error message when split is unable to delete an XBlock 2015-10-02 12:51:50 -04:00
Calen Pennington
6da7bff185 Allow test_mixed_modulestore to be run without django setup 2015-10-02 12:51:49 -04:00
Calen Pennington
92eadf1afb Delete DIRECT_ONLY_CATEGORIES from published and draft branches. 
This fixes https://openedx.atlassian.net/browse/PLAT-858.
 2015-10-02 12:51:49 -04:00
Calen Pennington
1f7082ebfe Add a test of the semantics of About items 
These are XBlocks that are detached (not part of the course content hierarchy),
and are also DIRECT_ONLY_CATEGORIES (meaning they are always autopublished).

https://openedx.atlassian.net/browse/PLAT-858 identifies a bug
where an About item isn't correctly deleted in SplitDraft, and this test
reproduces that case.
 2015-10-02 12:51:40 -04:00
Calen Pennington
8267a762c0 Move *ModuleStoreBuilders into xmodule.modulestore.tests.utils 2015-10-01 16:52:39 -04:00
David Baumgold
69bc10235e Merge remote-tracking branch 'remotes/origin/release' into release-2015-10-01-resolve-merge-conflicts 2015-10-01 15:28:55 -04:00
Mushtaq Ali
42c02c8036 Merge pull request #9809 from edx/mushtaq/force-publish-command 
'force_publish' command for publishing a course forcefully by making …
 2015-10-01 22:42:54 +05:00
Peter Fogg
c67bcaefc5 Merge pull request #9948 from edx/peter-fogg/fix-team-membership-count 
Fix displaying wrong membership on "My Team" view.
 2015-10-01 12:51:32 -04:00
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
Matt Drayer
635e54918d Merge pull request #9968 from edx/asadiqbal08/SOL-1225 
SOL-1225: Pressing tab button does not takes user to next field
 2015-10-01 10:02:38 -04:00
Mushtaq Ali
11741f118f 'force_publish' command for publishing a course forcefully by making the published branch point to the same structure as the draft branch. add force_publish functionality to split courses. 2015-10-01 15:46:37 +05:00
asadiqbal
b09c20f02f SOL-1225 2015-10-01 15:12:13 +05:00
Syed Hassan Raza
42662426c3 Revert "prevent delete public oprhans" 
This reverts commit 3849a8fa81.
 2015-09-30 13:40:22 -07: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
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