Xavier Antoviaque
|
b32629d62f
|
Default to filestorage when S3 isn't configured (aws.py)
Also moves the default icons to the badges subfolder to avoid storage conflicts.
|
2015-06-08 11:30:16 +02:00 |
|
Matt Drayer
|
fd737d4dce
|
Merge pull request #8385 from edx/asadiqbal08/SOL-961
(WIP) SOL-961 Student Generated Certificate Flow shows "download" certificate
|
2015-06-07 21:45:18 -04:00 |
|
asadiqbal
|
6f0606a00b
|
asadiqbal08/SOL-961: Student-generated certificate flow shows "download" certificate button
|
2015-06-07 20:44:42 -04:00 |
|
Ben Patterson
|
f37fdaf47d
|
Merge pull request #8386 from edx/benp/lint-fix-test_import_export
Follow imports order guidelines.
|
2015-06-07 17:13:16 -04:00 |
|
Ben Patterson
|
dc4b4f9022
|
Merge pull request #8404 from edx/benp/skip-settings-test-jun2015
Skip test that has become too flaky. SOL-449.
|
2015-06-07 13:32:04 -04:00 |
|
Kevin Falcone
|
82f7238f9d
|
Merge pull request #8398 from edx/jibsheet/release-script-updates
www.stage.edx.org is our Drupal site
|
2015-06-07 11:45:02 -04:00 |
|
Ben Patterson
|
d3f7bdc1e8
|
Skip test that has become too flaky. SOL-449.
|
2015-06-07 10:43:53 -04:00 |
|
Matt Drayer
|
96c09f6bc0
|
Merge pull request #8378 from edx/mattdrayer/SOL-947
mattdrayer/SOL-947: Refactor Web/HTML certificate URL patterns
|
2015-06-07 07:45:10 -04:00 |
|
Matt Drayer
|
3e52b8fad1
|
mattdrayer/SOL-947: Refactor Web/HTML certificate URL patterns
|
2015-06-06 23:15:17 -04:00 |
|
Kelketek
|
c8b8717944
|
Merge pull request #8399 from open-craft/fix-badging-name
Fix self-paced badge naming.
|
2015-06-06 09:31:02 -05:00 |
|
Jonathan Piacenti
|
eba951fe69
|
Fix self-paced badge naming.
|
2015-06-06 13:44:35 +00:00 |
|
Greg Price
|
c5dc84f891
|
Merge pull request #8394 from edx/gprice/discussion-api-vote-thread
Add thread voting to discussion API
|
2015-06-05 23:12:41 -04:00 |
|
chrisndodge
|
6b40a6e2ab
|
Merge pull request #8393 from edx/sylvia/docs/ECommerceTabUI
Change name of section from Sales to Course Seat Purchases
|
2015-06-05 21:52:50 -04:00 |
|
Greg Price
|
37ebbc45e3
|
Add thread voting to discussion API
|
2015-06-05 16:12:54 -04:00 |
|
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 |
|
Sylvia Pearce
|
eabc4c2488
|
Change name of section from Sales to Course Seat Purchases
|
2015-06-05 14:00:46 -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
|
b7f8bd3c80
|
Follow imports order guidelines.
https://github.com/edx/edx-platform/wiki/Python-Guidelines#imports-order
Follow-up to #8368
|
2015-06-05 09:43:49 -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 |
|
Kevin Falcone
|
4a24363c33
|
www.stage.edx.org is our Drupal site
It also serves the production SSL cert (*.edx.org) meaning people who
visit www.stage.edx.org get an SSL error. Send them to stage.edx.org
instead.
|
2015-06-04 22:28:35 -04: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 |
|