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
05cd3316d3
Fix pre-existing pylint errors. Diff-quality won't let me move the file otherwise.
2015-05-14 16:03:50 -04:00
Ned Batchelder
7c704f3959
Move xmodule_modifiers.py to openedx/core/lib/xblock_utils.py
2015-05-14 16:03:50 -04:00
Sarina Canelake
25eb6942b6
Merge pull request #8051 from edx/sarina/add-flaky-TNL-2199
...
Add flaky test decorator (TNL-2199)
2015-05-14 15:26:43 -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
Sarina Canelake
f3f0f08422
Add flaky test decorator (TNL-2199)
2015-05-14 12:10:42 -04:00
David Baumgold
57143d60de
Merge pull request #8050 from edx/db/remove-ie9-rule-limit-comment
...
Remove outdated comment referencing IE9 rule limit
2015-05-14 12:08:48 -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
Sarina Canelake
269432ae34
Merge pull request #8033 from caijim/patch-2
...
Update AUTHORS
2015-05-13 17:24:06 -04:00
Jim
708eb97c74
Update AUTHORS
...
adding self to authors file
2015-05-13 14:22:23 -07:00
Diana Huang
3f5b154d18
Merge pull request #8025 from edx/diana/fix-flaky-bok-choy-test
...
Catch BSON errors as well as PyMongo errors when emitting MongoDB events.
2015-05-13 16:13:02 -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
Diana Huang
362c632ad7
Catch BSON errors as well as PyMongo errors when emitting
...
MongoDB events.
TNL-2035
2015-05-13 12:21:53 -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
