[Pkg-owncloud-commits] [owncloud] 03/75: Merge branch 'master' of git://gitorious.org/+owncloud-reviewers/owncloud/owncloud2 into stable
David Prévot
taffit at alioth.debian.org
Fri Nov 8 23:08:27 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to annotated tag v3.0.1
in repository owncloud.
commit 27936ab9c774e4c25e355943e2bd79b2ed41718b
Merge: c30aa4d 5e775f8
Author: Jan-Christoph Borchardt <JanCBorchardt at fsfe.org>
Date: Sat Oct 22 18:10:26 2011 +0200
Merge branch 'master' of git://gitorious.org/+owncloud-reviewers/owncloud/owncloud2 into stable
.gitignore | 5 +-
COPYING-README | 15 +-
apps/bookmarks/addBm.php | 1 -
apps/bookmarks/ajax/addBookmark.php | 5 +-
apps/bookmarks/ajax/editBookmark.php | 3 +-
apps/bookmarks/ajax/updateList.php | 2 +-
apps/bookmarks/appinfo/app.php | 25 +-
apps/bookmarks/appinfo/database.xml | 7 -
apps/bookmarks/bookmarksHelper.php | 55 +-
apps/bookmarks/css/bookmarks.css | 60 +-
apps/bookmarks/js/addBm.js | 3 +-
apps/bookmarks/js/bookmarks.js | 46 +-
apps/bookmarks/settings.php | 13 +
apps/bookmarks/templates/addBm.php | 1 -
apps/bookmarks/templates/list.php | 26 +-
apps/bookmarks/templates/settings.php | 14 +
apps/calendar/ajax/createcalendar.php | 2 +-
apps/calendar/ajax/getcal.php | 699 +-------------------
apps/calendar/ajax/newcalendar.php | 1 -
apps/calendar/ajax/updatecalendar.php | 2 +-
apps/calendar/appinfo/database.xml | 6 -
apps/calendar/css/style.css | 7 +-
apps/calendar/import.php | 2 +-
apps/calendar/js/calendar.js | 5 +-
apps/calendar/lib/calendar.php | 23 +-
apps/calendar/lib/connector_sabre.php | 6 +-
apps/calendar/templates/part.editcalendar.php | 6 -
apps/calendar/templates/part.import.php | 8 +-
apps/calendar/templates/settings.php | 54 +-
apps/contacts/ajax/addcard.php | 14 +-
apps/contacts/ajax/addproperty.php | 2 +-
apps/contacts/css/styles.css | 1 +
apps/contacts/js/interface.js | 11 +-
apps/contacts/lib/vcard.php | 1 +
apps/contacts/templates/index.php | 2 +-
apps/contacts/templates/part.details.php | 4 +-
apps/contacts/templates/part.property.php | 4 +-
apps/files_sharing/get.php | 7 +-
apps/gallery/ajax/cover.php | 62 --
apps/gallery/ajax/createAlbum.php | 14 -
apps/gallery/ajax/getAlbums.php | 22 -
apps/gallery/ajax/getCovers.php | 66 --
apps/gallery/ajax/scanForAlbums.php | 14 -
apps/gallery/ajax/thumbnail.php | 58 --
apps/gallery/appinfo/app.php | 27 -
apps/gallery/appinfo/database.xml | 58 --
apps/gallery/appinfo/info.xml | 10 -
apps/gallery/css/styles.css | 23 -
apps/gallery/index.php | 33 -
apps/gallery/js/album_cover.js | 41 --
apps/gallery/js/albums.js | 80 ---
apps/gallery/lib_scanner.php | 57 --
apps/gallery/templates/index.php | 12 -
apps/gallery/templates/view_album.php | 20 -
apps/media/appinfo/app.php | 2 +-
apps/media/css/music.css | 4 +-
apps/media/templates/settings.php | 2 +-
apps/remoteStorage/compat.php | 2 +-
apps/user_openid/appinfo/info.xml | 1 -
apps/user_webfinger/activate.php | 11 -
apps/user_webfinger/appinfo/install.php | 6 +
core/css/styles.css | 5 +-
core/img/filetypes/application-pdf.png | Bin 0 -> 591 bytes
core/img/filetypes/application-rss+xml.png | Bin 0 -> 691 bytes
core/img/filetypes/audio.png | Bin 561 -> 385 bytes
core/img/filetypes/code.png | Bin 0 -> 603 bytes
core/img/filetypes/database.png | Bin 0 -> 390 bytes
core/img/filetypes/file.png | Bin 391 -> 294 bytes
core/img/filetypes/flash.png | Bin 0 -> 582 bytes
core/img/filetypes/folder.png | Bin 0 -> 537 bytes
core/img/filetypes/font.png | Bin 0 -> 813 bytes
core/img/filetypes/image-svg+xml.png | Bin 0 -> 481 bytes
core/img/filetypes/image.png | Bin 307 -> 606 bytes
core/img/filetypes/link.png | Bin 0 -> 923 bytes
core/img/filetypes/model.png | Bin 0 -> 452 bytes
core/img/filetypes/ms-excel.png | Bin 0 -> 566 bytes
core/img/filetypes/ms-powerpoint.png | Bin 0 -> 519 bytes
core/img/filetypes/php.png | Bin 0 -> 538 bytes
core/img/filetypes/presentation.png | Bin 0 -> 519 bytes
core/img/filetypes/readme.txt | 22 +
core/img/filetypes/ruby.png | Bin 0 -> 626 bytes
core/img/filetypes/script.png | Bin 0 -> 859 bytes
core/img/filetypes/spreadsheet.png | Bin 0 -> 566 bytes
core/img/filetypes/text-calendar.png | Bin 0 -> 675 bytes
core/img/filetypes/text-css.png | Bin 0 -> 524 bytes
core/img/filetypes/text-html.png | Bin 0 -> 578 bytes
core/img/filetypes/text-x-c++.png | Bin 0 -> 621 bytes
core/img/filetypes/text-x-c.png | Bin 0 -> 587 bytes
core/img/filetypes/text-x-csharp.png | Bin 0 -> 700 bytes
core/img/filetypes/text-x-h.png | Bin 0 -> 603 bytes
core/img/filetypes/text.png | Bin 0 -> 342 bytes
core/img/filetypes/vcf.png | Bin 0 -> 533 bytes
core/img/filetypes/video.png | Bin 0 -> 653 bytes
core/img/filetypes/x-.png | Bin 0 -> 555 bytes
core/img/{filetypes => places}/file.png | Bin 391 -> 391 bytes
core/img/{filetypes => places}/file.svg | 0
core/img/{filetypes/audio.png => places/music.png} | Bin 561 -> 561 bytes
core/img/{filetypes/audio.svg => places/music.svg} | 0
.../{filetypes/image.png => places/picture.png} | Bin 307 -> 307 bytes
.../{filetypes/image.svg => places/picture.svg} | 0
core/templates/layout.guest.php | 2 +-
files/css/files.css | 2 +-
files/js/filelist.js | 2 +-
index.php | 10 +-
lib/app.php | 65 +-
lib/helper.php | 12 +-
lib/util.php | 4 +-
settings/js/users.js | 4 +
settings/templates/personal.php | 3 +-
109 files changed, 351 insertions(+), 1553 deletions(-)
--
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