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

13181 Commits

Author SHA1 Message Date
Peter Fogg
ee13ffd149 Correctly query for any generated certificate, not just eligible ones. 2016-01-19 12:01:04 -05:00
Matt Drayer
c9933a5878 Merge pull request #11209 from edx/saleem-latif/MAYN-167 
MAYN-167: Bulk uploads (CSV) of manual enrollments on white labels should be performed as 'honor' modes
 2016-01-15 11:07:50 -05:00
Matt Drayer
9bcb1166a1 Merge pull request #11073 from edx/ziafazal/WL-245 
Ziafazal/wl-245: multiple backend support for microsite
 2016-01-15 10:10:27 -05:00
Saleem Latif
a856fec574 refactor code, remove duplicate code 2016-01-15 19:17:40 +05:00
Felipe Montoya
4742e661f4 Creating a settings object that is aware of the microsite settings. 
Adding the declaration of the settings object to openedx.conf to be able to import it from a nicer location

Resolving quality violations

Merging dicts with the settings definition when they exist in the microsite configuration

Using a cache to improve the perfomance of quering any dictionary in the microsite definition

Ignoring the invalid-name pylint warning since the names must be kept thsi way to stay the same as the ones in django.
Removing the default dict argument as per https://docs.python.org/2/tutorial/controlflow.html#default-argument-values

Extracting the implementation of the microsite to a selectable backend.

Leaving the function startup.enable_microsites for backwards compatibilityy

Adding a database backend

Using a cache to improve the perfomance of quering any dictionary in the microsite definition.
Changed the database backend so that it extends the settings file backend and removed all the unnecessary methods.

Using the backend provider for the get_dict function

some tweeks and some initial unit tests

Using getattr as a function insteal of calling the underlying __getattr__ directly

Adding an ModelAdmin object for the microsite model in the django-admin panel

refactor enable_microsites()

consolidate/refactor some shared code

add config to aws.py and add migration files

fix tests

Changes to get the backends to run after the refactor

add archiving capabilities to microsites. Also make a few notes about performance improvements to make

fix tests

Making the query to find if microsites exist in the database faster

add ORG to microsite mapping tables and some performance improvements

allow for Mako templates to be pulled from the database

fix tests

For the database template backend the uri of the template does not use the filesystem relative path

Fixing pylint violations

Added caching of the templates stored in the database

Fixing pylint errors

fix pylint

Clearing the cache on model save

Fixing pylint errors

rebased and added test coverage

rebased cdodge/microsite-improvements branch with master and added test
coverage

added missing migration

fix quality violations

add more test coverage

mattdrayer: Add microsite_configuration to cms.INSTALLED_APPS

added microsite settings to cms/envs/test.py

run session cookie tests only in LMS

fixed broken tests

putting middleware changes back

Preventing the template_backend to be called on requests which have no microsite

changes to address feedback from mjfrey

changed BaseMicrositeBackend to AbstractBaseMicrositeBackend

changes after feedback from mattdrayer

fixed broken tests and quality violations

Allowing the backend to handle the enable_pre_startup routine

Typos and docstrings

Adressing feedback

Fixing python tests

add comment to explain why we need enable_microsites_pre_startup()
 2016-01-15 14:52:36 +05:00
Peter Fogg
dfbcd84ed8 Merge pull request #11234 from edx/peter-fogg/new-audit-certs 
Ensure old audit certs don't get marked ineligible.
 2016-01-14 15:45:32 -05:00
Peter Fogg
54c349b437 Ensure old audit certs don't get marked ineligible. 2016-01-14 14:40:54 -05:00
Edward Zarecor
c37378fe29 Merge pull request #11231 from edx/release 
Merging changes for the patch release back to master
 2016-01-14 14:37:43 -05:00
Douglas Hall
0479870972 Merge pull request #11213 from edx/hasnain-naveed/MAYN-154 
MAYN-154 / Added site_map in static template
 2016-01-14 14:34:22 -05:00
AlasdairSwan
a82d582568 Merge pull request #11169 from edx/alasdair/ECOM-2967-xseries-dashboard-GA-events 
ECOM-2967 adding GA events for dashboard XSeries messages
 2016-01-14 14:27:25 -05:00
Hasnain
c14f65a293 Added site_map in static template 
Allow file extensions in MKTG_URL_LINK_MAP template keys
Set content type on requests for static templates based on the template key
 2016-01-14 13:44:54 -05:00
AlasdairSwan
2676098b02 ECOM-2967 adding GA events for dashboard XSeries messages 2016-01-14 12:37:48 -05:00
Peter Fogg
d26452dea7 Merge pull request #11217 from edx/peter-fogg/fix-auditing-status-certs 
Allow certificates with 'auditing' status to be regenerated.
 2016-01-14 10:39:47 -05:00
Toby Lawrence
2c40454db0 Merge pull request #11223 from edx/perf/crush-all-the-imgs 
Crush down images.
 2016-01-14 09:42:17 -05:00
Saleem Latif
041ec4c267 Remove unused imports from /tests/test_api.py 2016-01-14 13:36:27 +05:00
Saleem Latif
4122f695d8 Bulk uploads (CSV) of manual enrollments on white labels should be performed as 'honor' modes 2016-01-14 13:35:30 +05:00
Edward Zarecor
546610084c Removing CDN RPC 
CR comments

Whitespace

wip test refactoring

more test refactoring

Re-write download URL too.

Test fixes related to download change, and fix

wip, re-locating tests

update classname

Quality fixes
 2016-01-13 21:46:57 -05:00
Toby Lawrence
368acafad4 Adding optimized images in batches [18/19] 2016-01-13 20:38:43 -05:00
Toby Lawrence
8d8f282a5a Adding optimized images in batches [17/19] 2016-01-13 20:38:43 -05:00
Toby Lawrence
1e8263f325 Adding optimized images in batches [16/19] 2016-01-13 20:38:42 -05:00
Toby Lawrence
0009d53c53 Adding optimized images in batches [15/19] 2016-01-13 20:38:42 -05:00
Toby Lawrence
451b0a9c66 Revert "Crush down images." 
This reverts commit 8402be3b20.
 2016-01-13 19:12:13 -05:00
Toby Lawrence
8402be3b20 Crush down images. 
Ran these suckers through ImageOptim, which crunched 'em down real nice.
 2016-01-13 18:29:00 -05:00
Peter Fogg
bea90c1a01 Allow certificates with 'auditing' status to be regenerated. 
ECOM-3401
 2016-01-13 16:12:43 -05:00
Peter Fogg
fe4555bc7a Merge pull request #11151 from edx/peter-fogg/disable-audit-cert-gen 
[wip] Mark GeneratedCertificate records for audit mode as not eligible for a certificate.
 2016-01-13 07:51:56 -05:00
Peter Fogg
60860e3aa8 Disable audit certificates for new audit enrollments. 
An `eligible_for_certificate` field is added to the
GeneratedCertificate model. This way we can retain existing grading
logic, as well as maintaining correctness in analytics and reporting.

Ineligible certificates are hidden by using the
`eligible_certificates` manager on GeneratedCertificate. Some places
in the coe (largely reporting, analytics, and management commands) use
the default `objects` manager, since they need access to all
certificates.

This commit also updates the DB cache for acceptance tests.
 2016-01-12 22:44:53 -05:00
Douglas Hall
28a7b3e2d1 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-01-12 15:12:06 -05:00
Matt Drayer
b549adf476 Merge pull request #10623 from eduNEXT/fmo/wiki-support-for-microsites 
WIP wiki support for microsite templates
 2016-01-12 14:27:27 -05:00
Christina Roberts
6f66483876 Merge pull request #11202 from edx/release 
Release for Jan 12, 2016
 2016-01-12 11:29:42 -05:00
Toby Lawrence
775c3cac2a Merge pull request #11190 from edx/PERF-227 
Disable Optimizely in the courseware view.
 2016-01-12 11:09:55 -05:00
Felipe Montoya
f2a6a27ec9 Adding support for microsite template_paths on django templates 
Stripping the leading / for the django_templates finder

Enabling the microsite configurations before running django.setup()

Adding only the templates directory before startup

Adding the missing overrides file at the django templates main

Using the comp_theming way of overriding css

Adding test for the microsite_template_path filter
 2016-01-12 10:34:00 -05:00
muzaffaryousaf
b4189784da Fixed POST bookmarks bug when display_name is None. 
Added tests & general message to js when parsing fails.

TNL-3989
 2016-01-12 09:47:51 -05:00
Awais Jibran
ded3786d0c Merge pull request #11157 from edx/aj/tnl3968-mathjax-in-static-pages 
Enable MathJax in Course Pages
 2016-01-12 18:25:33 +05:00
Peter Pinch
65cec380d9 Merge pull request #11125 from mitocw/ehnancement/aq/dont_allow_user_to_register_ccx_without_invitation 
Hide CCX course registration from unenrolled students
 2016-01-12 08:25:03 -05:00
Amir Qayyum Khan
6443070901 Hide register to course page from student, so that only coach can invite students to join ccx 2016-01-12 14:21:20 +05:00
Awais Jibran
a72d4a04e8 Enable MathJax in Course Pages 
TNL-3968
 2016-01-12 13:49:30 +05:00
Adam
e4ab6dc2c3 Revert "Calculator layout and help popup fixes" 2016-01-11 12:47:05 -05:00
Toby Lawrence
09f2040cbf Disable Optimizely in the courseware view. 2016-01-11 10:57:05 -05:00
muzaffaryousaf
cc6024e97b Disable button while adding/removing bookmark to a unit. 
TNL-4004
 2016-01-11 19:31:05 +05:00
Calen Pennington
96478f823d Merge pull request #11163 from cpennington/shrink-images 
Shrink images
 2016-01-08 13:13:02 -05:00
Douglas Hall
c4aa758d8c Merge pull request #11155 from edx/douglashall/HOL-18/register_form_override 
HOL-18 Register form microsite override
 2016-01-08 12:55:00 -05:00
David Baumgold
80836087f7 Merge pull request #11165 from edx/remove-header_extra.html 
Remove unused header_extra.html file
 2016-01-08 10:00:37 -05:00
Amir Qayyum Khan
c0a131e5d6 Allowed ccx coaches to see individual students progress from grade book 2016-01-08 16:05:33 +05:00
Peter Pinch
91be959bb7 Merge pull request #10878 from mitocw/refactor/aq/move_code_from_view 
CCX app refactoring. Moved some code to utils.py from views.py
 2016-01-07 15:26:33 -05:00
Douglas Hall
c2058dbec5 Split register form out into a separately include template so that microsites can override it 2016-01-07 11:58:16 -05:00
David Baumgold
562079460b Merge pull request #11154 from ovnicraft/patch-2 
Remove duplicate import
 2016-01-07 11:57:23 -05:00
David Baumgold
032305df3d Remove unused header_extra.html file 2016-01-07 11:45:16 -05:00
Calen Pennington
bd7e4dd3ab Shrink images using trimage 
lms/static/images/wmd-buttons-transparent.png       | Bin 9698 -> 7046 bytes
 lms/static/images/wmd-buttons.png                   | Bin 7465 -> 5970 bytes
 .../credit_notifications/edx-logo-header.png        | Bin 1894 -> 1225 bytes
 .../ebe754f90bc88acf8ec6a1d27b87f743_120.jpg        | Bin 3168 -> 2752 bytes
 .../ebe754f90bc88acf8ec6a1d27b87f743_30.jpg         | Bin 957 -> 648 bytes
 .../ebe754f90bc88acf8ec6a1d27b87f743_50.jpg         | Bin 1362 -> 1048 bytes
 .../ebe754f90bc88acf8ec6a1d27b87f743_500.jpg        | Bin 15852 -> 13940 bytes
 .../f0d065035a5c4d32df318fbc54138765_120.jpg        | Bin 3168 -> 2752 bytes
 .../f0d065035a5c4d32df318fbc54138765_30.jpg         | Bin 957 -> 648 bytes
 .../f0d065035a5c4d32df318fbc54138765_50.jpg         | Bin 1362 -> 1048 bytes
 .../f0d065035a5c4d32df318fbc54138765_500.jpg        | Bin 15852 -> 13940 bytes
 themes/edge.edx.org/lms/static/images/logo.png      | Bin 7465 -> 4574 bytes
 themes/edx.org/cms/static/images/studio-logo.png    | Bin 4782 -> 4779 bytes
 themes/edx.org/lms/static/images/logo-large.png     | Bin 4581 -> 3367 bytes
 themes/edx.org/lms/static/images/logo.png           | Bin 1244 -> 1184 bytes
 .../lms/static/images/profiles/default_120.png      | Bin 6398 -> 3252 bytes
 .../lms/static/images/profiles/default_30.png       | Bin 993 -> 522 bytes
 .../lms/static/images/profiles/default_50.png       | Bin 2068 -> 1035 bytes
 .../lms/static/images/profiles/default_500.png      | Bin 91560 -> 0 bytes
 themes/red-theme/lms/static/images/logo.png         | Bin 909 -> 559 bytes
 20 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:43 -05:00
Calen Pennington
0dfb9870c9 Shrink images using trimage 
lms/static/images/linkedin_add_to_profile.png    | Bin 139290 -> 1320 bytes
 lms/static/images/logo-large.png                 | Bin 20342 -> 8447 bytes
 lms/static/images/logo.png                       | Bin 4243 -> 885 bytes
 lms/static/images/opencourseware.png             | Bin 13203 -> 11395 bytes
 lms/static/images/openedx-logo-tag-dark.png      | Bin 2539 -> 1624 bytes
 lms/static/images/openedx-logo-tag-light.png     | Bin 2702 -> 1776 bytes
 lms/static/images/openedx-logo-tag.png           | Bin 2596 -> 1607 bytes
 lms/static/images/pencils.jpg                    | Bin 30064 -> 25607 bytes
 lms/static/images/play.png                       | Bin 2966 -> 1729 bytes
 lms/static/images/problem-editor-icons.png       | Bin 2307 -> 2304 bytes
 lms/static/images/profiles/default_120.png       | Bin 2690 -> 1133 bytes
 lms/static/images/profiles/default_30.png        | Bin 576 -> 274 bytes
 lms/static/images/profiles/default_50.png        | Bin 1023 -> 449 bytes
 lms/static/images/profiles/default_500.png       | Bin 17594 -> 5671 bytes
 lms/static/images/search-icon.png                | Bin 1195 -> 423 bytes
 lms/static/images/show-hide-discussion-icon.png  | Bin 1610 -> 771 bytes
 lms/static/images/small-header-home-icon.png     | Bin 1128 -> 276 bytes
 lms/static/images/social/google-plus-sharing.png | Bin 1161 -> 1046 bytes
 lms/static/images/textbook/textbook-left.png     | Bin 783 -> 705 bytes
 lms/static/images/textbook/textbook-right.png    | Bin 822 -> 690 bytes
 lms/static/images/ui-icons_222222_256x240.png    | Bin 4369 -> 3714 bytes
 lms/static/images/vcert-ribbon-s.png             | Bin 4843 -> 3147 bytes
 lms/static/images/verified-ribbon.png            | Bin 1791 -> 751 bytes
 lms/static/images/white-error-icon.png           | Bin 1107 -> 344 bytes
 lms/static/images/wiki-icons.png                 | Bin 2410 -> 1464 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:42 -05:00
Calen Pennington
d3da2585c4 Shrink images using trimage 
.../images/bulk_email/GooglePlusIcon_gray.png       | Bin 680 -> 678 bytes
 lms/static/images/bulk_email/LinkedInIcon.png       | Bin 751 -> 417 bytes
 lms/static/images/bulk_email/MeetupIcon.png         | Bin 1283 -> 679 bytes
 lms/static/images/bulk_email/MeetupIcon_gray.png    | Bin 685 -> 678 bytes
 lms/static/images/bulk_email/TwitterIcon.png        | Bin 998 -> 517 bytes
 lms/static/images/bulk_email/TwitterIcon_gray.png   | Bin 518 -> 515 bytes
 lms/static/images/bulk_email/VKontakteIcon.png      | Bin 2480 -> 1272 bytes
 lms/static/images/bulk_email/VKontakteIcon_gray.png | Bin 3099 -> 3092 bytes
 lms/static/images/bulk_email/YoutubeIcon.png        | Bin 1964 -> 1856 bytes
 lms/static/images/bulk_email/YoutubeIcon_gray.png   | Bin 1961 -> 1878 bytes
 lms/static/images/bulk_email/edXHeaderImage.jpg     | Bin 25814 -> 24906 bytes
 lms/static/images/bullet-closed.png                 | Bin 230 -> 191 bytes
 lms/static/images/bullet-open.png                   | Bin 219 -> 188 bytes
 lms/static/images/default-badges/honor.png          | Bin 20814 -> 13316 bytes
 lms/static/images/default-badges/professional.png   | Bin 21855 -> 14603 bytes
 lms/static/images/default-badges/verified.png       | Bin 21855 -> 14603 bytes
 lms/static/images/edx-theme/edx-logo-77x36.png      | Bin 5139 -> 3674 bytes
 lms/static/images/green-pointer.png                 | Bin 3474 -> 887 bytes
 lms/static/images/homepage-hero-video-thumb.jpg     | Bin 4537 -> 4517 bytes
 lms/static/images/honor-ribbon.png                  | Bin 5956 -> 4251 bytes
 lms/static/images/icon-sm-professional.png          | Bin 2892 -> 1883 bytes
 lms/static/images/icon-sm-verified.png              | Bin 3247 -> 776 bytes
 lms/static/images/icon-sm-xseries-white.png         | Bin 706 -> 475 bytes
 lms/static/images/large-white-error-icon.png        | Bin 1800 -> 951 bytes
 lms/static/images/link-icon.png                     | Bin 326 -> 296 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:41 -05:00