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

43987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Mesick
d905899873 Merge pull request #16760 from edx/bmedx/django111_remove_noargscommand 
Update clear_collectstatic_cache management command to Django 1.11 spec
 2017-12-04 14:19:44 -05:00
Eric Fischer
fae1537682 Merge pull request #16522 from edx/efischer/EDU-1724 
Move library creator checks to POST-only
 2017-12-04 14:17:10 -05:00
Eric Fischer
d0250baad9 Merge pull request #16726 from edx/efischer/xss_followup 
fix a few xss errors
 2017-12-04 14:16:46 -05:00
Albert (AJ) St. Aubin
48c40cf05e Merge pull request #16751 from edx/aj/stafF_entitlement_permissions 
Updates to the API Endpoint to remove the Staff users ability to get all
 2017-12-04 14:08:56 -05:00
Diana Huang
141bee3290 Merge pull request #16761 from edx/diana/hide-optional-fields-checkbox 
LEARNER-3406: Fix registration fields bugs.
 2017-12-04 13:14:15 -05:00
Eric Fischer
c08010e5db Merge pull request #16643 from edx/efischer/EDUCATOR-1773_revert 
EDUCATOR-1773 resolution
 2017-12-04 13:12:34 -05:00
Eric Fischer
34db1269c8 Merge pull request #16601 from edx/efischer/EDU-1731_memoize 
Memoize common lookups during request
 2017-12-04 13:12:09 -05:00
bmedx
29514cc2d2 Update clear_collectstatic_cache management command to Django 1.11 spec 2017-12-04 13:05:33 -05:00
Waheed Ahmed
bcccd48871 Merge pull request #16625 from edx/waheed/LEARNER-3206-dates-mobile-fragment-changes 
Course dates mobile fragment improvements.
 2017-12-04 22:14:57 +05:00
Eric Fischer
3687d6aa62 fix a few xss errors 2017-12-04 11:56:26 -05:00
Eric Fischer
a09866622d Move library creator checks to POST-only 2017-12-04 11:55:49 -05:00
Eric Fischer
cb463c0d11 Revert "Revert "Merge pull request #16447 from appsembler/omar/hide-library-button"" 
This reverts commit 7696727fda.
 2017-12-04 11:55:49 -05:00
Eric Fischer
b543a6ce34 Upgrade django-ses to 0.8.4 2017-12-04 11:55:09 -05:00
Eric Fischer
3312939703 Revert "Merge pull request #16635 from edx/efischer/EDUCATOR-1773" 
This reverts commit 3e9e97e6d8, reversing
changes made to 0d931107aa.
 2017-12-04 11:55:09 -05:00
Eric Fischer
2e3f871c12 Memoize common lookups during request 
Prevents repeated memcached lookups on functions whose values should
remain static for the lifetime of a request.

EDUCATOR-1731
 2017-12-04 11:54:50 -05:00
Tyler Hallada
f5d2741c34 Merge pull request #16744 from edx/thallada/highlights-logging 
Schedules: more info logging and add exception logging
 2017-12-04 11:32:43 -05:00
Nimisha Asthagiri
de74279d78 Merge pull request #16755 from edx/pacing/fake-request-issue 
Schedules: Emulate HTTP request needs to include host information
 2017-12-04 11:31:58 -05:00
Michael Roytman
cb19a653ee Merge pull request #16754 from edx/mroytman/sfe-a11y-page 
add Accessibility Page into studio from studio-frontend
 2017-12-04 11:23:18 -05:00
Jeremy Bowman
067785dbfd Merge pull request #16710 from edx/jmbowman/PLAT-1419 
PLAT-1419 Make edxmako a proper template backend
 2017-12-04 11:07:30 -05:00
Jeremy Bowman
fefdbef2e9 Merge pull request #16752 from edx/jmbowman/PLAT-1428 
PLAT-1428 Removed unused cache_relation function
 2017-12-04 10:34:22 -05:00
Jeremy Bowman
a36a54bcaa Merge pull request #16750 from edx/jmbowman/PLAT-1408 
PLAT-1408 Update reference to Django's context_processors module
 2017-12-04 10:32:43 -05:00
Diana Huang
daeb2cc1b9 Fix registration fields bugs. 2017-12-04 10:30:46 -05:00
Albert St. Aubin
dfa7b73a61 Updates to the API Endpoint to remove the Staff users ability to get all 
Entitlements
 2017-12-04 08:37:15 -05:00
Waheed Ahmed
d7d310bc4f Course dates mobile fragment improvments. 
Added new mobile css entry in css pipline and removed
dates heading for mobile view.

LEARNER-3206
 2017-12-04 15:16:06 +05:00
Nimisha Asthagiri
61f4ceca5b Schedules: Emulate HTTP request needs to include host information 2017-12-03 23:57:12 -05:00
Tyler Hallada
3425502a23 Schedules: change logging from DEBUG to INFO/EXCEPTION 2017-12-03 22:34:33 -05:00
Michael Roytman
2afbe87723 add Accessibility Page into studio from studio-frontend 2017-12-02 08:29:15 -05:00
Michael Roytman
fab7f31a55 Merge pull request #16735 from edx/mroytman/EDU-1826 
mroytman/edu 1826/1830
 2017-12-01 22:14:59 -05:00
Michael Roytman
eeb6cc7ca3 Add accessibility accomodation request page to studio and link to said page in footer, both behind a Waffle switch. Add tests for the new page. 2017-12-01 19:57:21 -05:00
Farhanah Sheets
d0687e97b1 Merge pull request #16734 from edx/fsheets/EDUCATOR-1825 
Update studiofrontend to pass generic studioContext
 2017-12-01 19:02:33 -05:00
Jeremy Bowman
67b877cb6c PLAT-1428 Removed unused cache_relation function 2017-12-01 18:00:04 -05:00
Farhanah Sheets
e395e78521 Update to use generic studioContext configuration 2017-12-01 17:55:55 -05:00
Jeremy Bowman
9a696556a5 PLAT-1408 Update reference to Django's context_processors module 2017-12-01 17:06:39 -05:00
Jeremy Bowman
fdc50c3aa8 PLAT-1419 Make edxmako a proper template backend 2017-12-01 17:01:52 -05:00
John Eskew
3a892c1a04 Merge pull request #16747 from edx/jeskew/upgrade_user_state_client 
Bump version of user-state-client module.
 2017-12-01 16:50:13 -05:00
Tyler Hallada
c397840d74 Merge pull request #16598 from edx/thallada/ret-emulate-request-default-middleware 
Default middleware_classes in emulate_http_request
 2017-12-01 16:33:21 -05:00
Jeremy Bowman
dd9dfb068c Merge pull request #16738 from edx/jmbowman/PLAT-1762 
PLAT-1762 Remove obsolete mentoring XBlock
 2017-12-01 16:11:33 -05:00
Troy Sankey
085de50d26 Merge pull request #16746 from edx/pwnage101/fix-paver-tests-django-1.11-take2 
Add flags to tox.ini so paver tests can run
 2017-12-01 16:08:13 -05:00
John Eskew
0dccd498c4 Bump version of user-state-client module. 2017-12-01 15:30:38 -05:00
Troy Sankey
7895c28542 Add flags to tox.ini so paver tests can run 2017-12-01 15:05:20 -05:00
Jesse Zoldak
c647ca5565 Merge pull request #16731 from edx/zoldak/better-quality-output 
Improve output for quality failures
 2017-12-01 11:51:58 -08:00
Calen Pennington
6a59df88bf Merge pull request #16694 from edx/cale/no-asset-polling 
Cale/no asset polling
 2017-12-01 14:42:56 -05:00
Matt Drayer
38930188cc Merge pull request #16740 from edx/mattdrayer/ENT-783 
mattdrayer/ENT-783: Remove 'city' from SuccessFactors OData API requests
 2017-12-01 14:27:25 -05:00
Matt Drayer
61bd579810 mattdrayer/ENT-783: Remove city from SuccessFactors OData API requests 2017-12-01 13:27:57 -05:00
Calen Pennington
f4b62b066c Don't have webpack watch node_modules or .git for changes 2017-12-01 13:06:20 -05:00
Calen Pennington
c0638ca9d3 Use file watches rather that polling for asset watching 2017-12-01 13:06:20 -05:00
edx-pipeline-bot
70dc3359a7 Merge pull request #16732 from edx/release-mergeback-to-master 
Merge release back to master
 2017-12-01 10:50:42 -05:00
Uman Shahzad
8347e6bbfb Merge pull request #16716 from open-craft/mtyaka/ENT-744 
Bump edx-enterprise to 0.55.1.
 2017-12-01 19:16:47 +05:00
Matjaz Gregoric
bc63f469a1 Bump edx-enterprise to 0.55.1. 
This updates edx-enterprise to 0.55.1 to include changes related to
enteprise tracking events.
 2017-12-01 08:39:02 +01:00
Jesse Zoldak
9c49c10b27 Revert "Allow theme template block override" 2017-11-30 17:09:13 -05:00