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

30154 Commits

This Branch
This Branch
All Branches
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
Brian Talbot
0550e39516 Studio: moving shared/redundant Sass partial calls to _build.scss partial 2015-05-12 22:03:43 -04:00
Christina Roberts
53da306c00 Merge pull request #8010 from edx/christina/update-bok-choy 
Update version of bok-choy.
 2015-05-12 16:29:39 -04:00
Ned Batchelder
9ce9da8b1d Merge pull request #8008 from schoolyourself/schoolyourself-xblock-update 
Update schoolyourself-xblock to the latest version
 2015-05-12 16:01:47 -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
Ben Patterson
a998a3f31c Merge pull request #8005 from edx/benp/fix-cohort-mgmt-css 
Look for a consistent css class.
 2015-05-12 14:53:36 -04:00
cahrens
19c6ae1a81 Update version of bok-choy. 2015-05-12 14:43:04 -04:00
John Lee
3887bf419b Update schoolyourself-xblock to the latest version, which contains 1 commit with a cosmetic change: 5e4d37716e 2015-05-12 14:20:08 -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
Ben Patterson
07c5bbd96d Look for a consistent css class. 
The former class, while less-flaky, does not always appear. (For example, if cohorts
are being toggled off.) This css class always appears. Initial findings point to
flakiness being a non-issue if we look for this class.
 2015-05-12 13:38:05 -04:00
Brian Talbot
e60b72cf1b Merge pull request #8000 from edx/talbs/buh-bye-ie9-extends-v2 
LMS/Studio: Remove Manual Sass/CSS extend files - Take 2
 2015-05-12 12:37:41 -04:00
Brian Talbot
5e27bd229a Studio: removing manual Sass/CSS extend files needed for IE9 and below 2015-05-12 10:36:32 -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
513bb5d033 Merge pull request #7780 from edx/clrux/UX-1866-verification-rtl-fixes 
Addressing RTL inconsistencies on Verification process
 2015-05-12 10:13:10 -04:00
Mark Hoeber
15104cee43 Merge pull request #7994 from edx/revert-7990-revert-7862-markhoeber-doc1820 
Adds preferences API and updates users to V1 - fix
 2015-05-12 09:07:20 -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
Mark Hoeber
9e82d305d2 Adds preferences API and updates users to V1 with PEP8 fixes 2015-05-11 15:15:14 -04:00
Ben Patterson
9e16a80e3b Merge pull request #7978 from edx/benp/wip-fix-edxnotes-flakiness 
make edxnotes bok-choy tests chrome-friendly
 2015-05-11 15:02:49 -04:00
Ben Patterson
31e56e77ae Make edxnotes bok-choy tests chrome-friendly. 
This eliminates some flakiness related to the loading of the notes page. It also
sets the 'no content' version of that page as a separate page object so testing
that case is more explicit.

TE-849
 2015-05-11 15:02:00 -04:00
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