Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,462 Commits 1 Branch 0 Tags
95e76dcafe945b62dc7bbaebde1a32434002464a
Commit Graph

44462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brandon DeRosier
4138622346 Merge pull request #13779 from edx/bdero/update-python-saml 
Update python-saml to latest version (v2.2.0)
 2016-10-17 20:18:08 -04:00
Nimisha Asthagiri
643d1d5404 Merge pull request #13775 from edx/robrap/mathjax 
Use MathJax -full config.
 2016-10-17 20:14:32 -04:00
Brandon DeRosier
0fe1bde7d1 Update python-saml to latest version. 
For more details, see the release document: https://github.com/onelogin/python-saml/releases/tag/v2.2.0

(cherry picked from commit bec0aeeb42d9b30580eed51efcde2b089e3693c5)
 2016-10-17 17:32:51 -04:00
Christina Roberts
046ee7bd96 Merge pull request #12923 from CredoReference/static-page-for-instructors-only 
Ability to hide Pages from students
 2016-10-17 17:10:33 -04:00
Robert Raposa
13495d88ab Use MathJax -full config. 2016-10-17 16:50:31 -04:00
Jesse Zoldak
ac1e4643a0 Add enable-migrations parameter for python unit tests 2016-10-17 15:59:44 -04:00
Cliff Dyer
41b519fdea Merge pull request #13767 from edx/cdyer/flakies-2016-10-14 
Added flaky tests.
 2016-10-17 14:22:32 -04:00
Eric Fischer
32ab4671d8 Merge pull request #13770 from edx/efischer/fix_grade_queue 
Use Correct queue for grade recalculation
 2016-10-17 13:27:30 -04:00
Deepa
f9c8e38df6 Update django-countries to the latest supported version 2016-10-17 21:48:19 +05:30
J. Cliff Dyer
87e2308801 Added flaky tests. 
New tickets:

    TNL-5770
    TNL-5771
    TNL-5772
    TNL-5773
    TNL-5774
    TNL-5775
 2016-10-17 11:59:46 -04:00
Bill DeRusha
50e399828a Merge pull request #13768 from edx/bderusha/release-fix-2016-10-16 
Fix for UTM parameter tracking when UTM not present
 2016-10-17 11:52:53 -04:00
Eric Fischer
5df9f20160 Allow Celery queue settings to be defined by ENV_TOKENS 
General good-practice cleanup requested by @jibsheet. Also includes some
pylint fixes myh editor flagged during this cleanup.
 2016-10-17 11:45:07 -04:00
Stu Young
84b27e09ce Merge pull request #13741 from edx/estute/turn-off-coveralls-reporting 
stop reporting to coveralls
 2016-10-17 11:44:40 -04:00
Eric Fischer
76b3a65259 Use redefined LOW_PRIORITY queue 
aws.py redefines the default queues in order to expose cross-environment
work. The new recalculate grades routing key shgould use that value
rather than the default defined in common.py.
 2016-10-17 11:32:06 -04:00
Bill DeRusha
a36df010c0 Fix for UTM parameter tracking when UTM not present 2016-10-17 10:28:47 -04:00
Gregory Martin
2f868e5e24 Merge pull request #13733 from edx/yro_localized-datetime 
Set up DateUtil factory, modify requests to handle moment-timezones, moment-with-locales.
 2016-10-17 10:10:58 -04:00
stu
540c12fc27 stop reporting to coveralls 2016-10-17 10:01:33 -04:00
Tasawer Nawaz
252880e5de Merge pull request #13740 from edx/tasawer/ecom-5684/forgot-password-verbiage-pdate 
Forgot Password - Verbiage Update
 2016-10-17 16:03:55 +05:00
Ahsan Ulhaq
19496aef5d Merge pull request #13663 from edx/ahsan/ECOM-4763-update-log-messages 
update error messages in enrollment API
 2016-10-17 14:43:22 +05:00
Ahsan Ulhaq
21746f1e93 update error messages in enrollment API 
ECOM-4763
 2016-10-17 13:15:24 +05:00
tasawernawaz
ab8e5b82b6 Forgot Password - Verbiage Update 
ECOM-5684
 2016-10-17 11:56:35 +05:00
Andy Armstrong
39a461d8f7 Merge pull request #13698 from edx/andya/move-cors-csrf 
Move cors_crsf to openedx/core
 2016-10-16 20:07:37 -04:00
Robert Raposa
988db7b152 Merge pull request #13751 from edx/robrap/cleanup-student-urls 
Clean up student/urls.py
 2016-10-14 16:45:10 -04:00
Christina Roberts
a5fa635b24 Merge pull request #13753 from edx/christina/tnl-5758 
Flaky course outline bok choy test.
 2016-10-14 16:11:22 -04:00
Dmitry Viskov
bb09fdb7be Ability to hide Pages from students 2016-10-14 22:43:26 +03:00
Eric Fischer
b8a025347e Merge pull request #13757 from edx/efischer/low_queue 
Route grading updates to low priority queue
 2016-10-14 15:41:06 -04:00
Greg Martin
4ddda443b8 Implement localized datetimes in browser 
moment-timezone require config

jasmine test fix, duplicate req. cleanup
 2016-10-14 15:25:38 -04:00
cahrens
c9284835e1 Minor changes for flaky test. 
This test has been very flaky on master, but the failure
is not reproducible. Trying a few things that might help.
TNL-5758
 2016-10-14 15:16:47 -04:00
Christina Roberts
65723e2b12 Merge pull request #13758 from edx/christina/tnl-5513 
Fix textbook tests so a11y tests only run in a11y test phase
 2016-10-14 14:47:40 -04:00
Eric Fischer
c4c2875232 Route grading updates to low priority queue 2016-10-14 14:24:08 -04:00
Andy Armstrong
03c3ee53e5 Move cors_crsf to openedx/core 2016-10-14 13:59:01 -04:00
sanfordstudent
8c22d5229b Merge pull request #13761 from edx/sstudent/one_milestones_app 
removing extra instance of MILESTONES_APP
 2016-10-14 13:40:49 -04:00
cahrens
3e6b545f5e Change to only run a11y test in a11y phase. 
Not able to reproduce flakiness.
TNL-5513
 2016-10-14 13:39:54 -04:00
cahrens
1b03a0090d Replace with CoffeeScript generated version of JS. 
Includes reformatting to 4 spaces.
 2016-10-14 13:14:19 -04:00
cahrens
7a443737f6 Convert display.coffee to js. 
First just rename.
 2016-10-14 13:13:14 -04:00
cahrens
b366ad6d33 Convert display.coffee to js. 2016-10-14 13:13:14 -04:00
sanfordstudent
455e0749e2 Merge pull request #13720 from edx/sstudent/TNL-5697 
Updating logging for TNL-5697
 2016-10-14 13:12:27 -04:00
Christina Roberts
c8a3367269 Merge pull request #13705 from edx/christina/javascript_loader 
Christina/javascript loader
 2016-10-14 12:57:19 -04:00
Sanford Student
e8c508596b removing extra instance of MILESTONES_APP 2016-10-14 12:38:03 -04:00
alisan617
21eb03e116 Merge pull request #13513 from edx/alisan/inline-discussion-TNL-4756 
New inline discussion home view TNL-4756
 2016-10-14 12:09:42 -04:00
Ben Patterson
8772df0435 Merge pull request #13756 from edx/benp/flaky-textbook-tests 
Stabilize textbook tests
 2016-10-14 11:03:31 -04:00
Ned Batchelder
adbe8afbd8 Merge pull request #13744 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-10-14 11:02:17 -04:00
alisan617
d5635cf1ba New inline discussion home view UI 
TNL-4756
 2016-10-14 10:54:50 -04:00
Ned Batchelder
eaa0989c6a Update translations (autogenerated message) 2016-10-14 10:14:17 -04:00
Ben Patterson
b34600f140 Stabilize textbook tests 2016-10-14 10:05:49 -04:00
Sanford Student
b706fb461a updating grades logging 
for TNL-5697
 2016-10-14 09:26:52 -04:00
Clinton Blackburn
4acca4b1e2 Merge pull request #13755 from Microsoft/cdodge/restricted-oauth2-applications 
Cdodge/restricted oauth2 applications
 2016-10-14 08:38:10 -04:00
chrisndodge
6d327594ac add restricted DOT OAUTH2 client with reduced privileges 2016-10-14 07:31:26 -04:00
Jillian Vogel
1a8a1274d8 Merge pull request #13534 from open-craft/jill/choice_response_computed 
Allows ChoiceResponse problems to set correctness with python variables
 2016-10-14 17:55:12 +10:30
Jillian Vogel
8124aacfcc Allows ChoiceResponse CAPA problems to use script-computed variables to 
determine choice correctness, as MultipleChoiceResponse problems already do.

Adds a unit test for this change, and for the existing MultipleChoiceResponse
computed correctness capability.
 2016-10-14 08:20:14 +10:30