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

33363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Bertrand Marron
889f068663 Merge pull request #27 from edx/ned/add-migration-to-pr-10191 
Add needed migration
 2015-10-19 17:29:52 +02: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
Christina Roberts
aed32a09fc Merge pull request #10237 from stvstnfrd/noop-tests 
Remove unused specs
 2015-10-19 09:33:42 -04: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
Saleem Latif
3502738bac feedback changes 2015-10-19 11:10:21 +05:00
stv
ca99606f9f Remove unused specs 
These have been commented-out for more than 2 and a half years;
I can't think of a legitimate reason for keeping them around at this
point.

These were originally commented out here in
4740965413
 2015-10-18 04:39:25 -04: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
Adam
3a61cca7e6 Merge pull request #10195 from edx/hotfix/2015-10-15 
Hotfix/2015 10 15
 2015-10-16 16:25:39 -04:00
Matt Drayer
83734989f9 Merge pull request #10147 from edx/saleem-latif/SOL-1266-feedback-changes 
saleem-latif/SOL-1266: Move Course Number and Course Number Override below Course Title section
 2015-10-16 15:36:33 -04:00
Sarina Canelake
a72425c81d Merge pull request #10170 from mitocw/gdm_fix_pylint_lms.djangoapps.ccx 
Fixed pylint violation for files in lms/djangoapps/ccx
 2015-10-16 15:24:58 -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
Adam
5ec3d83d3f Merge pull request #10226 from edx/adam/skip-test-if-third-party-auth-not-installed 
skip LTIConfig test when third_party_auth is not installed
 2015-10-16 13:24:39 -04:00
Adam
387d4f6a2d Merge pull request #10222 from edx/mashtaq/fix-quality-template-escaping 
Fix quality for template escaping
 2015-10-16 12:35:28 -04:00
Adam Palay
9a79bf2ec9 skip LTIConfig test when third_party_auth is not installed 2015-10-16 12:22:54 -04:00
Mushtaq Ali
1b49f0cdd7 Fix quality for template escaping 2015-10-16 15:47:11 +00:00
Sarina Canelake
d367f7ad1c Merge pull request #10218 from edx/sarina/20151016-update-translations 
Update translations (autogenerated message)
 2015-10-16 10:12:41 -04:00
Sarina Canelake
6e47cbfbca Update translations (autogenerated message) 2015-10-16 09:16:16 -04:00
Zia Fazal
0f637fdc95 check MILESTONES_APP when checking prerequisite courses enabled 2015-10-16 12:53:55 +05:00
Saleem Latif
5f766f3806 Changes after testing on staging 2015-10-16 10:19:43 +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
Ben Patterson
c54de688e7 Merge pull request #10129 from edx/benp/more-unique-cohort-bokchoy 
Make these tests more unique for multiprocessing.
 2015-10-15 17:56:14 -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
b67f07afc1 Move main_requirejs to live with the requirejs files. 2015-10-15 11:19:27 -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
Braden MacDonald
a144fddee5 Bump Problem Builder to include fix from pb PR 71 2015-10-15 10:47:36 -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
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
6fb89fee5a Merge pull request #10159 from mitocw/gdm_fix_pylint 
Fixed pylint violations for files in lms/
 2015-10-14 17:06:22 -04: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