Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5589 Commits

Author SHA1 Message Date
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.

The common/djangoapps/microsite_configuration/templatetags/microsite.py
file was still trying to import the old staticfiles package,
breaking the app on fresh installations.
 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
Brian Beggs
b73bf35899 fixed snapshot functionality for RestrictedCrouse embargo, select_related is now passed the proper hint. TNL-3452 2015-10-01 13:50:46 -04:00
Awais Qureshi
c486f857ca Merge pull request #9881 from edx/awais786/ECOM-1988-upgrade-msg-with-credit-mode 
Hide upgrade message on student dashboard for credit enrollments
 2015-09-30 12:51:38 +05:00
Ned Batchelder
7b435e603b Merge pull request #9953 from edx/ned/drf-data-change 
DRF 3.1 now uses request.data instead of request.DATA
 2015-09-29 16:21:20 -04:00
Ned Batchelder
817347f7d3 Merge pull request #9939 from edx/ned/fix-broken-mocks 
Added autospec=True to mocks being used incorrectly.
 2015-09-29 15:44:56 -04:00
Ned Batchelder
8ec2de9359 DRF 3.1 now uses request.data instead of request.DATA 2015-09-29 15:25:55 -04:00
Awais
0ca586f65b If enrollment mode is credit then upgrade message should not appear. 
Fixing certificates for credit mode.
ECOM-1988
 2015-09-29 20:56:32 +05:00
Bill DeRusha
a6873cb883 Merge pull request #9875 from edx/bderusha/segment-cleanup 
Segment Clean Up
 2015-09-29 10:33:03 -04:00
Bill DeRusha
14e1ef13fe Merge pull request #9865 from edx/bderusha/segment-version-bump 
Bump version of segemnt's analytics-python package to 1.1.0
 2015-09-29 09:33:49 -04:00
Calen Pennington
64f3229ce0 Fix tests revealed to be in error by autospec. 2015-09-29 09:30:38 -04:00
Ned Batchelder
60c2e45fbc Added autospec=True to mocks being used incorrectly. 
The tests now fail!
 2015-09-29 06:56:30 -04:00
Brian Beggs
d9de52751d Merge remote-tracking branch 'origin/release' into bbeggs/2015-09-22-release-to-master 2015-09-28 20:58:34 -04:00
Ben Patterson
2fd6add524 Revert "Merge DRF 3.1 in to master" 2015-09-28 17:12:43 -04:00
Will Daly
d11ccad0fc Upgrade djangorestframework to v3.1 
* Upgrade edx-submissions
* Upgrade edx-ora2
* Upgrade edx-val
* Upgrade edx-proctoring
* Update all edx-platform code that depends on DRF, including:
  - auth_exchange
  - cors_csrf
  - embargo
  - enrollment
  - util
  - commerce
  - course_structure
  - discussion_api
  - mobile_api
  - notifier_api
  - teams
  - credit
  - profile_images
  - user_api
  - lib/api (OAuth2 and pagination)
 2015-09-28 11:52:30 -04:00
Will Daly
8555630df7 Upgrade djangorestframework to v3.1 
* Upgrade edx-submissions
* Upgrade edx-ora2
* Upgrade edx-val
* Upgrade edx-proctoring
* Update all edx-platform code that depends on DRF, including:
  - auth_exchange
  - cors_csrf
  - embargo
  - enrollment
  - util
  - commerce
  - course_structure
  - discussion_api
  - mobile_api
  - notifier_api
  - teams
  - credit
  - profile_images
  - user_api
  - lib/api (OAuth2 and pagination)
 2015-09-25 12:40:57 -04:00
Braden MacDonald
b98956bdf6 Merge pull request #9672 from open-craft/tpa-providers-api 
Initial implementation of API for listing a user's third party auth providers
 2015-09-24 15:52:52 -07:00
Bill DeRusha
c721ff5a82 Replace SEGMENT_IO_LMS & SEGMENT_IO_LMS_KEY with single key SEGMENT_KEY 2015-09-24 11:49:03 -04:00
Bill DeRusha
4f14d4f75b Bump version of segemnt's analytics-python package to 1.1.0 
Wrap 3rd Party Auth Pipeline with Segment enabled checks
 2015-09-24 11:27:24 -04:00
Matt Drayer
e51c4f23d3 Merge pull request #9822 from edx/saleem-latif/SOL-565 
saleem-latif/SOL-565
 2015-09-24 10:19:43 -04:00
Brian Beggs
c26bb9188a Revert "Upgrade django-pipeline and staticfiles" 2015-09-23 15:52:24 -04:00
Brian Beggs
4c05fa4f49 Merge pull request #9803 from edx/usman/use-included-staticfiles-app 
Upgrade django-pipeline and staticfiles
 2015-09-23 15:50:39 -04:00
Bill DeRusha
d75a36a347 Merge pull request #9853 from edx/bderusha/mailchimp-sync 
Add mailchimp list fields and config for new users
 2015-09-23 12:44:57 -04:00