Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,110 Commits 1 Branch 0 Tags
238b4a5df187ea795582200d447d0136eb130921
Commit Graph

8506 Commits

Author SHA1 Message Date
James Tauber
238b4a5df1 tests for PR 3769 
Two out of three fail without PR 3769 but all pass with PR 3769.
 2014-06-26 10:37:58 -04:00
James Tauber
99cfea153c dummy theme templates for testing 2014-06-26 10:37:58 -04:00
Christine Lytwynec
96e5139d66 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/tests/test_video.py
 2014-06-25 13:51:31 -04:00
Alexander Kryklia
c9afa056ad Move video descriptor instantiation in tests to single place. 2014-06-25 14:41:15 +03:00
James Tauber
54399533b7 Merge pull request #3769 from shindere/favicon-fixup 
Improves the way LMS serves /favicon.ico
 2014-06-24 16:30:11 -04:00
Oleg Marshev
715fde27c4 Redirect Chinese students to a Chinese CDN for video. 2014-06-24 18:39:52 +03:00
Adam
a053dfbbd8 Merge pull request #4192 from edx/adam/change-logging-level-gradding 
Lower logging level in grading condition from exception to info
 2014-06-24 10:34:48 -04:00
Alexander Kryklia
03ad6584db Merge pull request #4181 from edx/alex/allow_bok_choy_in_dev_env 
Add possibility to run bok_choy tests in local env.
 2014-06-24 12:20:52 +03:00
Adam Palay
d9f0a6ba68 Lower logging level in grading condition from exception to info 
addresses part of LMS-2907
 2014-06-23 16:50:28 -04:00
Ned Batchelder
844eaeffca Merge pull request #4184 from IONISx/tusbar/add-mktg-check-dropdown 
Remove FAQ link in header when disabled
 2014-06-23 16:43:37 -04:00
Adam
970d8dd2d0 Merge pull request #4190 from edx/usman/lms2848-htmlbooks-fix 
Fix for htmlbooks
 2014-06-23 16:16:12 -04:00
Piotr Mitros
4eb234e79f Merge pull request #4174 from edx/pmitros/chromeless-xblocks 
XBlocks can disable navigation chrome.

This allows for full-screen XBlocks (such as code IDEs), as well as allowing us to somewhat hackishly build top-level XBlocks. This is the first step on the path to non-hackish top-level XBlocks.
 2014-06-23 11:56:05 -04:00
Bertrand Marron
ae3d9feb7e Remove FAQ link in header when disabled 2014-06-23 15:24:54 +02:00
Will Daly
c16bdf332b ORA2 release-2014-06-23T13.19 2014-06-23 09:23:33 -04:00
Alexander Kryklia
a7251e06d4 Add possibility to run bok_choy tests in local env. 2014-06-23 14:44:48 +03:00
Sarina Canelake
9fb2731a57 Add Amharic language 2014-06-23 07:42:39 -04:00
Sarina Canelake
54cf1adb86 Add Tamil language 2014-06-23 07:42:39 -04:00
Usman Khalid
d36e00d4a5 Pass storage_url and token values as parameters to StudentNotes init. 
LMS-2848
 2014-06-23 16:38:02 +05:00
Usman Khalid
f253f9a784 Added mising tinymce.js to static_htmlbook.html. 
LMS-2848
 2014-06-23 16:10:02 +05:00
Andy Armstrong
20675857dc Merge pull request #3999 from edx/christina/updating-split-test 
Ability to change the associated group configuration for a split test
 2014-06-20 14:15:41 -04:00
cahrens
a395c2fa4b Complete Studio support for handling group configuration changes 
STUD-1658
 2014-06-20 11:41:23 -04:00
cahrens
73e7ced6f9 Introduce constants for studio_view, student_view, and author_view. 2014-06-20 11:41:23 -04:00
Andy Armstrong
11c25e8c1a Add Studio handling for changes to group configurations 
STUD-1658
 2014-06-20 11:41:22 -04:00
Piotr Mitros
87a462e206 Review from Cale 2014-06-20 11:07:30 -04:00
Piotr Mitros
afe22ca42e Review from Cale 2014-06-20 10:57:11 -04:00
Piotr Mitros
e644f641ac Explicit disable_accordion 2014-06-20 10:29:17 -04:00
Piotr Mitros
17d2420f7b Removed suppress_top_level_nav, as per Cale 2014-06-20 10:23:16 -04:00
Muhammad Ammar
15839147c2 Youtube Video Quality Button Tests 2014-06-20 13:48:27 +00:00
Piotr Mitros
4f303a623b XBlocks can disable navigation chrome. 
There is an option to:
* Enable/disable accordion navigation
* Enable/disable/repoint tab navigation

This allows for full-screen XBlocks (e.g. a code IDE, or large video
player). It is also the first pass at allowing top-level XBlocks. It's
also now possible to make a chromeless XBlock, point a tab to it, and
make it point back to that tab.

Next steps down that path would be:
* Fix up how tabs are handled. The current version is a hack.
* Create appropriate XBlocks for courseware, tabbed navigation,
  etc. to reach feature parity
* Invert/rejigger the XML format.
 2014-06-19 21:06:08 -04:00
muhammad-ammar
0258e71ab1 Merge pull request #4146 from edx/ammar/remove-flash-test-scenarios 
Remove Flash Test Scenarios
 2014-06-20 00:08:40 +05:00
jsa
e6871af2d3 forums: add UX for username search results. 
JIRA: FOR-627
 2014-06-19 11:33:52 -04:00
Adam
7cc85b43e1 Merge pull request #4160 from edx/adam/browser-warning-lte-ie8 
only display browser warning for <= IE8 (LMS-2732)
 2014-06-19 09:48:41 -04:00
Sarina Canelake
30c8da1596 Fix variable names to give context for translators 
fix other various i18n issues
 2014-06-18 23:28:39 -04:00
Adam Palay
c3a81f1cce only display browser warning for <= IE8 (LMS-2732) 2014-06-18 17:02:18 -04:00
Sébastien Hinderer
65a07dd52c The LMS should serve favicon.ico also when a theme is enabled. 2014-06-18 14:33:11 +02:00
Muhammad Ammar
3f88ff662e Remove Flash Test Scenarios 2014-06-18 10:47:32 +00:00
Waqas Khalid
9e6333f689 Remember the user last thread sort preference 
FOR-545
 2014-06-18 14:26:30 +05:00
Ned Batchelder
708bb8a57e Merge pull request #4141 from IONISx/tusbar/end-mktg-urls 
Add missing $ at the end of the MKTG URLs
 2014-06-17 17:45:56 -04:00
Sarina Canelake
a8cd760ce3 Merge pull request #4121 from edx/sarina/fix-i18n-bugs 
Fix i18n translation issues
 2014-06-17 16:14:41 -04:00
Mathew Peterson
9659f24d02 Merge pull request #4133 from edx/mathewpeterson/fix_unicode_in_url_bug 
404 error for unwanted unicode in url
LMS-2488
 2014-06-17 14:46:35 -04:00
Minh-Tue Vo
ca045aaa3d Merge pull request #4139 from edx/mvo/removing-dots 
Removing dot in scenario names
 2014-06-17 14:43:03 -04:00
Bertrand Marron
573eda0d61 Add missing $ at the end of the MKTG URLs 2014-06-17 20:03:31 +02:00
Sarina Canelake
b70bd2be78 Use ngettext rather than "word(s)" for plural phrases 2014-06-17 13:25:46 -04:00
Mat Peterson
c86cbe466c 404 error for unwanted unicode in url 
LMS-2488
 2014-06-17 16:10:45 +00:00
Sarina Canelake
c68fce1f0a Fix i18n translation issues 2014-06-17 12:03:27 -04:00
Mathew Peterson
a6fb2ac826 Merge pull request #4110 from edx/mathewpeterson/invalid_characters_error 
courseware/views.py index function position value integer error correction and test
 2014-06-17 11:23:00 -04:00
muhammad-ammar
95769fe442 Merge pull request #4123 from edx/ammar/reduce-captions-wait-time 
Reduce captions wait time.
 2014-06-17 20:15:47 +05:00
muhammad-ammar
ac26f27898 Merge pull request #4125 from edx/ammar/improve-certificates-test-time 
Improve certificates test time
 2014-06-17 18:45:35 +05:00
Dave St.Germain
0b37c987c6 Merge pull request #3908 from edx/dcs/support-dashboard 
Added manual refund page for support.
PR-615
 2014-06-17 08:27:34 -04:00
Dave St.Germain
f2fb57e196 Added manual refund page for support. 
PR-615
 2014-06-17 08:24:02 -04:00