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
Matt Drayer
487a894fd7
Merge pull request #10264 from edx/ziafazal/log-exception-in-custom-500-handling
...
log exception in the logs to debug issue on production or sandbox environments
2015-10-26 09:41:53 -04:00
Bill DeRusha
60fc3f5705
Conditionally show unenroll action based on certificat status
2015-10-23 14:59:17 -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
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
Arbab Nazar
034ac1c808
Merge pull request #10271 from edx/arbab/enrollment-user-list
...
take the list of users for enrolment change
2015-10-21 08:24:48 -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
Sarina Canelake
105d611cc9
Create distinct terms for gender, education sign up terms
2015-10-20 18:55:51 -04:00
arbabnazar
85e67bea4a
help updated
2015-10-20 15:37:09 -04:00
arbabnazar
b3e37e54ba
remove the append action
2015-10-20 15:30:06 -04:00
arbabnazar
361035c098
change the help text
2015-10-20 14:51:18 -04:00
arbabnazar
c4dc624c7f
take the list of users for enrolment change
2015-10-20 14:00:59 -04:00
Afeef Janjua
713689dffe
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
...
Squashed commits:
[62dd3f1] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+2 squashed commits)
Squashed commits:
[4bfe22b] remove the delete case because there is none in current scenario
[802c259] moved the test case to user profile properties file
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[98d2415] added better log info message
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[62dd3f1] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+2 squashed commits)
Squashed commits:
[4bfe22b] remove the delete case because there is none in current scenario
[802c259] moved the test case to user profile properties file
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint
invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated
2015-10-20 18:32:21 +05:00
Zia Fazal
b9dfcb2253
log exception in the logs to debug issue
2015-10-20 14:22:26 +05: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
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
Saleem Latif
12b245a386
Remove milestones when instructor clears a student's entry exam data
2015-10-19 12:39:22 +05:00
Adam Palay
9a79bf2ec9
skip LTIConfig test when third_party_auth is not installed
2015-10-16 12:22:54 -04:00
Zia Fazal
0f637fdc95
check MILESTONES_APP when checking prerequisite courses enabled
2015-10-16 12:53:55 +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
Saleem Latif
466abcdce4
updated message for 500 error on certificate preview
2015-10-15 10:46:11 +05:00
Matjaz Gregoric
a9d8678ed0
Fix staticfiles import in microsite.py.
...
django-staticfiles was replaced with django.contrib.staticfiles
in dbcd1bf430
2015-10-13 11:20:49 +02:00
wajeeha-khalid
90fe71dbfe
MA-1248 - CourseEnrollmentAPI: added discussion URL
2015-10-09 19:04:55 +05:00
Bill DeRusha
1030b277ab
Merge pull request #9981 from edx/bderusha/context-tracker-ip
...
Upgrade IP parsing in tracker middleware
2015-10-08 14:48:38 -04:00
Bill DeRusha
40a8608b0b
Upgrade IP parsing in tracker middleware
2015-10-08 13:48:53 -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
Diana Huang
0248f8af6d
Add new clickjacking decorator that whitelists LTI consumers.
2015-10-07 11:20:51 -04:00
Usman Khalid
111a45664c
Use settings.PIPELINE_ENABLED instead of settings.FEATURES[USE_DJANGO_PIPELINE].
2015-10-06 19:52:38 +05:00
Usman Khalid
dbcd1bf430
Use django.contrib.staticfiles instead of django-staticfiles.
...
TNL-3137
2015-10-06 19:52:38 +05:00
Usman Khalid
130bbd7993
Upgrade to django-pipeline v1.5.3.
...
TNL-3137
2015-10-06 19:52:38 +05:00
Clinton Blackburn
17f0193362
Merge pull request #10044 from edx/merge-release-into-master
...
Merging changes for hotfix/2015-10-05
2015-10-05 16:11:31 -04:00
Brian Beggs
143ca802ae
Merge pull request #10043 from edx/revert-9934-usman/use-included-staticfiles-app
...
Revert "Upgrade django-pipeline and staticfiles"
2015-10-05 15:29:17 -04:00
Bill DeRusha
fe23052511
Merge pull request #9979 from edx/bderusha/boardman-traffic
...
Add IP to all python Segment tracking calls
2015-10-05 14:55:55 -04:00
Clinton Blackburn
f967cfce8b
Merged release to master
...
Resolved conflicts from hotfix-2015-10-05
2015-10-05 14:46:32 -04:00
Brian Beggs
0ca679e244
Revert "Upgrade django-pipeline and staticfiles"
2015-10-05 14:40:28 -04:00
Clinton Blackburn
0dba843608
Multiple credit fixes
...
- Added support for Unicode characters when creating the signature
- Using <textarea> for form data to support newline characters
- Generating form with jQuery instead of relying on existing DOM element
- Removed duplicated credit request code
- Corrected spaing on dashboard
- Enabled functionality by default
Dashboard cleanup
-- Cleaned styles
-- Added wrapper class to use for hiding the actions
-- Cleaned JS toggling of error container
-- Corrected dashboard and receipt text
ECOM-2172
2015-10-05 09:35:10 -04:00
Matt Drayer
86e523e667
Merge pull request #10018 from edx/saleem-latif/MAYN-141
...
MAYN-141: WL Favicon not displaying correctly
2015-10-05 07:52:58 -04:00
Brian Beggs
5550ca30b1
Merge pull request #9999 from edx/bbeggs/TNL-3452-master
...
Fixed select_related fields for course embargos and the mobile user api. TNL-3452
2015-10-02 13:55:30 -04:00
Usman Khalid
0ce679fc06
Merge pull request #9934 from edx/usman/use-included-staticfiles-app
...
Upgrade django-pipeline and staticfiles.
2015-10-02 22:37:24 +05:00
Alison Hodges
eab5c60752
Merge pull request #9984 from edx/ahodges/enroll_api
...
Updates the description provided for a new enrollment report
2015-10-02 13:10:35 -04:00
David Baumgold
0219e18fa8
Merge pull request #10023 from edx/release
...
Release into master
2015-10-02 12:58:50 -04:00
Usman Khalid
2b59d46a31
Use django.contrib.staticfiles instead of django-staticfiles.
...
TNL-3137
2015-10-02 18:26:25 +05:00
Usman Khalid
98df2336f3
Upgrade to django-pipeline v.1.5.3.
...
TNL-3137
2015-10-02 18:26:25 +05:00
Saleem Latif
4725f7f579
favicon display bug corrected
2015-10-02 18:15:49 +05:00
Bill DeRusha
ca6633bd98
Add IP to all python Segment tracking calls
2015-10-01 21:21:16 -04:00
Bill DeRusha
bcb71a3255
Rename SEGMENT_KEY to have a unique key name for both CMS and LMS
2015-10-01 19:40:27 -04:00
Alison Hodges
adffb10cbe
Updates the description provided for a new enrollment report
...
https://github.com/edx/edx-platform/pull/9345
2015-10-01 16:28:42 -04:00
