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

26313 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
e403593c52 October 16, 2014 Release Notes 2014-10-16 13:59:20 -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
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
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
Daniel Friedman
33cfb9c78a Merge pull request #5582 from edx/dan-f/cohorts-internationalization 
Ensure all user-facing cohort-related strings are internationalized
 2014-10-15 16:26:06 -04:00
Daniel Friedman
62c46c80e7 Bump the report downloads poll interval to 20 seconds 
TNL-565
 2014-10-15 15:58:08 -04:00
Daniel Friedman
37158bab1f Create standard way of updating a task's progress 
TNL-566
 2014-10-15 15:58:08 -04:00
Daniel Friedman
a9fc3b035b Verify cohort strings are scraped for translation 2014-10-15 14:51:02 -04:00
jmclaus
bb6cd7dc0f Merge pull request #5554 from edx/jmclaus/fix-errors-discussion-xmodule 
Fixed errors in discussion XModule
 2014-10-15 19:17:01 +02:00
David Baumgold
a3ac57bb1f Merge pull request #5534 from edx/i18n-cms-index 
Some strings were missing i18n calls
 2014-10-15 12:57:07 -04:00
Ben Patterson
6bcaf61b0c Introduce new switch for paver run_quality command. 
When using -p, the underlying diff-quality command will pass that
number as a value for --fail-under.

For example,
  paver run_quality -p 75

Will pass 75 into the --fail-under switch on diff-quality.

Also upgrades diff-cover in order to take advantage of this funcitonality.
 2014-10-15 12:40:59 -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
David Baumgold
eba03512d5 Replace course status message 2014-10-15 11:35:56 -04:00
David Baumgold
0f07bad3ed Some strings were missing i18n calls 2014-10-15 11:35:56 -04:00
Jim Abramson
b6013a2399 Merge pull request #5577 from edx/jsa/tnl549 
Fix topic-related errors when editing discussion threads in inline mode.
 2014-10-15 11:34:40 -04:00
Sarina Canelake
11fb9364ab Merge pull request #5376 from edx/sarina/new-contributor-docs 
Update Contributing documentation with new PR process. OPEN-111
 2014-10-15 11:19:39 -04:00
Sarina Canelake
8f9f4ba51b Update Contributing documentation with new PR process. OPEN-111 2014-10-15 11:17:57 -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
Brian Talbot
1171d0ec2b Merge pull request #5555 from edx/talbs/fix-studio-rerun-notification 
Studio: FIX - Course Rerun Outline Notification Icon Display
 2014-10-15 08:13:32 -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
Usman Khalid
3ae2cef9ea Merge pull request #5569 from edx/usman/lxml-changes-2 
Moved imports to manage.py and wsgi.py.
 2014-10-15 01:09:38 +05: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
Ben Patterson
e82ba142ce Merge pull request #5575 from edx/sarina/10142014-translation-update 
Update translations (autogenerated message)
 2014-10-14 15:21:12 -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