Sarina Canelake
|
53e2f2ee13
|
Merge pull request #8392 from edx/sarina/20150605-update-translations
Update translations (autogenerated message)
|
2015-06-05 14:43:38 -04:00 |
|
Greg Price
|
6c2df96c5f
|
Merge pull request #8372 from edx/gprice/discussion-api-follow-thread
Add ability to follow a thread in discussion API
|
2015-06-05 14:12:29 -04:00 |
|
Adam
|
ef5cd63cf2
|
Merge pull request #8345 from edx/adam/time-imports
time how long imports take in datadog
|
2015-06-05 13:52:55 -04:00 |
|
Sarina Canelake
|
c64567045a
|
Update translations (autogenerated message)
|
2015-06-05 13:52:52 -04:00 |
|
Greg Price
|
9ff8749716
|
Add ability to follow a thread in discussion API
|
2015-06-05 13:20:57 -04:00 |
|
Nimisha Asthagiri
|
65bcc50e9b
|
Merge pull request #8240 from edx/mobile/render_xblock
MA-722 Render xBlock API
|
2015-06-05 12:13:05 -04:00 |
|
Nimisha Asthagiri
|
d240785b17
|
MA-722 Render xBlock API Support
|
2015-06-05 11:18:48 -04:00 |
|
Ben Patterson
|
8d1651cc19
|
Merge pull request #8381 from edx/benp/flaky-milestones-jun2015
Flag test as flaky. SOL-449
|
2015-06-05 09:16:42 -04:00 |
|
Ben Patterson
|
03c0159029
|
Merge pull request #8368 from edx/benp/flag-flaky-import-export
Flag test as flaky.
|
2015-06-05 09:15:46 -04:00 |
|
AlasdairSwan
|
c820ae146a
|
Merge pull request #8374 from edx/alasdair/ECOM-1684-new-footer-style-updates
ECOM-1684 updated footer styles in line with Marketing requests
|
2015-06-05 08:05:29 -04:00 |
|
Ahsan Ulhaq
|
db36c4439d
|
Merge pull request #8230 from edx/ahsan/ECOM-1555-Set-up-Credit-Provider-model
Set up Credit Provider Model
|
2015-06-05 14:27:15 +05:00 |
|
Ahsan Ulhaq
|
5f74a1406e
|
Set up Credit Provider Model
Update credit Provider model and register in admin
ECOM-1555
|
2015-06-05 12:25:02 +05:00 |
|
Matt Drayer
|
60b73b48aa
|
Merge pull request #8361 from edx/asadiqbal08/SOL-946
SOL-946
|
2015-06-04 21:11:12 -04:00 |
|
Matt Drayer
|
dc5f650338
|
Merge pull request #8371 from edx/mattdrayer/SOL-953
mattdrayer/SOL-953: Remove Mako UNDEFINED overrides
|
2015-06-04 21:10:52 -04:00 |
|
Greg Price
|
ec088193e4
|
Merge pull request #8376 from edx/release
Merge release to master
|
2015-06-04 21:03:02 -04:00 |
|
Ben Patterson
|
4e39799f49
|
Flag test as flaky. SOL-449
|
2015-06-04 20:16:26 -04:00 |
|
Ben Patterson
|
8e37e68c3f
|
Flag test as flaky. TNL-2386
|
2015-06-04 19:20:31 -04:00 |
|
srpearce
|
d4b99561d1
|
Merge pull request #8326 from edx/sylvia/docs/SOL_ECOM
Sylvia/docs/sol ecom
|
2015-06-04 17:35:03 -04:00 |
|
Matt Drayer
|
803a73fdad
|
mattdrayer/SOL-953: Remove Mako UNDEFINED overrides
|
2015-06-04 16:56:24 -04:00 |
|
asadiqbal
|
815e408055
|
asadiqbal08/SOL-946: Remove default value for course title override
|
2015-06-04 16:28:52 -04:00 |
|
Sarina Canelake
|
44dfecf706
|
Merge pull request #8167 from itsjeyd/tim/TNL-1652
Instructor Dashboard: Add functionality for obtaining list of students who may enroll in a course but haven't signed up yet
|
2015-06-04 16:13:51 -04:00 |
|
Greg Price
|
399bcc28a0
|
Merge pull request #8365 from edx/hotfix/2015-06-04
Enable VAL URLs even when mobile API is disabled
|
2015-06-04 16:05:24 -04:00 |
|
AlasdairSwan
|
a819f5f389
|
ECOM-1684 updated footer styles in line with Marketing requests
|
2015-06-04 15:40:29 -04:00 |
|
Tim Krones
|
f711a32e3d
|
TNL-1652: Allow instructors to obtain CSV file listing students who may
enroll in a course but have not signed up yet.
|
2015-06-04 20:50:04 +02:00 |
|
Greg Price
|
298ba727bd
|
Merge pull request #8311 from edx/gprice/discussion-api-edit-thread
Add thread editing to discussion API
|
2015-06-04 13:51:08 -04:00 |
|
Greg Price
|
59f72b554f
|
Enable VAL URLs even when mobile API is disabled
JIRA: MA-799
|
2015-06-04 12:56:22 -04:00 |
|
Sarina Canelake
|
bdd51e6779
|
Merge pull request #8370 from edx/sarina/add-tim
Add Tim Krones to AUTHORS.
|
2015-06-04 12:49:51 -04:00 |
|
Tim Krones
|
b590a6271d
|
Add Tim Krones to AUTHORS.
|
2015-06-04 12:48:08 -04:00 |
|
Peter Fogg
|
a9187e81c5
|
Merge pull request #8339 from edx/peter-fogg/teams-header
Implement teams header component
|
2015-06-04 12:45:09 -04:00 |
|
Piotr Mitros
|
b58f0b4de8
|
Merge pull request #8369 from edx/hotfix-2015-06-03-redux
Fixed Recommender XBlock uploads
|
2015-06-04 12:25:52 -04:00 |
|
swdanielli
|
ea8aa99a7b
|
handle more exceptions for file uploading
|
2015-06-04 12:22:29 -04:00 |
|
Xiaolu Xiong
|
4f45839211
|
Merge pull request #8325 from beardeer/master
Merge pull request #8325 from beardeer/edx-platform
|
2015-06-04 11:45:15 -04:00 |
|
Daniel Friedman
|
8dfb774565
|
Merge pull request #8336 from edx/dan-f/expose-edxnotes-interface-setting
Add support for public/internal edx-notes-api endpoints
|
2015-06-04 11:32:33 -04:00 |
|
Adam
|
5952906e72
|
Merge pull request #8349 from edx/adam/fix-capa-devstack
disable contracts that were breaking capa problems on devstack (TNL-2…
|
2015-06-04 11:22:17 -04:00 |
|
Peter Fogg
|
ebafdb1d03
|
TNL-1900 Implement teams header component
|
2015-06-04 11:01:18 -04:00 |
|
Greg Price
|
73d891313a
|
Add thread editing to discussion API
This is done via PATCH on a thread instance endpoint.
|
2015-06-04 10:56:43 -04:00 |
|
Jim Abramson
|
373d948c8b
|
Merge pull request #8356 from edx/jsa/xcom-388
Add tests for enrollment deactivation under various modes.
|
2015-06-04 10:48:12 -04:00 |
|
David Baumgold
|
32749a661a
|
Merge pull request #8351 from edx/learners-dont-need-to-be-lean
Learners don't need to be lean
|
2015-06-04 10:43:27 -04:00 |
|
Calen Pennington
|
7c0709ce5b
|
Merge pull request #8322 from cpennington/document-read-metrics
Add metrics around all split-mongo database operations measuring coun…
|
2015-06-04 10:08:10 -04:00 |
|
David Baumgold
|
37064cf191
|
Learners don't need to be lean
|
2015-06-04 09:42:27 -04:00 |
|
jsa
|
445a0c938b
|
Add tests for enrollment deactivation under various modes.
A bug with the creation of inactive honor enrollment modes was caught and fixed along the way.
XCOM-388
|
2015-06-04 09:40:54 -04:00 |
|
Kevin Falcone
|
8f016414f9
|
Merge pull request #8348 from edx/release-2015-06-02-conflict
Release 2015 06 02 conflict
|
2015-06-04 09:20:12 -04:00 |
|
Xiaolu Xiong
|
a4b4e27427
|
add Xiaolu's name
|
2015-06-04 08:31:14 -04:00 |
|
Xiaolu Xiong
|
aa1bca6b41
|
Change the misleading doc string (str doesn't has attr 'name' )
|
2015-06-04 08:30:38 -04:00 |
|
Sarina Canelake
|
1c1484071e
|
Merge pull request #8359 from edx/colinfredricks/doc-2044
Fixing typo in default numerical problem
|
2015-06-04 08:18:22 -04:00 |
|
frances botsford
|
446e2aa7f3
|
Merge pull request #7859 from edx/frances/teams-ux
UX templates for Teams
|
2015-06-04 08:07:05 -04:00 |
|
Colin-Fredericks
|
8e440d77f6
|
Adding myself to AUTHORS
|
2015-06-04 07:14:49 -04:00 |
|
Colin-Fredericks
|
cc2d4cad01
|
DOC-2044 Fixing factor-of-ten error
|
2015-06-04 07:14:28 -04:00 |
|
Calen Pennington
|
94185e9c6f
|
Add metrics around all split-mongo database operations measuring count, duration, and approximate size
[PLAT-645]
|
2015-06-04 07:12:45 -04:00 |
|
Awais Jibran
|
c1807c66d6
|
Merge pull request #8216 from edx/aj/tnl2159-studio-grade-range-bug
Unconsistant view in Overall Grade Range
|
2015-06-04 15:48:23 +05:00 |
|