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

12767 Commits

Author SHA1 Message Date
Christine Lytwynec
57b7034e5b Remove hgroup usage 2016-02-17 12:05:15 -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
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
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
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
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
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
raeeschachar
04ca0af54c Merge pull request #11500 from edx/raees/chrome-bok-choy-test-stores-speed-for-multiple 
Fixed test_video_component_stores_speed_correctly_for_multiple_videos…
 2016-02-12 11:22:07 +05:00
Peter Fogg
a7b1f79d3e Better error logging for full courses during enrollment. 
ECOM-3685
 2016-02-11 09:54:15 -05:00
raeeschachar
c6d2373156 Fixed test_video_component_stores_speed_correctly_for_multiple_videos failing on Chrome 2016-02-11 15:47:07 +05:00
sanfordstudent
d5cee7b376 Merge pull request #11471 from edx/sstudent/MA-1881-null-translation-check 
ma-1881 handling empty translations and testing
 2016-02-10 16:59:09 -05:00
Sanford Student
24c4c8abed ma-1881 handling empty translations and testing 
using lists for json serializability, if that's a word
 2016-02-10 15:56:42 -05:00
Ben Patterson
edc9227a8b TE-1194 update for test_teams. 
This can also serve as an example of the kind of changes we want to make.
 2016-02-10 14:22:50 -05:00
Sven Marnach
982c3e623b Pass DOM element, not jQuery object to XBlock initialisation. 
The function initializeXBlock() expects a DOM element, and is passed one in most
cases.  However, when adding a new XBlock component in Studio, the function is
passed a jQuery object, which ends up being forwarded to the actual
initialisation function of the XBlock.
 2016-02-10 18:54:30 +01:00
Ned Batchelder
9fd6bef39f Merge pull request #11496 from open-craft/capa-explanation-i18n 
Make 'Explanation' CAPA header translatable.
 2016-02-10 11:13:40 -05:00
Braden MacDonald
ee99cf9c8d Merge pull request #11436 from open-craft/omar/saml-crawl-fix 
Return 404 response from third party auth login when SAML disabled
 2016-02-10 08:00:06 -08:00
Jesse Zoldak
7ccca469fc Merge pull request #11481 from edx/zoldak/remove-lettuce-homepage-test 
Convert homepage acceptance test to bok-choy
 2016-02-10 08:45:06 -05:00
Awais Jibran
dabda5bc75 Merge pull request #11375 from attiyaIshaque/ai/tnl3573-resetpassword-empty-page-fix 
Resetting password shows empty page.
 2016-02-10 18:39:21 +05:00
Asad Iqbal
64291d3c01 Merge pull request #11391 from edx/asadiqbal08/WL-272 
asadiqbal08/WL-272 - Studio Language Selection
 2016-02-10 18:30:29 +05:00
Jesse Zoldak
f0c54c15ee Convert homepage acceptance test to bok-choy 2016-02-10 06:32:38 -05:00
Matjaz Gregoric
d067429c40 Make 'Explanation' CAPA header translatable. 
CAPA <explanation> nodes get transformed into a HTML <div> block
that contains the word 'Explanation'.

This patch makes it translatable.
 2016-02-10 10:49:38 +01:00
Attiya Ishaque
a042cbc7f0 Resetting password shows empty page. 
TNL-3573
 2016-02-10 14:47:41 +05:00
asadiqbal
64778cdf69 WL-272 2016-02-10 14:33:38 +05:00
Nimisha Asthagiri
dced810138 Merge pull request #11489 from edx/release 
Hotfix for reducing mobile warnings in tracking logs
 2016-02-09 21:33:31 -05:00
John Eskew
3f58954f3a Merge pull request #11469 from edx/jeskew/fix_django_19_warnings 
Remove deprecation warnings from Django models.
 2016-02-09 16:38:23 -05:00
Nimisha Asthagiri
a5574792fb Fix mobile Warning errors in tracking logs. 2016-02-09 13:22:15 -05:00
Andy Armstrong
84773d2ff7 Merge pull request #11482 from edx/release 
Merge release back to master
 2016-02-09 12:49:41 -05:00
Andy Armstrong
caf4cfbd3a Merge pull request #11268 from edx/andya/add-pattern-library 
Add edX Pattern Library to edx-platform
 2016-02-09 12:07:03 -05:00
clrux
a5e34d4e12 Merge pull request #11105 from edx/clrux/ac-23 
Updating forum buttons and overall icon cleanup
 2016-02-09 10:53:31 -05:00
clrux
0b3f9ee5e8 Merge pull request #11457 from edx/clrux/ac-252 
LMS: updating response status messaging
 2016-02-09 10:22:18 -05:00
Chris Rodriguez
4454c819c8 LMS: forum markup tweaks and cleanup 2016-02-09 09:34:58 -05:00
John Eskew
bb5c28c0c5 Remove deprecation warnings from Django models. 
Add app_label definitions in Meta classes for models.
Move import of course_mode model into methods to prevent importing
the models at startup time.
 2016-02-09 09:28:43 -05:00
Chris Rodriguez
9e0497dfab Updating response status messaging 2016-02-09 08:16:20 -05:00
Ehtesham Kafeel
cf5dc1075f Merge pull request #11289 from edx/ekafeel/Deprecated-Advanced-Component-Types 
Ekafeel/deprecated advanced component types
 2016-02-09 15:07:59 +05:00
Omar Khan
ed2cba2e2d Keep SAML configuration check 2016-02-09 16:10:31 +07:00
Omar Khan
9b7bb0dc20 Make SAMLAuthBackend._config a cached_property 
Cleaner, and keeps pylint happy
 2016-02-09 15:45:49 +07:00
Omar Khan
2c4e97ebfa Don't remove auth_url method 2016-02-09 15:45:21 +07:00
Omar Khan
78d4ed31a1 Revert "Keep SAML configuration check" 
This reverts commit a020464a41.
 2016-02-09 15:40:27 +07:00
Adam Palay
ae279569db address mathjax rendering bug (TNL-4080) 2016-02-08 10:32:22 -05:00
David Ormsbee
9ae0dada4c Merge pull request #11445 from edx/ormsbee/clear_cache_in_tests 
Clear caches between tests for ModuleStoreTestCase/SharedModuleStoreTestCase
 2016-02-08 10:23:54 -05:00
John Eskew
07c542d8cb Merge pull request #11420 from edx/jeskew/ensure_indexes_fix 
Make ensure_indexes mgmt cmd semi-idempotent.
 2016-02-08 09:55:05 -05:00