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

30917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Abramson
a7ebe17dfb Merge pull request #8414 from edx/jsa/fix-deactivate-enrollment 
Jsa/fix deactivate enrollment
 2015-06-08 13:09:54 -04:00
Feanil Patel
e488896f2f Merge pull request #8409 from edx/dsego/SOL-875 
Update edx-search dependency to reference latest edx-search
 2015-06-08 13:08:50 -04:00
Feanil Patel
924bbe6b9f Update github.txt to use a tag instead of a commit 2015-06-08 13:07:14 -04:00
Adam
d0f7a08cc4 Merge pull request #8408 from edx/release 
Release
 2015-06-08 11:00:20 -05:00
Christine Lytwynec
7e19142b01 unskip acid xblock tests 2015-06-08 11:57:18 -04:00
Sarina Canelake
c9796b83a9 Merge pull request #8403 from edx/sarina/remove-redefine-django14-cors 
Use Django 1.4 @ensure_csrf_cookie method PLAT-664
 2015-06-08 11:44:25 -04:00
Carol Tong
6aa7f810f3 DOC: Finalize Help targets, sidebar text for certificates 2015-06-08 11:36:11 -04:00
Xavier Antoviaque
688d62293b Merge pull request #8406 from antoviaque/badges-migration-fix 
Default to filestorage when S3 isn't configured (aws.py) - SOL-963
 2015-06-08 17:26:21 +02:00
Diana Huang
a02b242e5e Merge pull request #8413 from edx/diana/fix-allow-multiple 
Allow multiple external_link tabs for one course.
 2015-06-08 11:09:55 -04:00
jsa
f4b2c197db don’t trigger a refund request in otto, if otto requested unenrollment. 
XCOM-396
 2015-06-08 11:07:16 -04:00
jsa
445d0dabb6 Correct deactivation logic in enrollment api and test. 
XCOM-396
 2015-06-08 11:06:52 -04:00
Diana Huang
a224d06a89 Allow multiple external_link tabs for one course. 2015-06-08 10:10:45 -04:00
Calen Pennington
69799cc1e0 Merge pull request #8344 from cpennington/update-xblock-repo 
Update XBlock dependency to use the merged commit from the edx repo
 2015-06-08 09:56:42 -04:00
Sven Marnach
5cc599af3f Bump edx-submissions hash to latest version. 
This will pull in the new get_all_submissions() interface method.
 2015-06-08 15:48:18 +02:00
Davorin Sego
40e89e6cb8 update edx-search commit reference 2015-06-08 15:31:14 +02:00
Marko Jevtic
9e30bdb2c7 (SOL-835) Addressing flakiness of the reindex acceptance test 2015-06-08 14:27:11 +02:00
Chris Dodge
e47c97b465 make courses.html also honor the ENABLE_COURSE_DISCOVERY feature flag 2015-06-08 07:46:55 -04:00
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
Zia Fazal
20800ea561 refactored code to make certificate PDF generation optional 
improved coverage

refactoring based on feedback

fixed quality violations

changes based on feedback
 2015-06-08 12:42:07 +05: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
Sarina Canelake
780ec6ee2c Allow released languages to be previewed under dark lang 2015-06-06 09:49:06 -04:00
Jonathan Piacenti
eba951fe69 Fix self-paced badge naming. 2015-06-06 13:44:35 +00:00
Sarina Canelake
e53b9c83d9 Use Django 1.4 @ensure_csrf_cookie method PLAT-664 2015-06-06 08:48:36 -04: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
Adam
f91764abbe Merge pull request #8390 from edx/hotfix/2015-06-05 
Fixed youtube video was not loading even youtube is available.
 2015-06-05 15:15:45 -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
Waheed Ahmed
f9fe00ff6c Fixed youtube video was not loading even youtube is available. 
TNL-2361
 2015-06-05 22:42:26 +05: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