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

10956 Commits

Author SHA1 Message Date
christopher lee
5cef287c5d MA-635 Block Mobile Content for unfulfilled milestones 
Previously, the mobile api did not check for pre-requisite courses
or entrance exams. This change checks for these milestones and then
returns course content accordingly.
 2015-05-15 09:39:54 -04:00
Jim Abramson
36060f3f9b Merge pull request #8053 from edx/jsa/xcom-1606 
Update ecommerce-api-client and add regression test for XCOM-1606
 2015-05-14 17:36:02 -04:00
jsa
31a232edc7 Update ecommerce-api-client and add regression test for XCOM-1606 2015-05-14 16:54:56 -04:00
Ned Batchelder
b98d85fda0 Merge pull request #7943 from edx/ned/move-xmodule-modifiers 
Move xmodule_modifiers.py to openedx/xblock
 2015-05-14 16:51:46 -04:00
Ned Batchelder
7c704f3959 Move xmodule_modifiers.py to openedx/core/lib/xblock_utils.py 2015-05-14 16:03:50 -04:00
Christina Roberts
161d89a723 Merge pull request #8045 from edx/clrux/new-extend-for-outline 
Moving no-outline use to be more global
 2015-05-14 12:54:43 -04:00
Christina Roberts
3f2c370d58 Merge pull request #7923 from edx/christina/show-notes 
Tags Tab in Student Notes
 2015-05-14 12:30:38 -04:00
Brian Talbot
4f9c50e226 Merge pull request #8047 from edx/talbs/fix-lms-dupe-sass-base 
LMS: removing redundant Sass base/base partial call in build compile
 2015-05-14 12:30:12 -04:00
David Baumgold
930b4f6a7a Remove outdated comment referencing IE9 rule limit 2015-05-14 11:56:14 -04:00
Chris Rodriguez
d5d7fbf786 Moving no-outline use to be more global 2015-05-14 11:48:37 -04:00
cahrens
abd25b8b45 Add a "tags" view in student notes. 
TNL-1926
 2015-05-14 11:36:48 -04:00
Brian Talbot
8ad01535b5 LMS: removing redundant Sass base/base partial call in build compile 2015-05-14 10:47:05 -04:00
AlasdairSwan
8d0ac31e38 ECOM-986 updated class being used by JS for carats to use classes being loaded on the page via lms-style-course-vendor.css 2015-05-13 13:38:29 -04:00
Diana Huang
ac8b75ca7f Merge pull request #7804 from edx/diana/progress-summary-refactor 
Implement the Weighted Problem Grade Report
 2015-05-13 09:10:02 -04:00
Adam
9115960eac Merge pull request #8013 from edx/merge-release-into-master 
Merge release into master
 2015-05-13 08:39:23 -04:00
Daniel Friedman
3acd7a008c Refactor and add tests for new grade report. 
* Handle grading errors
 2015-05-13 06:58:02 -04:00
Brian Talbot
806e2b3901 Merge pull request #7985 from edx/talbs/sass-build-files 
LMS/Studio: Sass Build Files to Reduce Compilation Redundancy
 2015-05-13 05:33:43 -04:00
Awais Qureshi
b8efb5423a Merge pull request #7951 from edx/awais786/ECOM-1531-fake-page-ssecure 
ECOM-1531 adding the fake-page for softwar secure.
 2015-05-13 12:02:32 +05:00
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
Daniel Friedman
84f3c33df7 Address doc review 2015-05-12 16:32:01 -04:00
Daniel Friedman
67fdca1847 Monitor performance through datadog 2015-05-12 16:32:01 -04:00
Andy Armstrong
2fafaec053 Implement grade report analytics 
TNL-1988
 2015-05-12 16:32:01 -04:00
Daniel Friedman
9269ec3b00 Add new instructor task for weighted problems 2015-05-12 16:32:00 -04:00
Diana Huang
9c32b1e878 Refactor course_structure_api to have separate 
API Layer.
 2015-05-12 16:32:00 -04:00
Diana Huang
7df9ab9c14 Extend the Score namedtuple to know about module locations. 2015-05-12 16:32:00 -04:00
Adam Palay
42fb7bd6cb Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/github.txt
 2015-05-12 15:13:28 -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
Awais
58b7e7fb33 ECOM-1531 adding the fake-page for softwar secure. 2015-05-12 14:21:49 +05: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
Adam Palay
801ee67e63 add more logging to grading 2015-05-11 11:55:55 -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