Revert "Merge branch 'master' into ansel-ajax"

This reverts commit c50a6d2, reversing
changes made to 6b9aec9.

.gitattributes

@@ -9,6 +9,5 @@ framework/Icalendar/test/Horde/Icalendar/fixtures/*.ics           -crlf
 framework/Icalendar/test/Horde/Icalendar/fixtures/*.vcf           -crlf
 framework/Icalendar/test/Horde/Icalendar/fixtures/vTimezone/*.ics -crlf
 framework/Ldap/test/Horde/Ldap/fixtures/unsorted_w50_WIN.ldif     -crlf
-framework/Mail/test/Horde/Mail/fixtures/*                         -crlf
 kronolith/test/Kronolith/fixtures/*.ics                           -crlf
 turba/test/Turba/ToDo/importCRLF.ldif                             -crlf

.travis.ini

@@ -1,3 +1,2 @@
-extension = ldap.so
 extension = memcache.so
 extension = mongo.so

.travis.yml

@@ -8,7 +8,6 @@ env: ACTIVESYNC_SQL_MYSQL_TEST_CONFIG='{"activesync":{"sql":{"mysql":{"adapter":
 before_install:
   - sudo locale-gen cs_CZ.UTF-8 de_DE.UTF-8 tr_TR
   - sudo apt-get -qq install libwbxml2-utils aspell rcs cvs cvsps libimage-exiftool-perl
-  - mysql -e "create database IF NOT EXISTS test;" -uroot
 before_script:
   - phpenv config-add .travis.ini
   - pear install channel://pear.php.net/Net_DNS2

agora/docs/CREDITS

@@ -22,7 +22,6 @@ Finnish                 Petteri Karttunen <pkarttun@siba.fi>
 French                  Florent Aide <faide@alphacent.com>
 German                  Jan Schneider <jan@horde.org>
 Hungarian               Garami Gabor <hrgyster@gmail.com>
-                        Andras Galos <galosa@netinform.hu>
 Japanese                Takeshi Taguchi <taguchi@tcltk.jp>
 Latvian                 Jānis Eisaks <jancs@dv.lv>
 Lithuanian              Vilius Šumskas <vilius@lnk.lt>

agora/locale/hu/LC_MESSAGES/agora.po

@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Agora H5 (1.0-git)\n"
 "Report-Msgid-Bugs-To: dev@lists.horde.org\n"
 "POT-Creation-Date: 2014-05-29 09:42+0200\n"
-"PO-Revision-Date: 2014-07-14 11:35+0200\n"
+"PO-Revision-Date: 2014-06-22 19:11+0200\n"
 "Last-Translator: Andras Galos <galosa@netinform.hu>\n"
 "Language-Team: i18n@lists.horde.org\n"
 "Language: hu\n"

ansel/docs/CHANGES

@@ -2,7 +2,6 @@
 v3.0.2-git
 ----------
 
-[mjr] Fix fatal divide by zero error due to incorrectly named variable.
 [jan] Fix type of ansel_shares_users.user_uid column.
 [jan] Fix watermark font size preference.
 [jan] Make shares table compatible with Oracle.

ansel/lib/View/Results.php

@@ -150,7 +150,7 @@ public function html()
         // The number of resources to display on this page.
         $view->numimages = count($view->results);
         $view->tilesperrow = $prefs->getValue('tilesperrow');
-        $view->cellwidth = round(100 / $view->tilesperrow);
+        $view->cellwidth = round(100 / $this->tilesperrow);
 
         // Get any related tags to display.
         if ($conf['tags']['relatedtags']) {

ansel/package.xml

@@ -33,7 +33,6 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
-* [mjr] Fix fatal divide by zero error due to incorrectly named variable.
 * [jan] Fix type of ansel_shares_users.user_uid column.
 * [jan] Fix watermark font size preference.
 * [jan] Make shares table compatible with Oracle.
@@ -42,21 +41,11 @@
  <contents>
   <dir baseinstalldir="/" name="/">
    <dir name="bin">
-    <file name="ansel" role="script">
-     <tasks:replace from="/usr/bin/env php" to="php_bin" type="pear-config" />
-    </file>
-    <file name="ansel-convert-sql-shares-to-sqlng" role="script">
-     <tasks:replace from="/usr/bin/env php" to="php_bin" type="pear-config" />
-    </file>
-    <file name="ansel-exif-to-tags" role="script">
-     <tasks:replace from="/usr/bin/env php" to="php_bin" type="pear-config" />
-    </file>
-    <file name="ansel-garbage-collection" role="script">
-     <tasks:replace from="/usr/bin/env php" to="php_bin" type="pear-config" />
-    </file>
-    <file name="AnselPublish.scpt" role="script">
-     <tasks:replace from="/usr/bin/env php" to="php_bin" type="pear-config" />
-    </file>
+    <file name="ansel" role="script" />
+    <file name="ansel-convert-sql-shares-to-sqlng" role="script" />
+    <file name="ansel-exif-to-tags" role="script" />
+    <file name="ansel-garbage-collection" role="script" />
+    <file name="AnselPublish.scpt" role="script" />
    </dir> <!-- /bin -->
    <dir name="config">
     <file name="conf.xml" role="horde" />
@@ -1383,7 +1372,6 @@
    <date>2014-06-16</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
-* [mjr] Fix fatal divide by zero error due to incorrectly named variable.
 * [jan] Fix type of ansel_shares_users.user_uid column.
 * [jan] Fix watermark font size preference.
 * [jan] Make shares table compatible with Oracle.

beatnik/docs/CREDITS

@@ -21,7 +21,6 @@ Localization
 Latvian                 Jānis Eisaks <jancs@dv.lv>
 Slovenian               Duck <duck@obala.net>
 Spanish                 Manuel P. Ayala <mayala@unex.es>
-Hungarian               Andras Galos <galosa@netinform.hu>
 =====================   ======================================================
 
 

beatnik/locale/hu/LC_MESSAGES/beatnik.po

@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Beatnik H5 (1.0-git)\n"
 "Report-Msgid-Bugs-To: dev@lists.horde.org\n"
 "POT-Creation-Date: 2014-06-22 13:25+0200\n"
-"PO-Revision-Date: 2014-07-14 11:35+0200\n"
+"PO-Revision-Date: 2014-06-22 19:11+0200\n"
 "Last-Translator: Andras Galos <galosa@netinform.hu>\n"
 "Language-Team: i18n@lists.horde.org\n"
 "Language: hu\n"