Merge pull request Elgg#7769 from mrclay/release-1.10.0

Release 1.10.0
bhgraham · Jan 12, 2015 · 4163731 · 4163731
2 parents 75c62f2 + c2c71d6
commit 4163731
Show file tree

Hide file tree

Showing 23 changed files with 462 additions and 4,212 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,36 @@
+<a name="1.10.0"></a>
+## 1.10.0  (2015-01-11)
+
+#### Contributors
+
+* Paweł Sroka (12)
+* Per Jensen (3)
+* Steve Clay (3)
+* Evan Winslow (2)
+* Arsalan Shah (1)
+* Juho Jaakkola (1)
+
+#### Features
+
+* **security:** No longer ship with vendors that have security advisories ([b193ebcf](https://github.com/Elgg/Elgg/commit/b193ebcf2cbfff13732303d3601a0d504c9f94a4), closes [#7738](https://github.com/Elgg/Elgg/issues/7738))
+* **test:** Added rewrite rules for builtin PHP cli server execution ([a0ff98e2](https://github.com/Elgg/Elgg/commit/a0ff98e21175a010b15f3d98517aaa2be95c114b))
+
+
+#### Documentation
+
+* **nginx:** Added sample nginx configuration and moved sample configs to install/config/ ([dbcd7548](https://github.com/Elgg/Elgg/commit/dbcd754839796ea00fd711cb149c9c94eff8e2da))
+* **requirements:** Updated PHP version used in docs as requirement to 5.4 ([5f4f8eea](https://github.com/Elgg/Elgg/commit/5f4f8eead513495a474b4eba4698c3c66795b0a0))
+
+
+#### Bug Fixes
+
+* **CSS:** adds margin between a file's text and image ([261e92b4](https://github.com/Elgg/Elgg/commit/261e92b40bad46455ec68bf2cfc695cef5cbf0dc), closes [#7712](https://github.com/Elgg/Elgg/issues/7712))
+* **amd:** Added coverage tests and fixed minor bugs. ([6250fd76](https://github.com/Elgg/Elgg/commit/6250fd76ca72bc196788da2a4f83f562f99a5d42))
+* **blog:** adds missing class to preview button ([be3b559b](https://github.com/Elgg/Elgg/commit/be3b559b20da20c08940c5a2623f5b817f0c3f12), closes [#7706](https://github.com/Elgg/Elgg/issues/7706))
+* **http:** Send a minimal 404 header for /favicon.ico requests ([b8c8a280](https://github.com/Elgg/Elgg/commit/b8c8a280457e34c43b9bf8a83f51e845339202e7), closes [#7261](https://github.com/Elgg/Elgg/issues/7261))
+* **settings:** It's again possible to set user specific setting for a plugin ([80e0c904](https://github.com/Elgg/Elgg/commit/80e0c904abafea70eb64b037f0e5d6f8144e7344))
+
+
 <a name="1.10.0-rc.1"></a>
 ### 1.10.0-rc.1  (2014-12-15)
 

diff --git a/actions/profile/fields/add.php b/actions/profile/fields/add.php
@@ -8,9 +8,9 @@
 $type = get_input('type');
 
 $fieldlist = elgg_get_config('profile_custom_fields');
-if (!$fieldlist) {
+if (!$fieldlist && $fieldlist !== '0') {
 	$fieldlist = '';
-	$id = 1;
+	$id = 0;
 } else {
 	$fieldlistarray = explode(',', $fieldlist);
 	foreach ($fieldlistarray as $key => $value) {
@@ -20,7 +20,7 @@
 }
 
 if (($label) && ($type)) {
-	if (!empty($fieldlist)) {
+	if ($fieldlist !== '') {
 		$fieldlist .= ',';
 	}
 	$fieldlist .= "$id";

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "elgg/elgg",
-    "version": "1.10.0-rc.1",
+    "version": "1.10.0",
     "description": "Elgg is an award-winning social networking engine, delivering the building blocks that enable businesses, schools, universities and associations to create their own fully-featured social networks and applications.",
     "license": "GPL-2.0",
     "minimum-stability": "dev",
@@ -37,4 +37,4 @@
         "squizlabs/php_codesniffer": "~1.5",
         "simpletest/simpletest": "~1.1"
     }
-}
+}
diff --git a/docs/contribute/releases.rst b/docs/contribute/releases.rst
@@ -20,7 +20,7 @@ Requirements
 * Access to `Twitter account`_
 * Access to `G+ page`_
 * Node.js and NPM installed
-* Sphinx installed (``easy_install sphinx``)
+* Sphinx installed (``easy_install sphinx && easy_install sphinx-intl``)
 * Transifex client installed (``easy_install transifex-client``)
 * Transifex account with access to Elgg project
 
@@ -44,6 +44,7 @@ Install the prerequisites:
 
    npm install elgg-conventional-changelog
    easy_install sphinx
+   easy_install sphinx-intl
    easy_install transifex-client
 
 Run the ``release.php`` script. For example, to release 1.9.1:

diff --git a/docs/locale/fr/LC_MESSAGES/index.mo b/docs/locale/fr/LC_MESSAGES/index.mo
diff --git a/docs/locale/fr/LC_MESSAGES/index.po b/docs/locale/fr/LC_MESSAGES/index.po
@@ -0,0 +1,77 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2013, Various
+# This file is distributed under the same license as the Elgg package.
+# 
+# Translators:
+# Facyla <fd@proposition.fr>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: Elgg Core\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-12-14 06:42-0800\n"
+"PO-Revision-Date: 2015-01-08 16:11+0000\n"
+"Last-Translator: Facyla <fd@proposition.fr>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/elgg-core/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+# c31703b8089d4ddb99404f5632fd40e5
+#: ../../index.rst:2
+msgid "Elgg |version| Documentation"
+msgstr "Elgg |version| Documentation"
+
+# 98db4b57e02645c98702bf8bcd8fca5d
+#: ../../index.rst:4
+msgid ""
+"Elgg_ (:download:`pronunciation <_elgg_files/How_to_say_Elgg.mp3>`) is a "
+"rapid development framework with built-in social features. It is a great fit"
+" for building any app where users log in and share information."
+msgstr "Elgg_ (:download:`pronunciation <_elgg_files/How_to_say_Elgg.mp3>`) est un environnement de développement intégrant des fonctionnalités sociales. Ce framework est idéal pour construire des applications dans lesquelles les utilisateurs s'identifient et partagent des informations."
+
+# f5d987b63f0e44929d14c972a86fd91d
+#: ../../index.rst:7
+msgid "It has been used to build `all kinds of social apps`__:"
+msgstr "Elgg a été utilisé pour construire `tous types d'applications sociales`__:"
+
+# 05276f21535c40cbb69c0f8f730d290a
+#: ../../index.rst:11
+msgid "open networks (similar to Facebook)"
+msgstr "réseau sociaux ouverts (similaires à Facebook)"
+
+# 47e16d2ae86547dd89f8ddc14c42e57c
+#: ../../index.rst:12
+msgid "topical (like the Elgg Community)"
+msgstr "thématiques (comme la communauté Elgg)"
+
+# 67179d7ddbe94f3fb95a176a4c7d17f3
+#: ../../index.rst:13
+msgid "private intranets"
+msgstr "intranets privés / RSE"
+
+# 46fe4e263ab3488b9a979626252be96d
+#: ../../index.rst:14
+msgid "dating"
+msgstr "rencontres"
+
+# 365a066d53ff4dee8ede09925709a72d
+#: ../../index.rst:15
+msgid "educational"
+msgstr "éducatifs"
+
+# f599695484094b7998c8ec8434c8b2f5
+#: ../../index.rst:16
+msgid "company blog"
+msgstr "blog d'entreprise"
+
+# c016738f853f482481bf29658a4d06bd
+#: ../../index.rst:18
+msgid "There is also a `demo site`_ running a standard installation of Elgg."
+msgstr "Is existe également un `site de démonstration` qui permet de tester une installation Elgg standard"
+
+# 2d0710b174b5497c99b77df509dace14
+#: ../../index.rst:20
+msgid "This is the canonical documentation for the Elgg_ project."
+msgstr "Ceci constitue la documentation officielle du projet Elgg_."
diff --git a/docs/locale/pot/about.pot b/docs/locale/pot/about.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Elgg 1.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-15 23:30-0800\n"
+"POT-Creation-Date: 2015-01-11 18:24-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../../about/contributing.rst:4
-# 8d8bfe165a264890ab2432952492e704
 msgid "Contributor Guide"
 msgstr ""
 
@@ -26,56 +25,42 @@ msgstr ""
 #: ../../about/index.rst:6
 #: ../../about/releases.rst:6
 #: ../../about/roadmap.rst:6
-# 6dcf88f0b2fa439a94d738a081a1a0df
-# 487f594a4c414f8a819842576adcc692
-# 45b261a0220c4b42b020bfff8ee81249
-# ba2d9f653767408db278bcbe245f033e
-# c576addacd224c3cb97427a7b0c3fc1b
 msgid "This page has moved."
 msgstr ""
 
 #: ../../about/contributing.rst:8
-# 0f7ad7ecc04544d3ae866876b72ac5bb
 msgid ":doc:`/contribute/index`"
 msgstr ""
 
 #: ../../about/history.rst:4
-# e7cb3e21b7524eff862439ef3122cf42
 msgid "History"
 msgstr ""
 
 #: ../../about/history.rst:8
-# deca886cd4054f38adb4d67f677a6fad
 msgid ":doc:`/appendix/history`"
 msgstr ""
 
 #: ../../about/index.rst:4
-# e5dab9f594414bb092fdb99afe9a60af
 msgid "About"
 msgstr ""
 
 #: ../../about/index.rst:8
-# 791919c90fce415087797188945e6fa0
 msgid ":doc:`/appendix/index`"
 msgstr ""
 
 #: ../../about/releases.rst:4
-# 83e4684f46bc4ca5bb99f8894ea1e487
 msgid "Release Policy"
 msgstr ""
 
 #: ../../about/releases.rst:8
-# 6d404ed5c1a2423aa4e7d7340a1db192
 msgid ":doc:`/appendix/releases`"
 msgstr ""
 
 #: ../../about/roadmap.rst:4
-# 9b83db0573ca42a886a3beb54732b007
 msgid "Roadmap"
 msgstr ""
 
 #: ../../about/roadmap.rst:8
-# 285d1cab29e54d218470757d0c930bb1
 msgid ":doc:`/appendix/roadmap`"
 msgstr ""