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

512 Commits

Author SHA1 Message Date
Douglas Hall
fd318e05db Merge pull request #11767 from edx/ibrahimahmed443/SOL-1691 
return course end date in credit service and rename flag
 2016-03-10 05:52:06 -05:00
erm0l0v
4142438372 add CourseTalk widget 
Move tests to one test class
 2016-03-09 13:32:07 +03:00
Ibrahim
97ef7397ce return course end date in credit service and rename flag 2016-03-08 19:12:19 +05:00
Christina Roberts
e6fcfae994 Merge pull request #11751 from edx/christina/remove-profile-name 
Remove unused profile name.
 2016-03-07 10:44:34 -05:00
cahrens
2f3e3a55bb Remove unused profile name. 
The profile name requires escaping when displayed. Proactively removing since it is not being used. Also discovered some dead code.
 2016-03-07 09:37:39 -05:00
Kevin Falcone
631bfc08a3 Migrate correctly from scratch also 
Unfortunately, instrospection.get_table_description runs
select * from course_overview_courseoverview, which of course
does not exist while django is calculating initial migrations, causing
this to fail.  Additionally, sqlite does not support information_schema,
but does not do a select * from the table.

Lift the main part of mysql's get_table_description up to the migration itself
and just inspect it directly.  Continue to call the API for sqlite.
 2016-03-04 11:46:25 -05:00
Ned Batchelder
fd4164de1d Merge pull request #11737 from edx/release 
Release ⇒ master
 2016-03-03 14:51:29 -05:00
Simon Chen
b47a6d592f ECOM-3415 make sure all the xseries programs associated with a course is displayed 2016-03-03 08:42:14 -05:00
Omar Khan
50b6bf27f2 Registration: don't require terms of service if checkbox is hidden 
Fixes test failures in e461374973
 2016-03-03 16:58:58 +07:00
Nimisha Asthagiri
a0871900e6 Merge pull request #11734 from edx/security/quiet_safe_sessions 
Quiet the safe sessions logging for expected use cases
 2016-03-02 18:01:15 -05:00
Nimisha Asthagiri
de3fca35be Quiet the safe sessions logging for expected use case 2016-03-02 14:47:44 -05:00
John Eskew
2ab54f315a Merge pull request #11669 from edx/jeskew/fix_django19_warnings 
Add app_label to models to prevent Django1.9 warnings.
 2016-03-01 17:19:55 -05:00
Ben Patterson
9e4f14f1be Revert "Registration: don't require terms of service if checkbox is hidden" 2016-02-29 12:08:09 -05:00
Omar Khan
23a0a6d41a Merge pull request #11644 from open-craft/omar/hide-tos 
Registration: don't require terms of service if checkbox is hidden
 2016-02-29 23:15:56 +07:00
Kevin Falcone
7a129b0e9f Noop the 0008 and conditional the 0009 migration 
We removed a column in the same release that we removed it
from the model.  This creates a gap where the code still looks for
a column which has been dropped until the new code has been deployed.

The initial fix was to put the column back, but that creates a window
during the alterations where views will error.

This noops the 0008 migration and effectively noops 0009 unless you've
run the old migration.
 2016-02-26 17:14:12 -05:00
Nimisha Asthagiri
33e47d317b Course Overview migrations fix: Readd the Facebook URL field. 2016-02-26 10:20:36 -05:00
John Eskew
e87bb74c22 Add app_label to models to prevent Django1.9 warnings. 2016-02-25 17:34:31 -05:00
Omar Khan
e461374973 Registration: don't require terms of service if checkbox is hidden 2016-02-24 16:18:32 +07:00
Ibrahim
c503c236a9 add student email in credit service 2016-02-22 14:45:25 +05:00
Nimisha Asthagiri
4bbe9a2021 Merge pull request #11326 from edx/mobile/remove-dead-code 
Mobile API: remove unused endpoints
 2016-02-19 15:14:13 -05:00
Usman Khalid
4be5aeb194 Merge pull request #11550 from edx/muzaffar/tnl4013 
Using display_name_with_default  instead of display_name.
 2016-02-19 17:51:27 +05:00
muzaffaryousaf
509522414a Using display_name_with_default instead of display_name. 
TNL-4103
 2016-02-19 16:50:23 +05:00
Nimisha Asthagiri
fa8ca11d8c Remove unused Mobile Social Facebook endpoint 2016-02-18 12:12:04 -05:00
M. Rehan
af9e26f5cb Merge pull request #11479 from edx/mrehan/plat-998-warnings-on-logout 
Fix - Bypass unnecessary logs on logging out.
 2016-02-17 17:46:05 +05:00
Qubad786
faf3a64e36 Bypass unnecessary logs on loging out 2016-02-17 13:42:01 +05:00
Simon Chen
4b8a737168 Merge pull request #11553 from edx/schen/ECOM-3640 
ECOM-3640 add a new info log message on program certificate task to mark successful task completion
 2016-02-16 10:58:38 -05:00
Toby Lawrence
9654449302 Merge pull request #11465 from edx/perf/speed-up-courseware-tests 
Switch to SharedModuleStoreTestCase in the 'courseware' app where possible.
 2016-02-16 10:06:53 -05:00
Simon Chen
2f595c111f ECOM-3640 add a new info log message on program certificate task to mark successful task completion 2016-02-16 14:48:55 +00:00
Toby Lawrence
49d3a7d35d More quality fixes. 2016-02-16 07:58:33 -05:00
Saleem Latif
cd101d5dec Merge pull request #11494 from edx/saleem-latif/WL-307 
WL-307: correct FAVICON_PATH setting for comprehensive theming
 2016-02-16 14:39:13 +05:00
Toby Lawrence
ead2f0477b Quality fixes. 2016-02-15 21:18:53 -05:00
Saleem Latif
75f17ecc8e correct FAVICON_PATH setting for comprehensive theming 2016-02-15 17:13:19 +05:00
Jim Abramson
f71e7cac93 adjust comment about program certification retry 2016-02-12 14:59:25 -05:00
Jim Abramson
fb3a09e68e Merge pull request #11520 from edx/jsa/ecom-3638 
Specify high priority queue for credentials generation task.
 2016-02-12 14:29:49 -05:00
jsa
46ad8a3399 specify routing / queue for program credentials task. 
ECOM-3638
 2016-02-12 13:25:52 -05:00
jsa
8a620640c2 Disable credentials-related settings/tests under cms. 2016-02-12 13:25:44 -05:00
Ned Batchelder
d8b9dec51e Update this command for Django 1.8 2016-02-11 15:39:35 -05:00
Ned Batchelder
432a40f035 Update post_cohort_management_fix to Django 1.8 2016-02-11 15:39:35 -05:00
Calen Pennington
1f9e90ef4b Merge pull request #11468 from cpennington/program-cert-retries 
Program cert retries
 2016-02-11 11:28:10 -05:00
Hasnain
d06edc680b Added two fields in credit API 2016-02-11 10:13:37 +00:00
Renzo Lucioni
3809422798 Address ProgramsApiConfig deprecation warning 2016-02-10 15:58:15 -05:00
Clinton Blackburn
85591696d8 Merge pull request #11497 from openfun/openfun/fix_generate_course_structure 
Fix generate_course_structure command.
 2016-02-10 13:29:00 -05:00
Calen Pennington
1e74cd0c88 Split up package imports from single name imports 2016-02-10 12:43:51 -05:00
Calen Pennington
5c79e25047 Retry the task to grant Programs credentials (which is idempotent) if any constituent program fails 2016-02-10 12:43:05 -05:00
Calen Pennington
22e91bccde Retry Programs tasks when connection to the API is disabled 2016-02-10 12:36:33 -05:00
Calen Pennington
36b0c593cc Retry failed Programs tasks using exponential backoff and a configurable retry limit 2016-02-10 12:36:30 -05:00
Calen Pennington
3940b1ba44 Add configuration for retries to ProgramsApiConfig 2016-02-10 12:36:29 -05:00
Renzo Lucioni
2717f228f8 Merge pull request #11483 from edx/renzo/programs-task-fixes 
Fixes for program certificate generation
 2016-02-10 10:41:01 -05:00
Julien Paillé
ea2633d485 Fix generate_course_structure command. 2016-02-10 10:23:20 +01:00
David Ormsbee
1a5b9172d8 Allow course images to be served from the CDN. 
Previously, course images on the student dashboard were always
served from the localhost, even if the CDN was enabled.
 2016-02-09 16:45:18 -05:00