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

12621 Commits

Author SHA1 Message Date
Michael Frey
bb53cad0fa Merge pull request #10377 from edx/release 
Release
 2015-10-27 13:10:49 -04:00
Peter Pinch
cda95d7a28 Merge pull request #10251 from mitocw/fix/jf/enroll-coach-on-create-ccx 
Enroll the coach in the CCX on creation
 2015-10-27 12:44:15 -04:00
Jim Abramson
edf09d84e9 Merge pull request #10350 from edx/jsa/ecom-2657 
Programs: added platform support package and configuration model.
 2015-10-27 09:10:23 -04:00
Nimisha Asthagiri
b1ae462ab7 Merge pull request #10361 from edx/mobile/refactor-has-access 
Refactor has_access for re-usability.
 2015-10-26 18:15:09 -04:00
Sarina Canelake
54394cf7b2 Merge pull request #10325 from stvstnfrd/debt/wiki-image 
Remove disabled wiki plugin
 2015-10-26 17:48:59 -04:00
Nimisha Asthagiri
95fdbd981c Refactor has_access for re-usability. 2015-10-26 16:26:41 -04:00
Sarina Canelake
f5e4c74e7b Merge pull request #10213 from mitocw/feature/skm/add_tests#95 
Adds more tests for get_student_grade_summary_data.
 2015-10-26 14:47:59 -04:00
Jamie Folsom
a3a7ff2428 Enroll the coach in the CCX on creation 
Make the course URL pattern more generic.

Comment newly added functionality.

Fix quality issues.

Address two lint errors, with regex and variable naming.

Changed how we access course_key and course_id.

Replace another instance of self.course.id.to_deprecated_string()

Remove unused import, add missing one.

Improve how the ccx key is extracted from the URL

Use resolve() instead of os.path to get the course_id.

Remove the granting of staff access to coaches.
 2015-10-26 11:35:01 -04:00
cahrens
87f0df3501 Revert to version 2.4 of MathJax. 
TNL-3693
 2015-10-26 11:28:40 -04:00
chrisndodge
7157affadf Merge pull request #10356 from edx/cdodge/fix-orm-query 
be sure to add a all() to the ORM statement otherwise the select_subc…
 2015-10-26 10:08:05 -04:00
Matt Drayer
a2fa59cd4b Merge pull request #10308 from edx/ziafazal/SOL-1332 
SOL-1332: use a generic function to check if entrance_exam feature is enabled or not
 2015-10-26 09:46:22 -04:00
Awais Qureshi
034f201588 Merge pull request #10136 from edx/aamir-khan/ECOM-2430-event-tracking 
ECOM-2430: Added the tracking GA events on dashboard
 2015-10-26 14:46:11 +05:00
jsa
1bb29289f2 Programs: added platform support package and configuration model. 
ECOM-2657
 2015-10-25 21:30:26 -04:00
Clinton Blackburn
7c6a30f16d Failing startup if private settings fail to load 
Squashing private settings import errors leads to wasted developer time when developers expect settings to be in place, and they aren't. This change only loads private settings if the private.py file exists. If there is an error during the import of that file, the application will not start.

ECOM-2653
 2015-10-24 17:22:16 -04:00
Ben Patterson
1032d37271 Revert "Public Course Import/Export API (continued)" 2015-10-23 20:02:34 -04:00
Bill DeRusha
cda5c52f0e Merge pull request #10330 from edx/bderusha/unenroll-certs 
Conditionally show unenroll action based on certificate status
 2015-10-23 17:51:00 -04:00
Peter Pinch
e7708e5a04 Merge pull request #8942 from mitocw/bdero/import-export-reprise 
Public Course Import/Export API (continued)
 2015-10-23 15:03:38 -04:00
Bill DeRusha
60fc3f5705 Conditionally show unenroll action based on certificat status 2015-10-23 14:59:17 -04:00
aamir-khan
2376bbb4be ECOM-2430: Added the tracking GA events on dashboard 2015-10-23 19:20:23 +05:00
stv
d57f6ab628 Remove disabled wiki plugin 
So apparently, "Image Embedding Extension for Python-Markdown" was never
actually enabled. When it was introduced [1], it was already commented
out!?

[1] 93d15d15d0
 2015-10-22 18:08:31 -07:00
Frances Botsford
feacd0fb9f allow discussion post styles to be used in the teams space 2015-10-22 16:16:46 -04:00
Andy Armstrong
d05b7a21b3 Merge pull request #10312 from edx/andya/dev-xblock-assets 
Allow non-public XBlock assets in debug mode
 2015-10-22 12:56:14 -04:00
Ahsan Ulhaq
ce5f79016d Merge pull request #10103 from edx/ahsan/ECOM-2435-Updated-Styling-for-Courses-Existing-Messaging 
Updated Styling for Courses and Existing Messaging
 2015-10-22 20:36:38 +05:00
Andy Armstrong
054aa95b26 Allow non-public XBlock assets in debug mode 2015-10-22 11:09:02 -04:00
Peter Pinch
b87634d8e0 Merge pull request #10268 from mitocw/fix/pdw/download-ccx-csv 
Fix CCX grades csv file download
 2015-10-22 10:58:27 -04:00
Christina Roberts
d4f2fe1281 Merge pull request #10294 from edx/christina/convert-video-test 
Delete test that is already covered by bok choy.
 2015-10-22 09:08:16 -04:00
Zia Fazal
9bb6f6e88d use a generic function check if entrance_exam is enabled or not 2015-10-22 16:45:19 +05:00
Chris Dodge
c00f82adab be sure to add a all() to the ORM statement otherwise the select_subclasses() will cause a full table scan/join 2015-10-21 19:27:09 -04:00
Shawn Milochik
9adf9acd11 Adds more tests for get_student_grade_summary_data. 
Tests all the kwargs. This is in support of #95, and will be followed
by an update to get_student_grade_summary_data which adds a new kwarg.
 2015-10-21 15:30:08 -04:00
Renzo Lucioni
fda61b52aa Reserve ecommerce worker username 
Django's user model allows email addresses to be blank. However, edx-platform includes a migration requiring that email addresses be unique. Someone in our production environment already had a blank email address, so this migration was failing earlier.
 2015-10-21 15:27:50 -04:00
Christina Roberts
a48d3ebe84 Merge pull request #10272 from edx/christina/PLAT-878 
Delete dead reference to modules.css.
 2015-10-21 14:26:07 -04:00
Jim Abramson
88bfeafe4c Merge pull request #10274 from edx/jsa/update-erac 
Update from ecommerce-api-client 1.1 to edx-rest-api-client 1.2
 2015-10-21 14:20:53 -04:00
cahrens
cc0d942963 Delete test that is already covered by bok choy. 
TNL-3223
 2015-10-21 13:26:54 -04:00
AlasdairSwan
c622f03a6a Merge pull request #10288 from edx/release 
Release 2015-10-21
 2015-10-21 13:16:35 -04:00
Christina Roberts
125930cf59 Merge pull request #10223 from edx/christina/upgrade-mathjax 
Upgrade to MathJax 2.5.
 2015-10-21 09:44:44 -04:00
Ned Batchelder
a0c25f88c3 Merge pull request #10279 from edx/ned/cleaner-django-meta 
No need for docstrings on "class Meta"
 2015-10-21 09:35:40 -04:00
Ned Batchelder
322ca34b20 Remove pylint pragmas from "class Meta" 
Also remove useless docstrings where they were added to keep pylint
quiet.
 2015-10-21 07:37:00 -04:00
Ahsan Ulhaq
04de913dbe Updated Styling for Courses and Existing Messaging 
ECOM-2435
 2015-10-21 15:40:44 +05:00
wajeeha-khalid
017477a8d7 MA-1281 User Account: added account_privacy field in GET and PATCH 2015-10-21 11:33:38 +05:00
tasawernawaz
b50daf5f12 Merge pull request #10184 from edx/tasawer/story/ecom-2552-turn-off-mail-for-icrv 
New Model added for Configuration of ICRV status emails.
 2015-10-21 10:22:25 +05:00
jsa
56b7b7007e Update from ecommerce-api-client 1.1 to edx-rest-api-client 1.2 2015-10-20 17:44:19 -04:00
cahrens
6d7ab6e868 Delete dead reference to modules.css. 
PLAT-878
 2015-10-20 14:26:55 -04:00
cahrens
5a043e5a12 Ignore line length. 2015-10-20 11:54:09 -04:00
cahrens
90b61f8ef8 Upgrade to MathJax 2.5. 
TNL-3495
 2015-10-20 11:54:09 -04:00
Tasawer
d2535bd02e New Model added for Configuration of ICRV status emails. 
ECOM-2552
 2015-10-20 15:39:16 +00:00
pwilkins
5562f8ea0e Fix CCX grades csv file download 
In the CCX dashboard, the Student Admin tab has a `Download student
grades` action. This action should download a CSV file containing
grades, but currently displays the CSV content in the browser instead.
This fix sets the `content-type` and `content-disposition` so that
a CSV file download occurs.

- fixes #93
 2015-10-20 10:26:55 -04:00
Matt Drayer
92a845e1de Merge pull request #10265 from edx/saleem-latif/SOL-1314 
SOL-1314: Add Cert link to Support dashboard
 2015-10-20 10:24:39 -04:00
Saleem Latif
aaf13b9724 added certificate web view link to Support Dashboard 2015-10-20 17:44:44 +05:00
Tasawer
cc6b498228 remove escaping html for dashboard link 
ECOM-2554
 2015-10-20 13:16:18 +05:00
AlasdairSwan
bb5b1000e1 Revert "Reserve ecommerce service username on edx-platform." 
Bad data migration: assumes the email address being used is unique
This reverts commit 448f4d51e6.
 2015-10-19 15:19:09 -04:00