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

30188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christine Lytwynec
aee3281d4d clean up all-tests.sh script 2015-05-14 11:20:21 -04:00
Christine Lytwynec
b328a2e893 Merge pull request #8029 from edx/clytwynec/all-tests-exit-status 
add exit status back
 2015-05-13 15:09:01 -04:00
AlasdairSwan
905309a6fb Merge pull request #7995 from edx/alasdair/ECOM-986-the-wayward-caret 
ECOM-986 updated class being used by JS for carats to use classes bei…
 2015-05-13 14:53:13 -04:00
Kyle McCormick
887c4f4522 Merge pull request #8028 from edx/kyle/add-to-author-file 
add self to author file
 2015-05-13 14:36:11 -04:00
Christine Lytwynec
5b8482f345 add exit status back 2015-05-13 14:27:23 -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
Kyle McCormick
f0dcf7e213 add self to author file 2015-05-13 13:30:18 -04:00
Ned Batchelder
c2772e4aac Merge pull request #8026 from edx/ned/tweak-contributing 
Add pointers to guidelines of specific concern.
 2015-05-13 12:36:39 -04:00
Jesse Zoldak
b34a48f09a Merge pull request #8023 from edx/zoldak/update-bok-choy 
Update bok-choy version to the latest release
 2015-05-13 12:30:20 -04:00
Ned Batchelder
b5fbf853c7 Add pointers to guidelines of specific concern. 2015-05-13 11:21:16 -04:00
Adam
788991629d Merge pull request #7991 from edx/adam/update-release-py 
add troubleshooting for logging into stage to release script
 2015-05-13 11:13:25 -04:00
Adam Palay
6d02beeff9 add troubleshooting for logging into stage to release script 2015-05-13 10:20:20 -04:00
Jesse Zoldak
e15590d28a Update bok-choy version to the latest release 2015-05-13 10:12:27 -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
Brian Talbot
0550e39516 Studio: moving shared/redundant Sass partial calls to _build.scss partial 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
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
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
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
Adam
3643036f5c Merge pull request #8001 from cpennington/re-add-metrics-mixin 
Add MetricsMixin back into DescriptorSystem and ModuleSystem
 2015-05-12 10:25:16 -04:00
Calen Pennington
1eb040f4ff Add MetricsMixin back into DescriptorSystem and ModuleSystem 2015-05-12 10:23:31 -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
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
90f7a0103f Merge pull request #7989 from edx/adam/more-grading-logging 
add more logging to grading
 2015-05-11 15:36:37 -04:00