Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ben Patterson
9745b953bc Merge pull request #5597 from edx/benp/doc-paver-changes 
Doc for paver quality switches.
 2014-10-17 10:57:54 -04:00
Alison Hodges
a08e2ee232 Open source rename child-id 2014-10-17 10:52:03 -04: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
Waheed Ahmed
9d57599097 Merge pull request #5587 from edx/waheed/tnl617-fix-cc-button-in-ie 
Fixed CC button in internet explorer.
 2014-10-17 13:51:36 +05:00
Louis Pilfold
16ed497497 Use box-sizing SCSS mixin rather than property 2014-10-17 09:09:19 +01:00
Waheed Ahmed
16566684c9 Fixed CC button in internet explorer. 
TNL-617
 2014-10-17 12:23:27 +05:00
Ben Patterson
5703adb722 Merge branch 'release' 
Includes rc/2014-10-14
 2014-10-16 20:11:55 -04:00
Ben Patterson
b8807e8163 Clarify swtiches on paver tasks. 2014-10-16 19:59:15 -04:00
Mark Hoeber
208c6f1dba Merge pull request #5578 from edx/markhoeber-doc1083 
October 15, 2014 Release Notes
 2014-10-16 18:51:39 -04:00
Mark Hoeber
e556bf8256 Merge pull request #5507 from edx/markhoeber-UTC-change 
Course times to use UTC
 2014-10-16 18:50:52 -04:00
Mark Hoeber
2c5118ef3c Course times to use UTC 2014-10-16 18:50:28 -04:00
Ben Patterson
4396a3f62d Doc for paver quality switches. 2014-10-16 16:59:14 -04:00
Nimisha Asthagiri
23877cfe8f Merge pull request #5236 from edx/pull-requests/review 
Common terminology for review comments
 2014-10-16 16:25:30 -04:00
Alison Hodges
028d81fd72 Merge pull request #5529 from edx/ahodges/doc/DOC916mobile 
Updates to video events for mobile
 2014-10-16 16:15:18 -04:00
Alison Hodges
4c246000a3 Updates to video events for mobile 2014-10-16 16:09:04 -04:00
Christina Roberts
f7ef9eb511 Merge pull request #5510 from edx/christina/bug-tnl-543 
Pass group_id when getting user thread and comment counts.
 2014-10-16 16:03:22 -04:00
Mark Hoeber
ed0cf738fe Change Log Update 2014-10-16 15:00:08 -04:00
Nimisha Asthagiri
ab5c7e5833 Replace tag/label with type, and an example. 2014-10-16 14:49:00 -04:00
Nimisha Asthagiri
8693e78e2e Common terminology for review comments 2014-10-16 14:48:59 -04:00
Carol Tong
c7204c61a9 Merge pull request #5604 from edx/carol/docs/noteformatfix 
Fixed note formatting
 2014-10-16 14:47:59 -04:00
Carol Tong
f0eedffd73 Fixed note formatting 2014-10-16 14:43:34 -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
cahrens
7133cfc150 Pass group_id when getting user thread and comment counts. 
Depends on cs_comments_serivce commit ea218a2b038b59e63fd6593b5598db90223636e1.

TNL-543
 2014-10-16 14:32:10 -04:00
Mark Hoeber
ae2bcb14df added tools to components index 2014-10-16 14:26:14 -04:00
Mark Hoeber
ebe889b92b Fix components index 2014-10-16 14:23:09 -04:00
Mark Hoeber
3f30f6283a Mark Edits 2014-10-16 14:23:09 -04:00
Piotr Mitros
cd9476b545 First pass at improving OLX docs 2014-10-16 14:23:08 -04:00
Will Daly
52051df4d4 Fix some bugs in the student view shim, add tests 2014-10-16 14:03:41 -04:00
Mark Hoeber
e403593c52 October 16, 2014 Release Notes 2014-10-16 13:59:20 -04:00
lduarte1991
9005f2e829 Annotations Tools: spacing and comment fixes - will be squashed 2014-10-16 10:55:33 -04:00
Adam Palay
e1def5c554 gracefully fail when parsing xml with non-compatible string (TNL-347) 2014-10-16 10:47:36 -04:00
Will Daly
c0582cc437 Fix broken profile API test 2014-10-16 10:24:00 -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
Will Daly
8761eaf3dd Added check for duplicate email and username 2014-10-16 10:20:21 -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
Will Daly
7ef9ec838f Added better docstrings and comments 2014-10-16 09:42:43 -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
Will Daly
e89afa93c0 WIP: add login and registration end-points to the user API. 2014-10-16 08:48:38 -04:00
Ben Patterson
c8ddc84db9 Merge pull request #5552 from edx/benp/diff-cover-threshold2 
Benp/diff cover threshold2
 2014-10-15 19:44:24 -04:00