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

34756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Eric Fischer
e74fe37e16 Merge pull request #11232 from edx/efischer/ora-release 
ORA staff grading release
 2016-01-14 15:10:16 -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
Eric Fischer
c8ceb21e6d ORA staff grading release 2016-01-14 12:18:43 -05:00
Edward Zarecor
b70198f914 Merge pull request #11225 from edx/patch/2016-01-14 
Removing CDN RPC
 2016-01-14 12:08:28 -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
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
d65a4ca95d Adding optimized images in batches [19/19] 2016-01-13 20:38:43 -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
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
Peter Fogg
bea90c1a01 Allow certificates with 'auditing' status to be regenerated. 
ECOM-3401
 2016-01-13 16:12:43 -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
Cliff Dyer
1ba96f37e5 Merge pull request #11182 from edx/mobile/access-token-messages-MA-1900 
Provide useful response messages with access token errors
 2016-01-13 13:33:37 -05:00
J. Cliff Dyer
864e081ffb Add appropriate messages to OAuth2 401 responses. 
Format responses as a JSON dict containing an error_code and a
developer_message.  user_message is not necessary, as these are API
level errors, not seen by end users.

MA-1900
 2016-01-13 16:43:16 +00:00
Jesse Zoldak
db694e28f4 Merge pull request #11216 from edx/zoldak/bok-choy-cache-db 
Create a new bok-choy DB cache
 2016-01-13 11:41:35 -05:00
Jesse Zoldak
0f9cfbffb8 Create a new bok-choy DB cache 2016-01-13 11:01:14 -05:00
Jesse Zoldak
fd2b1deb03 Merge pull request #11204 from edx/zoldak/bok-choy-reset-db 
Clear out the bok choy DB with reset_db, not flush
 2016-01-13 09:37:50 -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
Jesse Zoldak
a675081275 Add comments to the bok-choy DB reset script 2016-01-12 16:59:01 -05:00
Douglas Hall
12e8a3ea6e Merge pull request #11206 from edx/merge-release-into-master 
HOTFIX Release for Jan 12, 2016
 2016-01-12 16:33:10 -05:00
Douglas Hall
28a7b3e2d1 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-01-12 15:12:06 -05:00