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

12587 Commits

Author SHA1 Message Date
wajeeha-khalid
fa285e09a4 MA-1189 - Discussion API: implemented GET comment children 2015-10-22 15:53:34 +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
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
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
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
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
Giovanni Di Milia
82a41b3846 Fixed new pylint violations in lms/djangoapps/ccx 2015-10-19 14:05:13 -04:00
Sarina Canelake
7b71f95f44 Merge pull request #10007 from open-craft/unenroll-course-name 
Display course name in course unenroll confirmation popup.
 2015-10-19 13:24:55 -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
d7c8cb803a Merge pull request #10238 from edx/saleem-latif/SOL-1297-feedback-changes 
SOL-1297: Remove platform name from error message in Certificates Web View
 2015-10-19 09:53:42 -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
Matjaz Gregoric
9027474659 Use %()s style variable placeholder for cert name. 
Some strings were using both python-style {} placeholders as well
as javascript-style %()s placeholders. That can be confusing for
translators.

Replace the python-style placeholder with a %()s one and interpolate
the value using javascript.
 2015-10-19 11:20:35 +02:00
Matjaz Gregoric
5acd203d63 Display course name in unenroll popup. 
Only the course number was displayed in the course unenrollment
confirmation popup dialog.

Include full course display name to make it more user friendly.
 2015-10-19 11:20:35 +02:00
Saleem Latif
12b245a386 Remove milestones when instructor clears a student's entry exam data 2015-10-19 12:39:22 +05:00
Saleem Latif
3502738bac feedback changes 2015-10-19 11:10:21 +05:00
Christina Roberts
300bd43172 Merge pull request #9845 from edx/christina/bio-hyperlink 
Make HTML for non-editable views on leaner profile page more logical
 2015-10-16 19:03:47 -04:00
Frances Botsford
113cab87b8 profile page style cleanup 
remove link style, add pointer, adjust spacing on profile
 2015-10-16 16:35:47 -04:00
Giovanni Di Milia
220c1e2934 Fixed pylint violation for files in lms/djangoapps/ccx 2015-10-16 14:15:29 -04:00
cahrens
c6ba747419 Make HTML for non-editable views more logical. 
TNL-3297
 2015-10-16 13:40:24 -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
Christina Roberts
50fd135c61 Merge pull request #10193 from edx/christina/move-require-test 
Clean up of common JS specs using RequireJS.
 2015-10-15 12:53:09 -04:00
Giovanni Di Milia
476f6821de Fixed pylint violation for files in lms/djangoapps/certificates 2015-10-15 12:01:36 -04:00
cahrens
a099ff86e5 Move edx.utils.validate. 
The test was not running where it lived before.
 2015-10-15 11:02:12 -04:00
asadiqbal
db547cc6f2 MAYN-116 Including GTM code from microsite 2015-10-15 10:47:35 -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