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
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
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
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
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
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
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
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
Saleem Latif
aaf13b9724
added certificate web view link to Support Dashboard
2015-10-20 17:44:44 +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
Giovanni Di Milia
82a41b3846
Fixed new pylint violations in lms/djangoapps/ccx
2015-10-19 14:05:13 -04:00
Adam
ab78069a33
Merge pull request #10246 from edx/merge-release-into-master
...
Merge release into master
2015-10-19 11:13:49 -05:00
Ned Batchelder
8f142339de
Merge pull request #10191 from IONISx/tusbar/fix-shopping-cart-default-dates
...
TNL-3611: Remove shoppingcart default date values
2015-10-19 11:32:29 -04:00
Ned Batchelder
8fcb048b96
Add needed migration for datetime default change
2015-10-19 11:25:33 -04:00
Matt Drayer
f55542c5c4
Merge pull request #10156 from edx/mattdrayer/increment-edx-lint
...
mattdrayer/increment-edx-lint: Bump to v0.2.9
2015-10-19 10:57:30 -04:00
Matt Drayer
a4cc266c96
Merge pull request #10126 from edx/asadiqbal08/SOL-1288
...
asadiqbal08/SOL-1288 Add view of Certs generated to the Instructor Dashboard
2015-10-19 10:24:07 -04:00
Matt Drayer
1eab25f292
mattdrayer/increment-edx-lint: Bump to v0.2.9 and address pylint/pep8 violations
...
* Fix paver violations to stablize edx-lint update
* Parens, Line2Long
* Fix missing docstrings
* Fix PEP8 issues
* Address PR feedback (thanks @nedbat!)
2015-10-19 10:11:59 -04:00
Matt Drayer
c30960cc85
Merge pull request #10215 from edx/ziafazal/SOL-1317
...
SOL-1317: check MILESTONES_APP also when checking prerequisite courses enabled
2015-10-19 09:47:20 -04:00
Matt Drayer
b4ff9f882b
Merge pull request #10146 from edx/saleem-latif/SOL-1257
...
saleem-latif/SOL-1257: Resetting student history for Entrance Exam on instructor dashboard
2015-10-19 09:45:20 -04:00
Adam Palay
9b3841f62c
Merge remote-tracking branch 'origin/release' into merge-release-into-master
...
Conflicts:
lms/djangoapps/teams/views.py
lms/templates/courseware/progress.html
2015-10-19 08:35:33 -05:00
asadiqbal
74b082497f
SOL-1288
2015-10-19 17:28:10 +05:00
Saleem Latif
12b245a386
Remove milestones when instructor clears a student's entry exam data
2015-10-19 12:39:22 +05:00
Giovanni Di Milia
220c1e2934
Fixed pylint violation for files in lms/djangoapps/ccx
2015-10-16 14:15:29 -04:00
Mushtaq Ali
1b49f0cdd7
Fix quality for template escaping
2015-10-16 15:47:11 +00:00
Zia Fazal
0f637fdc95
check MILESTONES_APP when checking prerequisite courses enabled
2015-10-16 12:53:55 +05:00
Matt Drayer
d26d03da82
Merge pull request #10201 from mitocw/gdm_fix_pylint_lms.djangoapps.certificates
...
Fixed pylint violation for files in lms/djangoapps/certificates
2015-10-16 00:15:10 -04:00
Ahsan Ulhaq
da9f0f232c
Merge pull request #10183 from edx/ahsan/ECOM-2551-Update-Credit-Eligibility-Table-for-Skips
...
Update Credit Requirement Status Table for Skips
2015-10-16 00:11:38 +05:00
Matt Drayer
f1951df24e
Merge pull request #10154 from edx/saleem-latif/SOL-1297
...
saleem-latif/SOL-1297: updated message for 500 error on certificate preview
2015-10-15 13:58:05 -04:00
Giovanni Di Milia
476f6821de
Fixed pylint violation for files in lms/djangoapps/certificates
2015-10-15 12:01:36 -04:00
Bertrand Marron
a8f25492d7
Remove shoppingcart default date values
...
The previous value means that those dates would have the value of
whenever the models were imported.
Reference TNL-3611
2015-10-15 10:31:21 -04:00
Matt Drayer
3e5ad2989c
Merge pull request #10115 from edx/ziafazal/SOL-1254
...
ziafazal/SOL-1254: Student should see rest of courseware as soon as Entrance Exam is passed
2015-10-15 10:18:21 -04:00
Ahsan Ulhaq
7fa9d73a4c
Update Credit Eligibility Table for Skips
...
ECOM-2551
2015-10-15 19:03:07 +05:00
Saleem Latif
466abcdce4
updated message for 500 error on certificate preview
2015-10-15 10:46:11 +05:00
Matt Drayer
927dc10255
Merge pull request #10169 from mitocw/gdm_fix_pylint_lms.djangoapps.bulk_email
...
Fixed pylint violation for files in lms/djangoapps/bulk_email
2015-10-14 15:40:34 -04:00
Matt Drayer
744c10251f
Merge pull request #10160 from mitocw/gdm_fix_pylint_lms.djangoapps.branding
...
Fixed pylint violations for files in lms/djangoapps/branding
2015-10-14 15:38:02 -04:00
Giovanni Di Milia
08dfe5e99f
Fixed pylint violation for files in lms/djangoapps/bulk_email
2015-10-14 14:45:32 -04:00
Giovanni Di Milia
ecdb0b271f
Fixed pylint violation for files in lms/djangoapps/branding
2015-10-14 14:32:56 -04:00
Matt Drayer
6dfa81e58a
mattdrayer/update-gencert-modes: Added prof-ed modes to set
2015-10-14 12:36:27 -04:00
Zia Fazal
2d1ff75ba0
added user’s pass status to problem_check response if problem is in
...
Entrance Exam.
unit test to check presence of entrance_exam_passed
changed based on Matt's feedback
changes after Asad's feedback
2015-10-14 15:38:18 +05:00
wajeeha-khalid
b5c74652aa
MA-1240 - DiscussionAPI: fixed thread-list order-by RecentActivity
2015-10-14 11:06:21 +05:00
Sarina Canelake
65aacc1adf
Merge pull request #10078 from openedx-newbie/doc-2268
...
DOC-2268 - Fix instances of "register" on the course about page
2015-10-13 10:21:21 -04:00
