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

12576 Commits

Author SHA1 Message Date
Peter Fogg
fdf540d259 Merge pull request #11236 from edx/peter-fogg/fix-course-mode-migration 
Change broken course_modes migration to not touch the database.
 2016-01-15 09:14:16 -05:00
Syed Hasan raza
68ba8ece89 Merge pull request #11199 from edx/shr/bug/TNL-2699-circuit-schematic-builder-problem-status 
Indicator-container div apply to status
 2016-01-15 12:31:15 +05:00
Peter Fogg
4f3234433b Change broken course_modes migration to not touch the database. 
Changing a field name in the way that we did (updating the Python
variable name and switching it to point to the old DB column) confuses
Django's migration autodetector. No DB changes are actually necessary,
but it thinks that a field has been removed and a new one added. This
means that Django will ask users to generate the migration it thinks
is necessary, which ended up with us dropping data. The fix is to run
the same migration on Django's internal model of the DB state, but not
actually touch the DB.
 2016-01-14 15:41:15 -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
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
Toby Lawrence
dc727104ae Revert larger_image.png so test passes. 
There's a test to ensure users can't upload too large of a profile picture, so the picture was too small to trigger that behavior, and now fails.  This just returns the image to its original size.
 2016-01-13 22:02:36 -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
0009d53c53 Adding optimized images in batches [15/19] 2016-01-13 20:38:42 -05:00
Toby Lawrence
3b73839ed2 Adding optimized images in batches [14/19] 2016-01-13 20:38:41 -05:00
Toby Lawrence
c19a6af96b Adding optimized images in batches [13/19] 2016-01-13 20:38:41 -05:00
Toby Lawrence
c71f0fa2ce Adding optimized images in batches [12/19] 2016-01-13 20:38:41 -05:00
Toby Lawrence
0cdaa975fc Adding optimized images in batches [11/19] 2016-01-13 20:38:40 -05:00
Toby Lawrence
7efd8773fb Adding optimized images in batches [10/19] 2016-01-13 20:38:40 -05:00
Toby Lawrence
f18b2a7fe2 Adding optimized images in batches [09/19] 2016-01-13 20:38:39 -05:00
Toby Lawrence
10e9517de2 Adding optimized images in batches [08/19] 2016-01-13 20:38:39 -05:00
Toby Lawrence
3824f0a68c Adding optimized images in batches [07/19] 2016-01-13 20:38:39 -05:00
Toby Lawrence
fc0775be2b Adding optimized images in batches [06/19] 2016-01-13 20:38:38 -05:00
Toby Lawrence
9cf0589200 Adding optimized images in batches [05/19] 2016-01-13 20:38:38 -05:00
Toby Lawrence
b991f2ec88 Adding optimized images in batches [04/19] 2016-01-13 20:38:37 -05:00
Toby Lawrence
23ed311d4f Adding optimized images in batches [03/19] 2016-01-13 20:38:37 -05:00
Toby Lawrence
0e518535c2 Adding optimized images in batches [02/19] 2016-01-13 20:38:37 -05:00
Toby Lawrence
944725e35b Adding optimized images in batches [01/19] 2016-01-13 20:37:48 -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
raeeschachar
9cf16cd279 Merge pull request #11201 from edx/raees/chrome-bokchoy-test-annotation-component 
Fixed test annotation component failing on Chrome
 2016-01-14 00:09:22 +05:00
Jesse Zoldak
0f9cfbffb8 Create a new bok-choy DB cache 2016-01-13 11:01:14 -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
Syed Hassan Raza
e630fba9a7 Add accessible text 2016-01-13 14:13:56 +05:00
raeeschachar
c790b62aa0 Fixed test annotation component failing on Chrome 2016-01-13 11:34:46 +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
Brian Talbot
7ac287af19 Merge pull request #11185 from open-craft/sequence-link-color-default 
Mark sequence link-color scss variable default.
 2016-01-12 14:57:10 -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
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
Syed Hassan Raza
cfb761bf29 Indicator-container div apply to status 2016-01-12 15:03:03 +05:00
raeeschachar
d6673ca3fd Merge pull request #11174 from edx/raees/chrome-bokchoy-test-quality-button-works-correctly 
Fixed test quality button works correctly in Video tests failing on C…
 2016-01-12 14:01:11 +05:00
Awais Jibran
a72d4a04e8 Enable MathJax in Course Pages 
TNL-3968
 2016-01-12 13:49:30 +05:00
Matjaz Gregoric
95884642a2 Mark sequence link-color scss variable default. 
There's already a global $link-color variable defined in
lms/static/sass/base/_variables.scss. Mark the $link-color
variable in sequence scss file with !default, so that the
global $link-color variable gets used, if defined.
 2016-01-11 08:52:21 +01:00
Adam
e8925972d9 Merge pull request #11168 from edx/adam/fix-userstanding-page 
userstanding is now OneToOneField
 2016-01-08 13:36:54 -05:00
Toby Lawrence
fb984206cf Add the migrations necessary for asset base URL support. 2016-01-08 13:16:50 -05:00
Calen Pennington
96478f823d Merge pull request #11163 from cpennington/shrink-images 
Shrink images
 2016-01-08 13:13:02 -05:00
Peter Fogg
17a69a30e4 Revert "Add options trailing slashes to the Enrollment API." 
This reverts commit 3149aaa319.
 2016-01-08 09:47:39 -05:00
raeeschachar
41f27f1f9f Fixed test quality button works correctly in Video tests failing on Chrome 2016-01-08 16:27:17 +05:00