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

12805 Commits

Author SHA1 Message Date
Adam Palay
aaaba4708d add timeout to lettuce test to reduce flakiness 2016-02-23 12:40:49 -05:00
Michael Frey
90146d9ae0 Only allow ecommerce checkout if user is also activated 2016-02-23 10:11:14 -05:00
Ben Patterson
1ba360d987 Merge pull request #11629 from edx/benp/TNL-4151-flaky-test 
Flag test as flaky. See TNL-4151.
 2016-02-23 10:05:33 -05:00
Christine Lytwynec
0f66d852c2 Merge pull request #11581 from edx/clytwynec/ac-327 
Sequence navigation tooltip mechanism updated
 2016-02-23 09:28:32 -05:00
Ben Patterson
a11ca6cd91 Merge pull request #11618 from edx/benp/library-test-flaky-fix 
Ensure test waits for the library list to populate before continuing.
 2016-02-23 08:51:22 -05:00
Ben Patterson
de45c0d36d Flag test as flaky. See TNL-4151. 2016-02-23 08:20:06 -05:00
Toby Lawrence
acf6c1d609 Merge pull request #11523 from edx/perf/speed-up-slow-user-role-ops 
Don't blow away the role cache when updating.
 2016-02-23 06:55:00 -05:00
Bound3R
b0b977ba7f missing change the url path to the sass variable 2016-02-22 15:30:53 -05:00
Christine Lytwynec
3f6b7cb004 Sequence navigation tooltip mechanism updated 2016-02-22 14:13:36 -05:00
Alison Hodges
364463160f Merge pull request #11589 from edx/ahodges/DOC-2717 
Fixes DOC-2717 for Jennifer
 2016-02-22 13:14:30 -05:00
Alison Hodges
5e62e937d6 Fixes DOC-2717 for Jennifer 2016-02-22 12:26:11 -05:00
Ben Patterson
3afc2a9fa7 Ensure test waits for the library list to populate before continuing. 2016-02-22 10:01:03 -05:00
Christine Lytwynec
41febaa875 Merge pull request #11565 from edx/clytwynec/ac-234 
Remove hgroup usage
 2016-02-19 16:06:22 -05:00
Nimisha Asthagiri
4bbe9a2021 Merge pull request #11326 from edx/mobile/remove-dead-code 
Mobile API: remove unused endpoints
 2016-02-19 15:14:13 -05:00
Adam
4dbcf9a1d3 Merge pull request #11587 from edx/release 
Release
 2016-02-18 17:19:29 -05:00
Michael Frey
5903ef832c Merge pull request #11584 from edx/release 
Merging release back to master
 2016-02-18 14:55:25 -05:00
Matjaz Gregoric
f4e462c728 Merge pull request #11316 from open-craft/remove-django-template-loaders 
Remove default django template loaders.
 2016-02-18 20:38:47 +01:00
Adam Palay
e57487db83 update mathjax to 2.6 (TNL-4104) and (TNL-4094) 
update mathjax class names to support common html, html-css, and svg
 2016-02-18 14:13:34 -05:00
Nimisha Asthagiri
fa8ca11d8c Remove unused Mobile Social Facebook endpoint 2016-02-18 12:12:04 -05:00
Zia Fazal
e8ccc2f3e5 Merge pull request #11076 from CredoReference/render-lms-main-navigation-with-template 
Render lms main navigation (tabs) with template
 2016-02-18 11:21:16 +05:00
Bill DeRusha
b686abc18d Disable mailchimp integration for most segment identify requests 2016-02-17 17:10:48 -05:00
vkaracic
f58c2cd6b0 Otto checkout flow 2016-02-17 15:04:19 -05:00
Justin Abrahms
885785d7f1 Added a UI for confirming OAuth Access. 
This will allow users to delegate permissions to a 3rd party service.
 2016-02-17 14:04:04 -05:00
vkaracic
86a4710ee8 Otto checkout flow 2016-02-17 18:16:44 +01:00
Christine Lytwynec
57b7034e5b Remove hgroup usage 2016-02-17 12:05:15 -05:00
Toby Lawrence
80c68e42b7 Merge pull request #11467 from edx/perf/speed-up-student-tests 
Switch to SharedModuleStoreTestCase in the 'student' app where possible.
 2016-02-17 11:15:53 -05:00
sanfordstudent
e4b59c3198 Merge pull request #11526 from edx/sstudent/MA-1882-update-api-regex 
MA-1882 adding course api to regex
 2016-02-17 10:21:51 -05:00
Ahsan Ulhaq
d90c1a2845 Merge pull request #11560 from edx/ahsan/ECOM-2831-GeneratedCertificates-admin-broken 
set show_full_result_count false
 2016-02-17 20:09:45 +05:00
Sanford Student
45f8e526c0 making check more generic 2016-02-17 09:22:27 -05:00
clrux
21aa7edd1c Merge pull request #9909 from edx/clrux/ac-179 
AC-179 fixing skip links
 2016-02-17 09:09:27 -05:00
Ahsan Ulhaq
88df456414 set show_full_result_count false 
ECOM-2831
 2016-02-17 18:10:40 +05:00
Chris Rodriguez
2a4e141e0e LMS: fixing skip links and adding a11y tests 2016-02-17 07:46:42 -05:00
M. Rehan
af9e26f5cb Merge pull request #11479 from edx/mrehan/plat-998-warnings-on-logout 
Fix - Bypass unnecessary logs on logging out.
 2016-02-17 17:46:05 +05:00
Qubad786
faf3a64e36 Bypass unnecessary logs on loging out 2016-02-17 13:42:01 +05:00
Toby Lawrence
0d040bc051 Fix a mistake with initializing something in the test setup. 2016-02-16 10:20:57 -05:00
Dmitry Viskov
d532f8de0e Render LMS main navigation (tabs) with template, override templates for a specific list item 2016-02-16 17:03:53 +03:00
Zia Fazal
57af11c0f0 Merge pull request #11548 from edx/ziafazal/fix-get-template-path 
WL-320: fixed get_template_path to work with absolute path also
 2016-02-16 18:47:45 +05:00
Zia Fazal
6cd265751a fixed get_template_path to work with absolute path also 
fixed quality violation

skipped test in CMS

changes after feedback from mattd
 2016-02-16 11:52:19 +05:00
Toby Lawrence
84ed280417 Quality fixes! 2016-02-15 21:11:35 -05:00
Sven Marnach
8280e224f5 Merge pull request #11433 from open-craft/smarnach/studio-add-xblock 
Pass DOM element, not jQuery object to XBlock initialisation.
 2016-02-15 17:24:10 +01:00
Peter Fogg
5e9577bf43 Merge pull request #11535 from edx/peter-fogg/add-lettuce-cache 
Add accidentally deleted lettuce DB cache.
 2016-02-12 16:22:44 -05:00
Christina Roberts
36fc6162f2 Merge pull request #11534 from edx/christina/jquery-npm 
Install underscore from npm.
 2016-02-12 16:05:30 -05:00
Gabe Mulley
fcfb0f4a3c Merge pull request #11522 from edx/gabe/remove-ga-fields 
copy event on write
 2016-02-12 14:34:29 -05:00
Toby Lawrence
dacdbae1a5 Fix up some broken tests. 
We added the ability here to check if a role has a user in with the ability to refresh the role cache before checking.  Since some tests will make inline requests, which in turn put a user into a new role, we have to refresh afterwards otherwise we won't see that new role in place.  Since we don't want to automatically refresh ever, we just added a way to request it, since we know in this test that we're doing something, effectively, out-of-band, which necessitates it.
 2016-02-12 14:17:51 -05:00
Peter Fogg
b6ca05d939 Add accidentally deleted lettuce DB cache. 2016-02-12 14:16:54 -05:00
Ben Patterson
526e174846 Merge pull request #11510 from edx/benp/TE-1194-example 
TE-1194 update for test_teams.
 2016-02-12 14:01:46 -05:00
cahrens
c69226841d Install underscore from npm. 
FEDX-47
 2016-02-12 13:45:41 -05:00
Sanford Student
52d8cb009f MA-1882 adding tests and reworking regex to exclude blocks routes 2016-02-12 09:35:29 -05:00
Eric Fischer
6394238004 Exclude Reverse Foreign Keys from list_display 
These types of fields do not need to be included, and attempting
to do so causes everything to break.
 2016-02-12 08:54:25 -05:00
Gabe Mulley
239c3822a4 copy event on write 2016-02-12 06:27:53 -05:00