Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,352 Commits 1 Branch 0 Tags
8a80934fcba15dce4c78d55e09421adea831fa76
Commit Graph

9600 Commits

Author SHA1 Message Date
zubair-arbi
6bb878afb2 Merge pull request #5468 from edx/zub/bugfix/tnl-256-protex-scroll-with-increased-font-size 
set overflow to scroll so that user can see full content with increased ...
 2014-10-20 12:23:24 +05:00
frances botsford
b9c37120b3 Merge pull request #2682 from edx/frances/experiments/rtl 
RTL platform support
 2014-10-17 15:22:36 -04:00
Frances Botsford
c92f52e0bd cleanup and response to PR review 2014-10-17 13:51:43 -04:00
Omar Al-Ithawi
d8bf0ef5a5 Elegant rtl/ltr css switch, LMS RTL fixes, language aware @cache_if_anonymous 2014-10-17 13:51:42 -04:00
Frances Botsford
ce3cb27864 switching RTL on the fly - added bi-app for sass compiling 2014-10-17 13:51:42 -04:00
Omar Al-Ithawi
9b287960e7 LMS RTL fixes 2014-10-17 13:51:42 -04:00
Frances Botsford
e255ac1f29 Initial pass at LMS and Studio RTL 2014-10-17 13:51:42 -04:00
Jesse Zoldak
03a42898c9 Merge pull request #5608 from edx/zoldak/lti-test-fixes 
Fix sychronization issues in LTI lettuce test
 2014-10-17 13:18:11 -04:00
Jesse Zoldak
dd35005132 Fix sychronization issues in LTI test 
Better verification for troubleshooting LTI test failures
Dismiss any lingering alerts after lettuce scenarios
 2014-10-17 12:22:34 -04:00
Jesse Zoldak
f0b7850de3 Merge pull request #5609 from edx/zoldak/remove-tmp-references 
Remove references to /tmp in tests
 2014-10-17 12:12:53 -04:00
Waqas Khalid
3974e6d95f Merge pull request #5562 from mlkwaqas/waqas/tnl526-search-magnify-glass-not-working 
Clicking the magnifying glass should perform search
 2014-10-17 20:03:36 +05:00
Christina Roberts
2ae3fd0a08 Merge pull request #5589 from edx/christina/tnl-399-remove-save 
Do not save an xblock after rendering the Studio view.
 2014-10-17 10:37:47 -04:00
Sarina Canelake
d1f256af29 Merge pull request #5566 from Kelketek/lazy_coursemode_translation 
Lazy loading of CourseMode model's internationalization.
 2014-10-17 10:26:05 -04:00
Jesse Zoldak
24f90307f7 Remove references to /tmp in tests 
Including:

* Change path for mongo_metadata_inheritance to use unique temp dir
* Update SASS_CACHE_PATH with thread-safe temp dir
* Remove hard coded directory reference for grades download tests
* Remove hard coded directory reference for direct mongo test
 2014-10-17 10:00:12 -04:00
Waqas Khalid
ff8b281f5b Clicking the magnifying glass should perform search 
In forum search is only working when user enter some
text in the search textfield and press the Enter
button. It should also work when we click on
magnifying glass.

TNL-526
 2014-10-17 18:34:57 +05:00
cahrens
d3012af733 Do not save an xblock after rendering the Studio view. 
TNL-399

Content and settings are no longer saved when Studio view is rendered.
 2014-10-17 09:29:32 -04:00
Adam
5511aba23e Merge pull request #5471 from edx/adam/thumbnail-extentions 
image files with different extensions should generate thumbnails with di...
 2014-10-17 09:18:06 -04:00
Adam
53c48024a8 Merge pull request #5599 from edx/adam/fix-matlab-invalid-char 
gracefully fail when parsing xml with non-compatible string (TNL-347)
 2014-10-17 09:14:21 -04:00
Ben Patterson
5703adb722 Merge branch 'release' 
Includes rc/2014-10-14
 2014-10-16 20:11:55 -04:00
brianhw
3604dfce27 Merge pull request #5561 from edx/bugfix/ichuang/fix-invalid-key-name-child-id 
fix tracking log entry key child-id -> child_id
 2014-10-16 14:39:48 -04:00
Adam Palay
e1def5c554 gracefully fail when parsing xml with non-compatible string (TNL-347) 2014-10-16 10:47:36 -04:00
Calen Pennington
e00b666db9 Merge pull request #5590 from cpennington/xblocks-with-children 
Enable pure XBlocks to use children in edx-platform
 2014-10-16 10:23:35 -04:00
Diana Huang
011b4dc181 Merge pull request #5594 from edx/diana/open-id-bug 
Handle OpenID errors for POST requests.
 2014-10-16 09:53:31 -04:00
Calen Pennington
fee681be68 Escape xblock wrapper data attributes and css classes for safe html 2014-10-16 09:09:22 -04:00
Calen Pennington
4d653d5359 Set xmodule_runtime on all XModule-like things (including pure XBlocks using the XModuleMixin) 
Expose xmodule_runtime as .runtime if it's set (otherwise, fall back to
the supplied runtime). This causes all blocks to act like XModules when
they have a ModuleSystem, and like XModuleDescriptors if they only have
a DescriptorSystem.
 2014-10-16 09:09:20 -04:00
Calen Pennington
41f3c040c8 Add block type to the available attributes in the xblock javascript frontend 2014-10-16 09:08:57 -04:00
Calen Pennington
4a43427c6d Add block.name to xblock javascript frontend 2014-10-16 09:08:57 -04:00
Calen Pennington
47a3172bf1 Enable parent/child tests using the acid XBlock. 
Also fix those tests to correctly wait until the ajax portions have
finished before evaluating the page contents.
 2014-10-16 09:08:54 -04:00
Daniel Friedman
64d2514f2c Merge pull request #5528 from edx/dan-f/data-download-tech-debt 
Student profile CSV background task tech debt
 2014-10-15 16:54:41 -04:00
Diana Huang
0c6cba73ac Handle OpenID errors for POST requests. 
ECOM-441
 2014-10-15 16:33:31 -04:00
E. Kolpakov
4f3240e488 Fixed errors in discussion XModule, caused by c2716d4 [TNL-606] 
Co-Authored-By: jmclaus <jmc@edx.org>
Co-Authored-By: jsa <jsa@edx.org>
 2014-10-15 12:29:27 -04:00
Nimisha Asthagiri
e0f9def061 Merge pull request #5584 from edx/nimisha/val/MA-81 
MA-81 Honor video download setting with VAL-enabled videos.
 2014-10-15 10:10:13 -04:00
Nimisha Asthagiri
5355b4b96e MA-81 Honor video download setting with VAL-enabled videos. 2014-10-14 22:32:16 -04:00
Will Daly
26a94afb26 Merge pull request #5573 from edx/will/django-countries-fix 
Update django-countries to 2.1.2, override country name for Taiwan
 2014-10-14 17:14:32 -04:00
jsa
786fc806f5 Add topic selection to inline thread editing, fixing errors 
Co-Authored-By: Brian Talbot <btalbot@edx.org>

TNL-549
 2014-10-14 15:45:19 -04:00
Stephen Sanchez
7df00578f1 Merge pull request #5536 from edx/sanchez/remove-new-header-footer-flags 
Removing the feature flags for new header and footer.
 2014-10-14 15:06:45 -04:00
Renzo Lucioni
257e8cf857 Merge pull request #5551 from edx/renzo/track-selection-test-cleanup 
Clean up after track selection experiment
 2014-10-14 15:06:19 -04:00
Daniel Friedman
e9292fb5a5 Add coverage for cohort view's showSection link 
TNL-550
 2014-10-14 14:31:43 -04:00
Renzo Lucioni
bd7715a393 Clean up after track selection experiment 2014-10-14 13:56:49 -04:00
stephensanchez
c15d97ea9b Removing the feature flags for new header and footer. 
Fix acceptance tests

Updating lettuce tests.

Revert the deletion of the original edx header and footer.

Renaming old header and footers to legacy files.

Add IS_EDX_DOMAIN flag for header.

Updating tests and django main template.

renaming the header files for microsite backwards compat.
 2014-10-14 17:47:46 +00:00
Will Daly
ad11c1b6f4 Update django-countries to 2.1.2, override country name for Taiwan 2014-10-14 13:12:36 -04:00
Greg Price
be81f1d297 Merge pull request #5547 from edx/gprice/password-reset-csrf-exempt 
Make password reset endpoint CSRF exempt
 2014-10-14 11:33:55 -04:00
Waqas Khalid
af3d27135a Merge pull request #5540 from mlkwaqas/waqas/tnl188-endorsement-username-link-broken 
Endorsement username shouldn't be broken
 2014-10-14 19:01:43 +05:00
Don Mitchell
7e52ba872e Merge pull request #5535 from edx/dhm/unit_perf 
Performance enhancements for unit tests
 2014-10-14 09:37:08 -04:00
Jonathan Piacenti
d09d729b75 Lazy loading of CourseMode model's internationalization. 2014-10-13 21:30:07 +00:00
Waqas Khalid
f023b62bd0 Endorsement username shouldn't be broken 
If we endourse the answer of the question in discussion
the username link that is created is broken whereas it
should point to the userprofile.

TNL-188
 2014-10-13 16:58:30 +05:00
ichuang
38c7832f75 fix tracking log entry key child-id -> child_id 2014-10-12 13:40:54 -04:00
Ben Patterson
3ef0653711 pylint cleanup. 2014-10-11 12:51:20 -04:00
Sarina Canelake
02bfe039fd Merge pull request #5431 from open-craft/datadog-wrapper 
Consistently wrap the DataDog API to prevent logged errors & missing stats data
 2014-10-10 14:59:38 -04:00
Don Mitchell
f4b2789f54 Merge pull request #5288 from edx/split/info_perf 
Upgrade pymongo
 2014-10-10 12:55:38 -04:00