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

6180 Commits

Author SHA1 Message Date
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
wajeeha-khalid
90fe71dbfe MA-1248 - CourseEnrollmentAPI: added discussion URL 2015-10-09 19:04:55 +05:00
Matt Drayer
06129ada30 Merge pull request #8788 from edx/mattdrayer/eliminate-base-distinguished 
mattdrayer/eliminate-base-distinguished: Switch back to honor/verified
 2015-10-09 09:36:08 -04:00
Matt Drayer
31cbef709a mattdrayer/eliminate-base-distinguished: Switch back to honor/verified 
* talbs: Remove obsolete stuff
* frrrances: remove base and distinguished sass references and image assets
* mattdrayer: Cleaned up JSON syntax for test setups
 2015-10-09 00:29:42 -04:00
openedx-newbie
895f4a36b2 Fix enrollment terminology in about page tests 2015-10-08 18:00:12 +02:00
Peter Pinch
ec023c22e6 Merge pull request #10034 from mitocw/fix/gdm/hide_block_from_ccx 
Fixed visibility of hidden blocks in CCX schedule
 2015-10-08 08:54:02 -04:00
Matt Drayer
6b93532c63 Merge pull request #10077 from edx/ziafazal/SOL-1258 
SOL-1258: Percentage appearing wrong for specific numbers
 2015-10-08 08:28:08 -04:00
Usman Khalid
f6193c872e Merge pull request #10059 from edx/usman/use-included-staticfiles-app 
Upgrade django pipeline to v.1.5.3.
 2015-10-08 16:10:36 +05:00
Zia Fazal
14c310017b minimum score percentage rounded 
round before converting a decimal into integer
 2015-10-08 12:01:40 +05:00
Calen Pennington
624bc9a734 Merge pull request #9911 from cpennington/fix-plat-858 
Delete DIRECT_ONLY_CATEGORIES from both draft and published branches by default
 2015-10-07 14:41:40 -04:00
Peter Fogg
a38ae44740 Fix displaying wrong membership on "My Team" view. 
The heart of this fix is to change the "My Team" view to use a
collection of teams instead of memberships. The team card is
refactored to only take a team, rather than attempt to be polymorphic
over teams and team memberships. This change enabled removing a good
amount of old code. This also requires adding a `username` parameter
to the teams list endpoint which allows getting a list of all teams
for a single user, in order to allow refreshing the "My Teams" view
correctly. Currently this list is of length at most one.

TNL-3410
 2015-10-07 11:35:24 -04:00
Andy Armstrong
8914aaf8d4 Refactor discussions code to address flaky test 
TNL-3247

Removed remaining synchronous AJAX calls from discussions
Updated the profile view tests to use an attached view for testing
Removed one-time JQuery intiialization that could fail and break multiple tests
 2015-10-07 11:22:48 -04:00
mushtaqali
296f75a07c Add template escaping in forums, progress page and course container TNL-2395, TNL-2394, TNL-2393 2015-10-07 11:20:51 -04:00
Diana Huang
0248f8af6d Add new clickjacking decorator that whitelists LTI consumers. 2015-10-07 11:20:51 -04:00
Giovanni Di Milia
f2a1d0e54b Coaches can't see blocks "hide from students" 
If a block is marked as "hide from students" cannot be seen in the
CCX schedule
 2015-10-07 09:07:29 -04:00
Chris Dodge
8609f80db0 Add email and manual enrollment reason into the Enrollment Report 2015-10-06 22:34:54 -04:00
Calen Pennington
f8f9b91c16 Make unpublish raise the same errors in split and old-mongo when asked to unpublish a DIRECT_ONLY_CATEGORY 2015-10-06 16:54:34 -04:00
Edward Zarecor
8afb36057b Merge pull request #10060 from edx/release 
Release
 2015-10-06 15:51:43 -04:00
Usman Khalid
dbcd1bf430 Use django.contrib.staticfiles instead of django-staticfiles. 
TNL-3137
 2015-10-06 19:52:38 +05:00
Calen Pennington
7e55437db6 Allow retry_failed_photo_verifications to take a list of receipt_ids to retry 2015-10-05 22:46:45 -04:00