Commit Graph

6610 Commits

Author SHA1 Message Date
Kevin Falcone
98671a8aa6 Merge pull request #11399 from edx/jibsheet/dont-use-using
Don't use using() in migrations
2016-02-04 19:47:10 -05:00
Peter Fogg
2ddf1f2e6f Merge pull request #11427 from edx/peter-fogg/fix-audit-cert-regen
Correctly set certificate status for audit certs when regenerating.
2016-02-04 18:56:40 -05:00
Peter Fogg
711e2e7f3c Correctly set certificate status for audit certs when regenerating.
COR-2403
2016-02-04 17:23:20 -05:00
Peter Fogg
22cb307961 Correctly format date block dates. 2016-02-04 14:34:08 -05:00
Nimisha Asthagiri
599173c6b6 Merge pull request #11198 from edx/block-cache/collect-phase
Refactor Block Cache to separate Collect and Transform phases
2016-02-03 20:18:09 -05:00
Robert Raposa
f555ffd585 Refactor and improve js_utils helpers
- Rename escape_json_dumps to dump_js_escaped_json
- Rename escape_js_string to js_escaped_string
- Update js_escaped_string to output empty string for None
- Introduce dump_html_escaped_json
- Move dump_js_escaped_json after the pipe as new best practice
- Introduce additional uses of helpers
- Introduce new djangolib directory and move js_utils
2016-02-03 17:13:21 -05:00
Nimisha Asthagiri
05767b433d Collect Course Blocks on Course Publish and Management Command
MA-1368
2016-02-03 16:56:22 -05:00
Nimisha Asthagiri
66397c35b9 Refactor Block Cache to separate Collect and Transform phases 2016-02-03 16:54:29 -05:00
Peter Fogg
0c1dc272d4 Change "Go to Course" to "Resume Course" on course home page.
ECOM-2960
2016-02-03 13:58:23 -05:00
Peter Fogg
75bef91e17 Fix query counts after Django 1.8 merge. 2016-02-03 13:58:23 -05:00
Peter Fogg
786c4456ea Last-accessed courseware on the home page.
ECOM-2806
2016-02-03 13:58:22 -05:00
Ahsan Ulhaq
96d030b6d9 Reverse and Rename Courseware and Course Info Tabs
ECOM-2678
2016-02-03 12:20:53 -05:00
Peter Fogg
fd397964b3 Styling and template changes for the Course Home page.
ECOM-2810
2016-02-03 12:20:53 -05:00
clrux
8a2d989369 Merge pull request #11247 from edx/clrux/ac-313-fixup
CMS: Removing H1 and H2 from editor options; updating editor icons
2016-02-03 09:28:44 -05:00
Chris Rodriguez
4ae40e7bdd Updating icons on problem type editor 2016-02-02 15:41:04 -05:00
Chris Rodriguez
81d86eea42 Changing H2 to H3 in problem templates 2016-02-02 15:41:02 -05:00
Kevin Falcone
2d9708da03 Remove uses of using() from migrations
This hardcoded the db_alias fetched from schema_editor and forces django
to try and migrate any second database you use, rather than routing to
the default database.  In testing a build from scratch, these do not
appear needed.

Using using() prevents us from using multiple databases behind edxapp.

Additionally - add back a removed backwards migration from certificates
0003.  I have no idea why this was dropped in the 1.8 upgrade.
2016-02-01 16:57:26 -05:00
Douglas Hall
263c71a6d7 Fix PHX-246 2016-01-29 20:45:07 -05:00
Douglas Hall
dce3d9ca81 Merge pull request #11014 from edx/douglashall/PHX-219/subsection_gating
PHX-219 Subsection Gating
2016-01-29 11:05:39 -05:00
Zia Fazal
6e861f266b Merge pull request #11352 from edx/ziafazal/WL-209
ziafazal/WL-209:Cert Social Sharing customization
2016-01-29 16:50:17 +05:00
Zia Fazal
06e38e1c24 added branding to 404 and 500 error pages
changes based on feedback

renamed a definition and added test coverage

fixed broken tests
2016-01-29 15:46:51 +05:00
M. Rehan
b427da7185 Merge pull request #11350 from edx/mrehan/unwanted-discussion-modules
Fix - skip orphans while getting discussion modules
2016-01-29 12:46:02 +05:00
Matjaz Gregoric
3259df5412 Merge pull request #11315 from open-craft/comprehensive-theme-on-django-templates
Make comprehensive theme work with django templates.
2016-01-29 08:17:23 +01:00
M. Rehan
31b180beb3 Skip orphans while getting discussion modules 2016-01-29 11:09:00 +05:00
Douglas Hall
37a7fdc0f2 Added subsection gating feature 2016-01-28 14:05:20 -05:00
Zia Fazal
463e8c82cf Cert Social Sharing customization
changes after feedback from matte
2016-01-28 14:26:48 +05:00
Awais Jibran
7d8936e328 Merge pull request #11346 from edx/aj/ecom-3525-add-logging-in-remove-user-from-cert-exception
Add logging when user is removed from exception list
2016-01-28 13:56:52 +05:00
Nimisha Asthagiri
08a2bc9620 Merge pull request #11358 from edx/release
Hotfix for MA-1981 and safe sessions
2016-01-27 15:53:20 -05:00
Giovanni Di Milia
e63194c1cd Added CCX REST APIs
CCX REST APIs
OAUTH2 authorization for CCX APIs
- oauth2 authorization required for ccx list.
- Course-instructor permission for ccx api endpoint
- Protection for detail view too.

Tests for CCX REST APIs and OAUTH2 authorization
2016-01-27 11:04:28 -05:00
Christine Lytwynec
9378c8ff28 Merge pull request #11245 from edx/clytwynec/tnl-4040
Fix file upload in IE
2016-01-27 09:44:11 -05:00
Awais Jibran
0f2f1f2c17 Add logging when user is removed from exception list
ECOM-3525
2016-01-27 14:48:29 +05:00
Nimisha Asthagiri
f3cb692472 Safe Session Cookies Middleware 2016-01-26 17:23:03 -05:00
Nimisha Asthagiri
3a6fbae60c Reorder transformers to fix MA-1981. 2016-01-26 15:46:15 -05:00
Matt Drayer
b575d50ae0 Merge pull request #11287 from edx/ziafazal/WL-287
ziafazal/WL-287: moved IS_EDX_DOMAIN dependent features to edx.org theme
2016-01-25 22:27:25 -05:00
jsa
56d3fa011d use COURSE_CERT_AWARDED signal for milestones + badges 2016-01-25 10:54:37 -05:00
jsa
9d141ae7a1 Add config switch + signal for generating program certs.
ECOM-3523
2016-01-25 10:54:28 -05:00
Matjaz Gregoric
9b89bd3245 Make comprehensive theme work with django templates.
Comprehensive theming did not work with django templates (used by course wiki).

The reason it didn't work was that in order for the theme to work, theme template folder
has to be added to django template dirs setting *before* django startup.
After django startup, modifying `settings.DEFAULT_TEMPLATE_ENGINE['DIRS']` has no effect,
because at that point the template engine is already initialized with a copy of the
template dirs list.

Instead of running the theme startup code as an autostartup hook, we manually run it
*before* `django.setup()`. This is fine because theme startup code doesn't have to do
anything else besides modifying some settings and doesn't actually need django to be
initialized.
2016-01-25 08:45:52 +01:00
Zia Fazal
c0648ab164 moved IS_EDX_DOMAIN dependent feature to edx.org theme 2016-01-22 15:32:19 -05:00
Douglas Hall
8e22e855cb Merge pull request #11274 from edx/ibrahimahmed443/enable-copyright-url
uncomment copyright url to enable it in microsites
2016-01-22 13:37:12 -05:00
Ibrahim
0f09bb8a94 raise 404 when copyright template is missing 2016-01-22 12:02:46 -05:00
Peter Fogg
6cd12f9f39 Merge pull request #11296 from edx/peter-fogg/fix-certs-migrations
[wip] Reintroduce generated certificate changes, with updates to not require a giant migration.
2016-01-22 11:19:54 -05:00
Peter Fogg
96cc38951d Disable audit certificates for new audit enrollments.
Two new certificate statuses are introduced, 'audit_passing' and
'audit_notpassing'. These signal that the GeneratedCertificate is not
to be displayed as a cert to the user, and that they either passed or
did not. This allows us to 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.

ECOM-3040
ECOM-3515
2016-01-22 10:27:55 -05:00
Awais Jibran
8a6699a46d Studio breaks DEFAULT_COURSE_ABOUT_IMAGE_URL is not set in settings in cms
ECOM-3384
2016-01-22 16:49:57 +05:00
Adam
c6b21d139a Merge pull request #11293 from edx/release
Release
2016-01-21 12:36:03 -05:00
Syed Hasan raza
fb8478b084 Merge pull request #11228 from edx/shr/bug/AN-4509-HTTP_USER_AGENT
Fix HTTP_USER_AGENT latin1 characters
2016-01-21 15:23:16 +05:00
Ned Batchelder
fe2e4a7481 Merge pull request #11273 from openfun/fun/fix_default_email_localization
Fix (un)enrollment email default language
2016-01-20 13:15:30 -05:00
Régis Behmo
5fee7480e9 Fix (un)enrollment email default language
When one or many users are sent an enrollment or unenrollment email via
the teacher subscription form, the emails are written in the user
language. If the user has no preferred language, e.g: when the user does
not exist, the platform language is supposed to be selected. In
practice, the emails were not being translated at all.
2016-01-20 17:30:43 +01:00
Mushtaq Ali
d8b902ad58 Merge pull request #11200 from edx/mushtaq/ecom2082-fix-enrollment-msg
Escape Course Name in enrolment message
2016-01-20 20:04:23 +05:00
Peter Fogg
52d538444e Revert "Disable audit certificates for new audit enrollments."
This reverts commit 60860e3aa8.
2016-01-20 09:53:58 -05:00
Peter Fogg
b5400aa79b Revert "Ensure old audit certs don't get marked ineligible."
This reverts commit 54c349b437.
2016-01-20 08:56:48 -05:00