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

30130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Zoldak
b070d4397e Merge pull request #7990 from edx/revert-7862-markhoeber-doc1820 
Revert "Adds preferences API and updates users to V1"
 2015-05-11 14:00:10 -04:00
Ben Patterson
937a16e589 Revert "Adds preferences API and updates users to V1" 2015-05-11 12:31:38 -04:00
David Ormsbee
69af4113c2 Merge pull request #7979 from edx/ormsbee/new_relic_xb_tx_reporting 
Customize the transaction name sent to New Relic for XBlock handlers.
 2015-05-11 11:06:47 -04:00
Mark Hoeber
00184b83af Merge pull request #7862 from edx/markhoeber-doc1820 
Adds preferences API and updates users to V1
 2015-05-11 10:43:10 -04:00
Mark Hoeber
14ea62b3ec User preferences API doc 2015-05-11 10:42:35 -04:00
David Ormsbee
894728d78c Merge pull request #7928 from mcgachey/mcgachey-score-event 
[LTI Provider] Adding signals for scoring events
 2015-05-11 10:01:45 -04:00
David Baumgold
3067e8e9c8 Merge pull request #7976 from edx/update-ease 
Update ease to 0.1.3
 2015-05-11 09:30:40 -04:00
Phil McGachey
73b854e4f0 [LTI Provider] Adding signals for scoring events 2015-05-11 07:45:50 -04:00
Carson Gee
38b61fd86f Merge pull request #7699 from mitocw/feature/cg/ccx_settings 
Add CCX/IDDE configuration to yaml_config.py
 2015-05-08 18:14:03 -04:00
David Ormsbee
f1f34b5ddf Customize the transaction name sent to New Relic for XBlock handlers. 
Currently, all XBlock/XModule handlers are lumped together in the
same transaction (courseware.module_render:handle_xblock_callback).
This makes it difficult to pinpoint problems with specific handlers.
With this change, the transaction name will now look like:

  OpenAssessmentBlockWithMixins.save_submission
  CapaDescriptorWithMixins.xmodule_handler/problem_show
 2015-05-08 16:53:01 -04:00
Will Daly
0f634bb6a3 Merge pull request #7971 from edx/will/verification-status-admin-updates 
Updates to the verify student Django admin.
 2015-05-08 16:07:36 -04:00
David Baumgold
e33d267e0a Update ease to 0.1.3 2015-05-08 14:39:35 -04:00
Adam
58b34e1cc4 Merge pull request #7974 from edx/merge-release-to-master 
Merge release to master
 2015-05-08 14:24:14 -04:00
Christine Lytwynec
08993aead6 Merge pull request #7959 from edx/clytwynec/split_lms_unittests_into_shards 
Clytwynec/split lms unittests into shards
 2015-05-08 14:19:25 -04:00
Sarina Canelake
435b75b194 Merge pull request #7980 from edx/sarina/20150508-translations-update 
Update translations (autogenerated message)
 2015-05-08 13:58:23 -04:00
Sarina Canelake
e784a43487 Update translations (autogenerated message) 2015-05-08 13:57:58 -04:00
Feanil Patel
219b9a0cc6 Merge pull request #7842 from edx/feanil/update_celery 
Update to the latest version of celery, and django-celery.
 2015-05-08 13:41:18 -04:00
Ben Patterson
fa2b84d95d Merge pull request #7968 from edx/benp/fix-cohort-flakiness 
Ensure cohort management section has loaded.
 2015-05-08 13:01:31 -04:00
Will Daly
4f156dc08f Updates to the verify student Django admin. 
* Ensure that VerificationStatus is append-only and immutable.
* Allow searching by student for verification status.
* Properly pluralize verification status.
* Use ConfigModelAdmin for ICRV config model admin.
 2015-05-08 12:48:48 -04:00
Martyn James
2b6ad20fa6 Merge pull request #7908 from edx/mjames/SOL-833 
Move location identifying strings into index (SOL-833)
 2015-05-08 12:38:34 -04:00
Feanil Patel
e0acd7151e Update ora2 to the latest release. 2015-05-08 12:19:40 -04:00
Martyn James
552c0bc734 Move location identifying strings into index 2015-05-08 11:29:07 -04:00
Will Daly
bd1e7a4167 Merge pull request #7969 from edx/will/update-icrv-sha 
Update in-course reverification XBlock SHA in requirements.
 2015-05-08 10:49:28 -04:00
Adam Palay
8243d934e4 Merge remote-tracking branch 'origin/release' into merge-release-to-master 
Conflicts:
	common/test/acceptance/tests/video/test_video_times.py
 2015-05-08 10:23:04 -04:00
David Ormsbee
e3e2284c94 Merge pull request #7967 from edx/ormsbee/update_djt_mongo 
Update django-debug-toolbar-mongo to work with DJDT 1.x
 2015-05-08 10:07:20 -04:00
Ben Patterson
609feaae71 Ensure cohort management section has loaded. 
TNL-2120, TE-849

The parent .cohort-management class was loading faster than its children (which makes sense). However,
flakiness existed on these tests because browser actions were depending on child elements that had not
painted yet.

Tested this using chrome with no X11 forwarding for extra speed. That exposed the ajax call
as well as the sub-class rendering issues.
 2015-05-08 09:04:42 -04:00
Feanil Patel
6289b190d9 Fix pep8 and pylint. 2015-05-08 09:01:50 -04:00
Feanil Patel
4cc39abfa4 Update celery config for config files I missed. 2015-05-08 09:01:50 -04:00
Feanil Patel
3d7a6d8b90 Fix for when celery runs in eager mode. 
When celery runs in eager mode, there is a bug and an exception
is not thrown when using retry logic. A PR to fix the bug can
be found here: https://github.com/celery/celery/pull/2607

In the mean time, we have to deal with the fact that in eager mode
celery will not throw the exception but simply return it. So we
raise it ourselves.
 2015-05-08 09:01:50 -04:00
Feanil Patel
e4aa91d510 Remove the mock, it doesn't seem like it's needed. 2015-05-08 09:01:49 -04:00
Feanil Patel
3b2a750d33 Update the cache backend for the new version of celery and djcelery. 2015-05-08 09:01:49 -04:00
Feanil Patel
95c240d576 Fix a bug in the failure increment. 2015-05-08 09:01:49 -04:00
Feanil Patel
27223ae80f Load celery for CMS as well. 2015-05-08 09:01:48 -04:00
Feanil Patel
34df5a32d2 Get LMS tests passing. 2015-05-08 09:01:48 -04:00
Feanil Patel
dae643bee2 Update ora2 to match the new version of celery. 2015-05-08 09:01:43 -04:00
Christine Lytwynec
4f71158057 Merge pull request #7963 from edx/clytwynec/TE-868 
skip test that are causing incorrect pep8 reports in jenkins builds
 2015-05-08 08:54:24 -04:00
Feanil Patel
975f17968d Update to the latest version of celery, and django-celery. 
Changelog for 3.1 can be found here:
  http://celery.readthedocs.org/en/latest/whatsnew-3.1.html

Changelog from 3.1.0 to 3.1.18 can be found here:
  http://celery.readthedocs.org/en/latest/changelog.html
 2015-05-08 08:25:18 -04:00
Shrhawk
7b53584653 Merge pull request #7621 from edx/shr/bug/TNL-1858-Unable-to-delete-studio-page 
Delete static_tab for split courses raises 500 error
 2015-05-08 15:06:03 +05:00
Waheed Ahmed
710bb2342e Merge pull request #7960 from edx/waheed/ora-release-tag-updated 
Updated ora release tag.
 2015-05-08 12:56:39 +05:00
Waheed Ahmed
4270854ebc Updated ora release tag. 2015-05-08 11:59:44 +05:00
Aamir
17222bfa7c Merge pull request #7864 from edx/aamir-khan/ECOM-1476-send-email-on-reverification 
ECOM-1476: sending email on software secure response initial work
 2015-05-08 11:22:49 +05:00
Martyn James
06c152c1d8 Merge pull request #7914 from edx/mjames/SOL-825_6 
Exclude filtering for microsite orgs
 2015-05-07 22:50:10 -04:00
Clinton Blackburn
6577bb3bd6 Merge pull request #7950 from edx/clintonb/update-verify-now 
Updated Take Photo page to include verification requirements
 2015-05-07 22:46:28 -04:00
Will Daly
c86555266c Update in-course reverification XBlock SHA in requirements. 2015-05-07 22:02:39 -04:00
Martyn James
fb51c6abd3 Exclude filtering for micorosite orgs 2015-05-07 21:39:07 -04:00
David Ormsbee
c2b1c95322 Update django-debug-toolbar-mongo to work with DJDT 1.x 
The version of django-debug-toolbar-mongo we have installed does
not support our version of Django Debug Toolbar. The author did
accept a patch that supports the latest version, but has not
published it to PyPI. This just grabs it from the github commit
instead.

Note: This will not uninstall your old version. If the MongoDB info
is not showing up for you in DJDT, try manually uninstalling with:

  pip uninstall django-debug-toolbar-mongo

Running "paver lms" after that should install the right thing.
 2015-05-07 20:13:50 -04:00
Clinton Blackburn
fc61c292b9 Updated Take Photo page to include verification requirements 
As part of the unification of verify later/now, the take photo page needs to list the verification requirements.

XCOM-254
 2015-05-07 18:14:33 -04:00
Greg Price
822a2ce8ef Merge pull request #7936 from edx/gprice/discussion-api-thread-list-query-group 
Add params to CS query in thread list endpoint
 2015-05-07 18:04:23 -04:00
Adam
7c59a3af64 Merge pull request #7964 from edx/hotfix/2015-05-07 
prevent overly nesting _field_data (TNL-2050)
 2015-05-07 16:47:38 -04:00
Greg Price
603eae65d8 Add params to CS query in thread list endpoint 
The thread list endpoint needs to restrict the set of threads it
retrieves if the course is cohorted and the user is not privileged.
This also adds an explicit default sort (by most recent activity).
 2015-05-07 15:59:23 -04:00