Permalink
Browse files

Merge branch '1.9' into 1.10

Conflicts:
	.travis.yml
	CONTRIBUTING.md
	INSTALL.txt
	composer.json
	docs/appendix/faqs.rst
	docs/guides/hooks-list.rst
	docs/guides/upgrading.rst
	docs/guides/views.rst
	docs/guides/widgets.rst
	docs/intro/index.rst
	docs/locale/ca/LC_MESSAGES/index.mo
	docs/locale/de/LC_MESSAGES/about.mo
	docs/locale/es/LC_MESSAGES/about.mo
	docs/locale/es/LC_MESSAGES/appendix.mo
	docs/locale/es/LC_MESSAGES/intro.mo
	docs/locale/fr/LC_MESSAGES/about.mo
	docs/locale/it/LC_MESSAGES/about.mo
	docs/locale/ru/LC_MESSAGES/about.mo
	engine/classes/ElggDiskFilestore.php
	engine/classes/ElggPlugin.php
	engine/lib/elgglib.php
	engine/lib/input.php
	views/default/output/tags.php
  • Loading branch information...
ewinslow committed Dec 3, 2014
2 parents c266366 + 5eda2ad commit 8239b772b0584099454cb7d7c22bdac18486ec26
Showing with 16,831 additions and 5,877 deletions.
  1. +1 −1 .scripts/release.php
  2. +4 −0 .travis.yml
  3. +184 −1 CHANGELOG.md
  4. +1 −1 CODING.txt
  5. +1 −56 CONTRIBUTING.md
  6. +1 −1 INSTALL.txt
  7. +1 −1 README.md
  8. +1 −1 UPGRADE.txt
  9. +4 −12 actions/admin/upgrades/upgrade_discussion_replies.php
  10. +1 −2 actions/plugins/settings/save.php
  11. +272 −0 docs/admin/backup-restore.rst
  12. +95 −0 docs/admin/backup/ftp-backup-script.rst
  13. +1 −3 docs/admin/cron.rst
  14. +268 −0 docs/admin/duplicate-installation.rst
  15. +130 −0 docs/admin/getting-help.rst
  16. +4 −1 docs/admin/index.rst
  17. +3 −0 docs/admin/performance.rst
  18. +54 −4 docs/admin/plugins.rst
  19. +14 −133 docs/appendix/faqs.rst
  20. +182 −0 docs/appendix/faqs/development.rst
  21. +414 −0 docs/appendix/faqs/general.rst
  22. +25 −0 docs/appendix/faqs/security.rst
  23. +1 −1 docs/appendix/roadmap.rst
  24. +5 −2 docs/contribute/code.rst
  25. +3 −0 docs/contribute/docs.rst
  26. BIN docs/contribute/elgg-supporters.gif
  27. BIN docs/contribute/elgg-supporters.png
  28. +1 −1 docs/contribute/issues.rst
  29. +1 −1 docs/contribute/money.rst
  30. +4 −0 docs/contribute/releases.rst
  31. +2 −2 docs/design/amd.rst
  32. +7 −11 docs/design/database.rst
  33. +4 −2 docs/design/events.rst
  34. +1 −0 docs/design/index.rst
  35. +29 −0 docs/design/loggable.rst
  36. +7 −1 docs/design/security.rst
  37. +1 −1 docs/examples/crontab.example
  38. +45 −0 docs/guides/accessibility.rst
  39. +7 −3 docs/guides/actions.rst
  40. +42 −0 docs/guides/authentication.rst
  41. +11 −0 docs/guides/context.rst
  42. +52 −6 docs/guides/database.rst
  43. +36 −0 docs/guides/dont-modify-core.rst
  44. +3 −2 docs/guides/events-list.rst
  45. +35 −0 docs/guides/gatekeeper.rst
  46. +128 −0 docs/guides/guidelines.rst
  47. +51 −0 docs/guides/helpers.rst
  48. +14 −13 docs/guides/hooks-list.rst
  49. +14 −2 docs/guides/index.rst
  50. +108 −12 docs/guides/javascript.rst
  51. +5 −1 docs/guides/menus.rst
  52. +6 −2 docs/guides/notifications.rst
  53. +17 −0 docs/guides/page-owner.rst
  54. +26 −0 docs/guides/pagehandler.rst
  55. +87 −0 docs/guides/permissions-check.rst
  56. +9 −3 docs/guides/plugins.rst
  57. +311 −0 docs/guides/plugins/dependencies.rst
  58. +164 −0 docs/guides/plugins/plugin-skeleton.rst
  59. +1 −1 docs/guides/river.rst
  60. +76 −0 docs/guides/settings.rst
  61. +7 −4 docs/guides/themes.rst
  62. +4 −0 docs/guides/upgrading.rst
  63. +23 −3 docs/guides/views.rst
  64. +61 −0 docs/guides/views/page-structure.rst
  65. +50 −0 docs/guides/views/simplecache.rst
  66. +31 −0 docs/guides/walled-garden.rst
  67. +14 −5 docs/guides/web-services.rst
  68. +32 −0 docs/guides/web-services/hmac.rst
  69. +74 −61 docs/guides/widgets.rst
  70. +0 −2 docs/index.rst
  71. +2 −0 docs/intro/features.rst
  72. +2 −1 docs/intro/index.rst
  73. +4 −3 docs/intro/install.rst
  74. BIN docs/locale/es/LC_MESSAGES/admin.mo
  75. BIN docs/locale/es/LC_MESSAGES/design.mo
  76. BIN docs/locale/es/LC_MESSAGES/guides.mo
  77. +80 −0 docs/locale/ja/LC_MESSAGES/about.po
  78. +31 −31 docs/locale/pot/about.pot
  79. +1,739 −409 docs/locale/pot/admin.pot
  80. +1,756 −95 docs/locale/pot/appendix.pot
  81. +824 −700 docs/locale/pot/contribute.pot
  82. +958 −817 docs/locale/pot/design.pot
  83. +5,359 −2,227 docs/locale/pot/guides.pot
  84. +24 −29 docs/locale/pot/index.pot
  85. +601 −499 docs/locale/pot/intro.pot
  86. +563 −0 docs/locale/pot/plugins.pot
  87. +271 −264 docs/locale/pot/tutorials.pot
  88. +10 −0 docs/plugins/blog.rst
  89. +13 −0 docs/plugins/dashboard.rst
  90. +27 −0 docs/plugins/diagnostics.rst
  91. +41 −0 docs/plugins/file.rst
  92. +18 −0 docs/plugins/groups.rst
  93. BIN docs/plugins/images/dashboard.jpg
  94. BIN docs/plugins/images/file.jpg
  95. BIN docs/plugins/images/groups.jpg
  96. BIN docs/plugins/images/message_notification.jpg
  97. BIN docs/plugins/images/messageboard.jpg
  98. BIN docs/plugins/images/pages.jpg
  99. BIN docs/plugins/images/profile.jpg
  100. BIN docs/plugins/images/user_hover_menu.jpg
  101. +46 −0 docs/plugins/index.rst
  102. +12 −0 docs/plugins/messageboard.rst
  103. +13 −0 docs/plugins/messages.rst
  104. +24 −0 docs/plugins/pages.rst
  105. +44 −0 docs/plugins/profile.rst
  106. +4 −0 docs/plugins/thewire.rst
  107. +4 −0 docs/tutorials/blog.rst
  108. +5 −1 docs/tutorials/widget.rst
  109. +2 −1 engine/classes/Elgg/EventsService.php
  110. +5 −0 engine/classes/ElggDiskFilestore.php
  111. +11 −10 engine/classes/ElggPlugin.php
  112. +1 −1 engine/classes/ElggSite.php
  113. +2 −2 engine/lib/admin.php
  114. +5 −2 engine/lib/elgglib.php
  115. +50 −55 engine/lib/input.php
  116. +34 −0 engine/lib/upgrades/2014111600-1.9.4-recheck_comments_upgrade-9da270072a5b0cad.php
  117. +1 −1 htaccess_dist
  118. +1 −10 languages/de.php
  119. +3 −3 languages/en.php
  120. +9 −16 languages/es.php
  121. +1 −1 languages/fi.php
  122. +6 −13 languages/gl.php
  123. +9 −16 languages/ja.php
  124. +265 −265 languages/nl.php
  125. +67 −0 mod/blog/languages/ca.php
  126. +66 −0 mod/blog/languages/tr.php
  127. +84 −0 mod/bookmarks/languages/ca.php
  128. +1 −0 mod/ckeditor/languages/de.php
  129. +1 −0 mod/ckeditor/languages/fi.php
  130. +1 −0 mod/ckeditor/languages/gl.php
  131. +1 −0 mod/ckeditor/languages/ja.php
  132. +8 −0 mod/custom_index/languages/tr.php
  133. +1 −1 mod/developers/views/default/theme_sandbox/forms.php
  134. +14 −0 mod/embed/languages/tr.php
  135. +21 −0 mod/externalpages/languages/tr.php
  136. +1 −1 mod/file/languages/ja.php
  137. +3 −3 mod/groups/languages/de.php
  138. +13 −13 mod/groups/languages/es.php
  139. +311 −0 mod/groups/languages/fr.php
  140. +4 −0 mod/groups/languages/gl.php
  141. +1 −1 mod/groups/views/default/group/default.php
  142. +1 −1 mod/groups/views/default/groups/profile/fields.php
  143. +6 −0 mod/profile/languages/tr.php
  144. +1 −1 mod/profile/views/default/profile/details.php
  145. +3 −0 mod/site_notifications/languages/fi.php
  146. +3 −0 mod/site_notifications/languages/gl.php
  147. +2 −0 mod/tagcloud/languages/ca.php
  148. +2 −0 mod/tagcloud/languages/cmn.php
  149. +2 −0 mod/tagcloud/languages/da.php
  150. +2 −0 mod/tagcloud/languages/de.php
  151. +2 −0 mod/tagcloud/languages/es.php
  152. +2 −0 mod/tagcloud/languages/fi.php
  153. +2 −0 mod/tagcloud/languages/fr.php
  154. +2 −0 mod/tagcloud/languages/gl.php
  155. +2 −0 mod/tagcloud/languages/ja.php
  156. +2 −0 mod/tagcloud/languages/ko.php
  157. +3 −1 mod/tagcloud/languages/nl.php
  158. +2 −0 mod/tagcloud/languages/pl.php
  159. +5 −3 mod/tagcloud/languages/pt_BR.php
  160. +2 −0 mod/tagcloud/languages/ru.php
  161. +1 −1 mod/uservalidationbyemail/start.php
  162. +1 −1 mod/web_services/README.md
  163. +5 −5 mod/web_services/languages/ja.php
  164. +1 −1 views/default/output/tag.php
  165. +12 −5 views/default/output/tags.php
  166. +16 −8 views/default/user/default.php
View
@@ -49,7 +49,7 @@ function run_commands($commands) {
// Update translations
run_commands(array(
"tx pull -a --minimum-perc=100",
"make -C docs gettext",
"sphinx-build -b gettext docs docs/locale/pot",
"sphinx-intl --locale-dir=docs/locale/ build",
"git add .",
"git commit -am \"chore(i18n): update translations\"",
View
@@ -14,6 +14,7 @@ branches:
matrix:
include:
# Lint checks for PHP code and composer.json
- php: 5.6
env: VARIA=true
install:
@@ -44,8 +45,11 @@ matrix:
env: VARIA=true
install:
- sudo easy_install "Sphinx==1.2.2"
- sudo easy_install "sphinx-intl"
script:
- sphinx-intl --locale-dir=docs/locale/ build
- sphinx-build -b html -nW docs docs/_build/html
- sphinx-build -b html -D language=es -n docs docs/_build/html
services:
- mysql
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1 +1 @@
See docs/coding_standards/
See http://learn.elgg.org/en/stable/contribute/code.html
View
@@ -3,64 +3,9 @@
* **SECURITY ISSUES SHOULD BE REPORTED TO security @ elgg . org!** Please do not post any security issues on github.
* Support requests belong on the [Community site][2]. Tickets with support requests will be closed.
* We cannot make any guarantees as to when your ticket will be resolved or your PR merged.
## Pull requests
We love pull requests! Here's how to get your patch accepted as quickly as possible:
Before submitting a pull request:
* **By submitting a pull request you are agreeing to license the code under a [GPLv2 license][3] and [MIT license][4].**
* For new features, submit a feature request or [talk to us](http://community.elgg.org/groups/profile/211069/feedback-and-planning) and make sure the core team approves of your direction.
Good PR checklist:
* Clear, meaningful title
* Correctly formatted [commit message](http://learn.elgg.org/en/stable/contribute/code.html#commit-message-format)
* Detailed description
* Includes relevant tests (unit, e2e, etc.)
* Includes documentation update
* Passes the continuous build
* Is submitted against the correct branch:
* New features should be submitted against master. We do not introduce new features in bugfix branches.
* Bugfixes should be submitted against the latest non-master branch (unless the bug only appears in master).
## Bug reports
Before submitting a bug report:
* Search for an existing ticket on the issue you're having. Add any extra info there.
* Verify the problem is reproducible
* On the latest version of Elgg
* With all third-party plugins disabled
Good bug report checklist:
* Expected behavior and actual behavior
* Clear steps to reproduce the problem
* The version of Elgg you're running
* Browsers affected by this problem
* Post bug report using [Github issues](https://github.com/Elgg/Elgg/issues)
## Feature requests
Before submitting a feature request:
* Check the [community site][2] for a plugin that has the features you need.
* Consider if you can [develop a plugin][8] that does what you need.
* Search through the closed tickets to see if someone else suggested the same feature, but got turned down.
You'll need to be able to explain why your suggestion should be considered this time.
Good feature request checklist:
* Detailed explanation of the feature
* Real-life use-cases
* Proposed API
* For more information visit http://learn.elgg.org/en/stable/contribute/index.html
[2]: http://community.elgg.org
[3]: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
[4]: http://en.wikipedia.org/wiki/MIT_License
[6]: https://github.com/Elgg/Elgg/issues/new
[7]: http://docs.elgg.org/wiki/Development/Contributing/Patches
[8]: http://docs.elgg.org/wiki/Plugin_development
[9]: https://github.com/Elgg/Elgg/tree/master/docs/coding_standards
View
@@ -1 +1 @@
http://learn.elgg.org/en/1.x/intro/install.html
See http://learn.elgg.org/en/stable/intro/install.html
View
@@ -1,4 +1,4 @@
Elgg [![Build Status](https://secure.travis-ci.org/Elgg/Elgg.png?branch=master)](https://travis-ci.org/Elgg/Elgg) [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/Elgg/Elgg/badges/quality-score.png?s=ef3560cf83f4fd1ae3abbd6e93c20e5b4832c343)](https://scrutinizer-ci.com/g/Elgg/Elgg/)
Elgg [![Build Status](https://secure.travis-ci.org/Elgg/Elgg.svg?branch=1.9)](https://travis-ci.org/Elgg/Elgg) [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/Elgg/Elgg/badges/quality-score.png?s=1.9)](https://scrutinizer-ci.com/g/Elgg/Elgg/?branch=1.9) [![Scrutinizer Code Coverage](https://scrutinizer-ci.com/g/Elgg/Elgg/badges/coverage.png?b=1.9)](https://scrutinizer-ci.com/g/Elgg/Elgg/?branch=1.9) [![Read the docs build status](https://readthedocs.org/projects/elgg/badge/?version=1.9)](http://learn.elgg.org/en/1.9/)
====
Copyright (c) 2008-2014, see COPYRIGHT.txt
View
@@ -1 +1 @@
See http://learn.elgg.org/en/1.9/admin/upgrading.html
See http://learn.elgg.org/en/stable/admin/upgrading.html
@@ -51,14 +51,6 @@
if (!$annotations) {
// no annotations left
// set the upgrade as completed
$factory = new ElggUpgrade();
$upgrade = $factory->getUpgradeFromPath('admin/upgrades/comments');
if ($upgrade instanceof ElggUpgrade) {
$upgrade->setCompleted();
}
break;
}
@@ -107,7 +99,7 @@
$error_count++;
}
// set the time_updated and last_action for this comment
// set the time_updated and last_action for this reply
// to the original time_created
$fix_ts_query = "
UPDATE {$db_prefix}entities
@@ -137,16 +129,16 @@
delete_data($delete_query);
}
// update the last action on containers to be the max of all its comments
// update the last action on containers to be the max of all its replies
// or its own last action
$comment_subtype_id = get_subtype_id('object', 'discussion_reply');
$reply_subtype_id = get_subtype_id('object', 'discussion_reply');
foreach (array_unique($container_guids) as $guid) {
// can't use a subquery in an update clause without hard to read tricks.
$max = get_data_row("SELECT MAX(time_updated) as max_time_updated
FROM {$db_prefix}entities e
WHERE e.container_guid = $guid
AND e.subtype = $comment_subtype_id");
AND e.subtype = $reply_subtype_id");
$query = "
UPDATE {$db_prefix}entities
@@ -30,8 +30,7 @@
action("$plugin_id/settings/save");
} else {
foreach ($params as $k => $v) {
// We must use __set() so the plugin hooks are triggered
$result = $plugin->$k = $v;
$result = $plugin->setSetting($k, $v);
if (!$result) {
register_error(elgg_echo('plugins:settings:save:fail', array($plugin_name)));
forward(REFERER);
Oops, something went wrong.

0 comments on commit 8239b77

Please sign in to comment.