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

10929 Commits

Author SHA1 Message Date
Brian Talbot
220b8d1cdb LMS: removing conditional search Sass logic + simplifying _build-*.scss files 2015-05-12 22:13:31 -04:00
Brian Talbot
24673aa128 LMS: moving shared/redundant Sass partial calls to _build-*.scss partials 2015-05-12 22:03:43 -04:00
Greg Price
608ca88f0e Merge pull request #8007 from edx/gprice/discussion-api-thread-list-fix-type 
Fix type field in thread list endpoint
 2015-05-12 15:02:04 -04:00
Greg Price
1f03a4df95 Merge pull request #7966 from edx/gprice/discussion-api-thread-list-more-fields 
Add fields to threads returned by Discussion API thread list endpoint
 2015-05-12 13:45:18 -04:00
Brian Talbot
898012518b LMS: removing manual Sass/CSS extend files needed for IE9 and below 2015-05-12 10:36:32 -04:00
Chris Rodriguez
709f86c11b Addressing RTL inconsistencies on Verification process 2015-05-12 07:20:32 -04:00
Greg Price
6189cf9b41 Fix type field in thread list endpoint 
The API's type field should come from the CS data's thread_type field,
not its type field, which distinguishes comments from threads.
 2015-05-11 16:07:07 -04:00
Greg Price
7ce579c274 Add group fields to thread list endpoint 2015-05-11 15:59:35 -04:00
Greg Price
b1a9d33472 Add authorship data to thread list endpoint 2015-05-11 15:59:34 -04:00
Greg Price
fa6e5338c2 Add fields to discussion thread list endpoint 
This commit adds fields that are related to the requesting user's
interaction with the thread (e.g. following).
 2015-05-11 15:59:34 -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
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
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
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
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
552c0bc734 Move location identifying strings into index 2015-05-08 11:29:07 -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
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
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
Martyn James
fb51c6abd3 Exclude filtering for micorosite orgs 2015-05-07 21:39:07 -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
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
Martyn James
2f398559ae Merge pull request #7845 from edx/mjevtic/SOL-776 
(SOL-776)(SOL-740)(SOL-532) Prerequisites for course discovery feature
 2015-05-07 14:05:38 -04:00
Adam Palay
afec81b662 prevent overly nesting _field_data (TNL-2050) 2015-05-07 14:05:27 -04:00
Christine Lytwynec
56580510ea add lettuce features to the omitted directories in coveragerc files 2015-05-07 11:50:02 -04:00
aamir-khan
a975b8384c ECOM-1476: sending email on software secure response initial work 2015-05-07 18:56:49 +05:00
Christine Lytwynec
ddb1ae667e Split lms unittests into multiple shards 2015-05-07 09:17:26 -04:00
Gabe Mulley
411df0ae3a Merge pull request #7802 from edx/gabe/user-track 
Make user_track use eventtracking
 2015-05-07 08:43:21 -04:00
Jim Abramson
56d380c812 Merge pull request #7954 from edx/jsa/xcom-270 
add custom PayPal payment button and js tests for buttons.
 2015-05-07 08:15:34 -04:00
Clinton Blackburn
19d0eda60c Merge pull request #7952 from edx/clintonb/paypal-receipt 
Hiding Billing Address for Orders without Billing Addresses
 2015-05-07 08:07:09 -04:00
Jim Abramson
2a449ade58 Merge pull request #7938 from edx/jsa/xcom-287 
fix ecommerce api calls in verify_student and add tests.
 2015-05-07 08:03:39 -04:00
marjev
8107073c58 (SOL-776)(SOL-740)(SOL-532) Added setting flags for COURSE DISCOVERY feature; Exposed course search input as well as the course result page; Added flag for limiting the number of course cards on the homepage; 2015-05-07 08:57:04 +02:00
zubair-arbi
ede1c70ed8 Merge pull request #7944 from edx/zub/bugfix/ecom-1470-photo-verification-heading 
change photo reverification page heading from h3 to h1
 2015-05-07 11:52:54 +05:00
jsa
cc1c7d5012 fix ecommerce api calls in verify_student and update tests. 
XCOM-287
 2015-05-06 23:44:25 -04:00
Gabe Mulley
4a8b0c5ef5 Make user_track use eventtracking 2015-05-06 20:57:46 -04:00
jsa
a5c9d0b0f3 add custom PayPal payment button and js tests for buttons. 
XCOM-270
 2015-05-06 19:01:56 -04:00
Clinton Blackburn
7c75b34baf Hiding Billing Address for Orders without Billing Addresses 
Some orders, specifically those paid for with PayPal, do not have a billing address. This information will not be rendered in such cases.
 2015-05-06 15:43:44 -04:00