[Pkg-owncloud-commits] [owncloud] 09/13: Imported Upstream version 7.0.7~dfsg
David Prévot
taffit at moszumanska.debian.org
Tue Jul 7 12:42:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit 6c1e844054ec68040e7eeae2d0fdfc496654743e
Merge: a7e20de 4df15bf
Author: David Prévot <taffit at debian.org>
Date: Fri Jul 3 16:26:06 2015 -0400
Imported Upstream version 7.0.7~dfsg
apps/activity/appinfo/info.xml | 1 -
apps/activity/appinfo/version | 2 +-
apps/files_encryption/appinfo/info.xml | 1 -
apps/files_encryption/appinfo/version | 2 +-
apps/files_external/appinfo/info.xml | 1 -
apps/files_sharing/appinfo/version | 2 +-
apps/files_trashbin/appinfo/info.xml | 1 -
apps/files_trashbin/appinfo/preupdate.php | 21 +++++++++++++++++++++
apps/files_trashbin/appinfo/version | 2 +-
apps/files_versions/appinfo/info.xml | 1 -
apps/files_versions/appinfo/version | 2 +-
apps/gallery/appinfo/info.xml | 1 -
apps/gallery/appinfo/version | 2 +-
apps/updater/appinfo/info.xml | 1 -
apps/updater/appinfo/version | 2 +-
apps/user_ldap/appinfo/info.xml | 1 -
apps/user_ldap/appinfo/version | 2 +-
apps/user_webdavauth/appinfo/info.xml | 1 -
apps/user_webdavauth/appinfo/version | 2 +-
lib/private/app.php | 2 ++
version.php | 8 ++++----
21 files changed, 36 insertions(+), 22 deletions(-)
diff --cc apps/activity/appinfo/info.xml
index 82a0e0e5,0000000..34f9371
mode 100644,000000..100644
--- a/apps/activity/appinfo/info.xml
+++ b/apps/activity/appinfo/info.xml
@@@ -1,17 -1,0 +1,16 @@@
+<?xml version="1.0"?>
+<info>
+ <id>activity</id>
+ <name>Activity</name>
+ <description>
+ This application enables users to view actions related to their files in ownCloud. Once enabled, users will see a new icon “Activity” in their apps menu. When clicked, a new page appears for users to track the activity related to files – from new files, to deleted files, move, rename, updates and shared activity. The user can configure their individual activity settings in their personal menu. This sets the type of activity to record, as well as whether to the user sees their own acti [...]
+ </description>
+ <licence>AGPL</licence>
+ <author>Frank Karlitschek</author>
+ <shipped>true</shipped>
+ <default_enable/>
+ <require>4.9</require>
+ <types>
+ <filesystem/>
+ </types>
- <ocsid>166038</ocsid>
+</info>
diff --cc apps/activity/appinfo/version
index 32ffe12,0000000..3fe3e58
mode 100644,000000..100644
--- a/apps/activity/appinfo/version
+++ b/apps/activity/appinfo/version
@@@ -1,1 -1,0 +1,1 @@@
- 1.1.23
++1.1.24
diff --cc apps/gallery/appinfo/info.xml
index f14fab9,0000000..46f3289
mode 100644,000000..100644
--- a/apps/gallery/appinfo/info.xml
+++ b/apps/gallery/appinfo/info.xml
@@@ -1,23 -1,0 +1,22 @@@
+<?xml version="1.0"?>
+<info>
+ <id>gallery</id>
+ <name>Pictures</name>
+ <licence>AGPL</licence>
+ <author>Robin Appelman</author>
+ <require>4.93</require>
+ <shipped>true</shipped>
+ <description>Picture gallery for ownCloud.
+
+ Provides a dedicated view of all images in a grid, adds image viewing capabilities to the files app and adds a
+ gallery view to public links.</description>
+ <standalone/>
+ <default_enable/>
+ <types>
+ <!-- update thumbnails when saving file -->
+ <filesystem/>
+ </types>
+ <public>
+ <gallery>public.php</gallery>
+ </public>
- <ocsid>166056</ocsid>
+</info>
diff --cc apps/gallery/appinfo/version
index 7d85683,0000000..d1d899f
mode 100644,000000..100644
--- a/apps/gallery/appinfo/version
+++ b/apps/gallery/appinfo/version
@@@ -1,1 -1,0 +1,1 @@@
- 0.5.4
++0.5.5
diff --cc apps/updater/appinfo/info.xml
index f9bb78d,0000000..e34bccb
mode 100644,000000..100644
--- a/apps/updater/appinfo/info.xml
+++ b/apps/updater/appinfo/info.xml
@@@ -1,14 -1,0 +1,13 @@@
+<?xml version="1.0"?>
+<info>
+ <id>updater</id>
+ <name>Updater</name>
+ <description>ownCloud updater plugin. Check README for details.</description>
+ <version>0.4</version>
+ <licence>AGPL</licence>
+ <author>Victor Dubiniuk</author>
+ <shipped>true</shipped>
+ <default_enable/>
+ <require>4.93</require>
+ <types></types>
- <ocsid>166059</ocsid>
+</info>
diff --cc apps/updater/appinfo/version
index bd73f47,0000000..267577d
mode 100644,000000..100644
--- a/apps/updater/appinfo/version
+++ b/apps/updater/appinfo/version
@@@ -1,1 -1,0 +1,1 @@@
- 0.4
++0.4.1
diff --cc version.php
index b4e8f62,1059ba6..7ac7ec2
--- a/version.php
+++ b/version.php
@@@ -1,6 -1,19 +1,6 @@@
-<?php
-
-// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
-// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
-// when updating major/minor version number.
-$OC_Version=array(7, 0, 7, 2);
-
-// The human readable string
-$OC_VersionString='7.0.7';
-
-// The ownCloud edition
-$OC_Edition='';
-
-// The ownCloud channel
-$OC_Channel='git';
-
-// The build number
-$OC_Build='';
-
+<?php
- $OC_Version = array(7,0,7,1);
- $OC_VersionString = '7.0.7RC1';
++$OC_Version = array(7,0,7,2);
++$OC_VersionString = '7.0.7';
+$OC_Edition = '';
- $OC_Channel = 'testing';
- $OC_Build = '2015-06-30T22:57:17+00:00 f29af9c23b34edf4f54007b472c24ca6ee0d502d';
++$OC_Channel = 'stable';
++$OC_Build = '2015-07-03T10:38:58+00:00 4df15bf573c1dd15bc838e742eefc2bc68740613';
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list