From 910061b2ee6838ee8420ef01294bf28bd7516c23 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Thu, 31 May 2012 13:00:58 +0200 Subject: [PATCH 01/25] Remove OC_App::register function The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty. --- appinfo/app.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/appinfo/app.php b/appinfo/app.php index 8a8f4438..f4bca9df 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -10,8 +10,6 @@ OC::$CLASSPATH['OC_Bookmarks_Bookmarks'] = 'apps/bookmarks/lib/bookmarks.php'; OC::$CLASSPATH['OC_Search_Provider_Bookmarks'] = 'apps/bookmarks/lib/search.php'; -OCP\App::register( array( 'order' => 70, 'id' => 'bookmark', 'name' => 'Bookmarks' )); - $l = new OC_l10n('bookmarks'); OCP\App::addNavigationEntry( array( 'id' => 'bookmarks_index', 'order' => 70, 'href' => OCP\Util::linkTo( 'bookmarks', 'index.php' ), 'icon' => OCP\Util::imagePath( 'bookmarks', 'bookmarks.png' ), 'name' => $l->t('Bookmarks'))); From a5998b3d7df0e6cab80b17a1522fb595d8e9453b Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Sun, 3 Jun 2012 21:13:30 +0000 Subject: [PATCH 02/25] Unit path and webpath, correct some more --- templates/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/list.php b/templates/list.php index fdd2b19f..84436ae7 100644 --- a/templates/list.php +++ b/templates/list.php @@ -20,7 +20,7 @@ From e122e02ee1a73a5309d79da2147090a6d40ee10d Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Mon, 4 Jun 2012 20:37:00 +0000 Subject: [PATCH 03/25] Correct remote and public, and last occurence of OC:: --- ajax/addBookmark.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ajax/addBookmark.php b/ajax/addBookmark.php index 9241dc8d..d66aab58 100644 --- a/ajax/addBookmark.php +++ b/ajax/addBookmark.php @@ -30,6 +30,6 @@ $RUNTIME_NOSETUPFS=true; OCP\JSON::checkLoggedIn(); OCP\JSON::checkAppEnabled('bookmarks'); -require_once(OC::$APPSROOT . '/apps/bookmarks/bookmarksHelper.php'); +require_once(OC_App::getAppPath('bookmarks').'/bookmarksHelper.php'); $id = addBookmark($_GET['url'], $_GET['title'], $_GET['tags']); OCP\JSON::success(array('data' => $id)); \ No newline at end of file From fba6113675cea8238cac99105c1e5a82eca086bc Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sun, 10 Jun 2012 23:38:26 +0200 Subject: [PATCH 04/25] Using POST instead of GET. --- addBm.php | 2 +- ajax/addBookmark.php | 2 +- ajax/delBookmark.php | 2 +- ajax/editBookmark.php | 8 ++++---- ajax/recordClick.php | 2 +- ajax/updateList.php | 6 +++--- js/addBm.js | 1 + js/bookmarks.js | 5 +++++ js/bookmarksearch.js | 1 + 9 files changed, 18 insertions(+), 11 deletions(-) diff --git a/addBm.php b/addBm.php index 313489d2..866fa1e7 100644 --- a/addBm.php +++ b/addBm.php @@ -28,6 +28,6 @@ OCP\User::checkLoggedIn(); OCP\App::checkAppEnabled('bookmarks'); require_once('bookmarksHelper.php'); -addBookmark($_GET['url'], '', 'Read-Later'); +addBookmark($_POST['url'], '', 'Read-Later'); include 'templates/addBm.php'; diff --git a/ajax/addBookmark.php b/ajax/addBookmark.php index 9241dc8d..a2eb506f 100644 --- a/ajax/addBookmark.php +++ b/ajax/addBookmark.php @@ -31,5 +31,5 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::checkAppEnabled('bookmarks'); require_once(OC::$APPSROOT . '/apps/bookmarks/bookmarksHelper.php'); -$id = addBookmark($_GET['url'], $_GET['title'], $_GET['tags']); +$id = addBookmark($_POST['url'], $_POST['title'], $_POST['tags']); OCP\JSON::success(array('data' => $id)); \ No newline at end of file diff --git a/ajax/delBookmark.php b/ajax/delBookmark.php index 0b568981..5a067701 100644 --- a/ajax/delBookmark.php +++ b/ajax/delBookmark.php @@ -30,7 +30,7 @@ $RUNTIME_NOSETUPFS=true; OCP\JSON::checkLoggedIn(); OCP\JSON::checkAppEnabled('bookmarks'); -$id = $_GET['id']; +$id = $_POST['id']; if (!OC_Bookmarks_Bookmarks::deleteUrl($id)){ OC_JSON::error(); exit(); diff --git a/ajax/editBookmark.php b/ajax/editBookmark.php index db349af3..fcec2e1c 100644 --- a/ajax/editBookmark.php +++ b/ajax/editBookmark.php @@ -39,7 +39,7 @@ if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){ $_ut = "UNIX_TIMESTAMP()"; } -$bookmark_id = (int)$_GET["id"]; +$bookmark_id = (int)$_POST["id"]; $query = OCP\DB::prepare(" UPDATE *PREFIX*bookmarks @@ -48,8 +48,8 @@ $query = OCP\DB::prepare(" "); $params=array( - htmlspecialchars_decode($_GET["url"]), - htmlspecialchars_decode($_GET["title"]), + htmlspecialchars_decode($_POST["url"]), + htmlspecialchars_decode($_POST["title"]), ); $query->execute($params); @@ -67,7 +67,7 @@ $query = OCP\DB::prepare(" VALUES (?, ?) "); -$tags = explode(' ', urldecode($_GET["tags"])); +$tags = explode(' ', urldecode($_POST["tags"])); foreach ($tags as $tag) { if(empty($tag)) { //avoid saving blankspaces diff --git a/ajax/recordClick.php b/ajax/recordClick.php index 2bd91f23..1eee1718 100644 --- a/ajax/recordClick.php +++ b/ajax/recordClick.php @@ -37,7 +37,7 @@ $query = OCP\DB::prepare(" AND url LIKE ? "); -$params=array(OCP\USER::getUser(), htmlspecialchars_decode($_GET["url"])); +$params=array(OCP\USER::getUser(), htmlspecialchars_decode($_POST["url"])); $bookmarks = $query->execute($params); header( "HTTP/1.1 204 No Content" ); diff --git a/ajax/updateList.php b/ajax/updateList.php index c919a5fc..4de2475d 100644 --- a/ajax/updateList.php +++ b/ajax/updateList.php @@ -33,11 +33,11 @@ OCP\JSON::checkAppEnabled('bookmarks'); //Filter for tag? -$filterTag = isset($_GET['tag']) ? htmlspecialchars_decode($_GET['tag']) : false; +$filterTag = isset($_POST['tag']) ? htmlspecialchars_decode($_POST['tag']) : false; -$offset = isset($_GET['page']) ? intval($_GET['page']) * 10 : 0; +$offset = isset($_POST['page']) ? intval($_POST['page']) * 10 : 0; -$sort = isset($_GET['sort']) ? ($_GET['sort']) : 'bookmarks_sorting_recent'; +$sort = isset($_POST['sort']) ? ($_POST['sort']) : 'bookmarks_sorting_recent'; if($sort == 'bookmarks_sorting_clicks') { $sqlSortColumn = 'clickcount'; } else { diff --git a/js/addBm.js b/js/addBm.js index d64e55e8..625ac842 100644 --- a/js/addBm.js +++ b/js/addBm.js @@ -6,6 +6,7 @@ function addBookmark(event) { var url = $('#bookmark_add_url').val(); var tags = $('#bookmark_add_tags').val(); $.ajax({ + type: 'POST', url: 'ajax/addBookmark.php', data: 'url=' + encodeURI(url) + '&tags=' + encodeURI(tags), success: function(data){ diff --git a/js/bookmarks.js b/js/bookmarks.js index a746cf43..7f3104e8 100644 --- a/js/bookmarks.js +++ b/js/bookmarks.js @@ -20,6 +20,7 @@ function getBookmarks() { } $.ajax({ + type: 'POST', url: OC.filePath('bookmarks', 'ajax', 'updateList.php'), data: 'tag=' + encodeURIComponent($('#bookmarkFilterTag').val()) + '&page=' + bookmarks_page + '&sort=' + bookmarks_sorting, success: function(bookmarks){ @@ -70,6 +71,7 @@ function addOrEditBookmark(event) { } if (id == 0) { $.ajax({ + type: 'POST', url: OC.filePath('bookmarks', 'ajax', 'addBookmark.php'), data: 'url=' + encodeURIComponent(url) + '&title=' + encodeURIComponent(title) + '&tags=' + encodeURIComponent(tags), success: function(response){ @@ -82,6 +84,7 @@ function addOrEditBookmark(event) { } else { $.ajax({ + type: 'POST', url: OC.filePath('bookmarks', 'ajax', 'editBookmark.php'), data: 'id=' + id + '&url=' + encodeURIComponent(url) + '&title=' + encodeURIComponent(title) + '&tags=' + encodeURIComponent(tags), success: function(){ @@ -99,6 +102,7 @@ function addOrEditBookmark(event) { function delBookmark(event) { var record = $(this).parent().parent(); $.ajax({ + type: 'POST', url: OC.filePath('bookmarks', 'ajax', 'delBookmark.php'), data: 'id=' + record.data('id'), success: function(data){ @@ -177,6 +181,7 @@ function updateOnBottom() { function recordClick(event) { $.ajax({ + type: 'POST', url: OC.filePath('bookmarks', 'ajax', 'recordClick.php'), data: 'url=' + encodeURIComponent($(this).attr('href')), }); diff --git a/js/bookmarksearch.js b/js/bookmarksearch.js index e7a4fb18..e8f5363c 100644 --- a/js/bookmarksearch.js +++ b/js/bookmarksearch.js @@ -16,6 +16,7 @@ function recordClick(event) { var jsFileLocation = $('script[src*=bookmarksearch]').attr('src'); jsFileLocation = jsFileLocation.replace('js/bookmarksearch.js', ''); $.ajax({ + type: 'POST', url: jsFileLocation + 'ajax/recordClick.php', data: 'url=' + encodeURI($(this).attr('href')), }); From aa5a6bdb9fc95b07806ddb6fcf167f23f8b4b7b2 Mon Sep 17 00:00:00 2001 From: Marco B Date: Tue, 5 Jun 2012 17:23:22 +0200 Subject: [PATCH 05/25] utf8 in der DB config --- appinfo/database.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/database.xml b/appinfo/database.xml index f2fc68e4..b03c1fb2 100644 --- a/appinfo/database.xml +++ b/appinfo/database.xml @@ -3,7 +3,7 @@ *dbname* true false - latin1 + utf8 *dbprefix*bookmarks From 1531b91312157d5bb5f807c8e88b5cd2c15e1c32 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 20 Jun 2012 16:31:22 +0200 Subject: [PATCH 06/25] bookmarks: make read later-button draggable again, fixes oc-944 --- css/bookmarks.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/bookmarks.css b/css/bookmarks.css index 3a3e0fbf..a67afcd4 100644 --- a/css/bookmarks.css +++ b/css/bookmarks.css @@ -1,5 +1,5 @@ #content { overflow: auto; height: 100%; } -#firstrun { width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em; color:#777;} +#firstrun { width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em; color:#777; position: relative;} #firstrun small { display: block; font-weight: normal; font-size: 0.5em; margin-bottom: 1.5em; } #firstrun .button { font-size: 0.7em; } #firstrun #selections { font-size:0.8em; font-weight: normal; width: 100%; margin: 2em auto auto auto; clear: both; } From a7a0a933d204de6fc1c2cb47187c079eeb2ebc5d Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 20 Jun 2012 20:03:25 +0200 Subject: [PATCH 07/25] make bookmarks bookmarklet work again, kudos to Victor Dubiniuk --- addBm.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/addBm.php b/addBm.php index 866fa1e7..4df93c8b 100644 --- a/addBm.php +++ b/addBm.php @@ -5,20 +5,20 @@ * * @author Arthur Schiwon * @copyright 2011 Arthur Schiwon blizzz@arthur-schiwon.de -* +* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either +* License as published by the Free Software Foundation; either * version 3 of the License, or any later version. -* +* * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Lesser General Public +* +* You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . -* +* */ @@ -28,6 +28,6 @@ OCP\User::checkLoggedIn(); OCP\App::checkAppEnabled('bookmarks'); require_once('bookmarksHelper.php'); -addBookmark($_POST['url'], '', 'Read-Later'); +addBookmark($_GET['url'], '', 'Read-Later'); include 'templates/addBm.php'; From d670736d4162c062cfb910260099874602764745 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Thu, 21 Jun 2012 11:50:51 +0200 Subject: [PATCH 08/25] check if user is allowed to edit bookmarks --- ajax/editBookmark.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/ajax/editBookmark.php b/ajax/editBookmark.php index fcec2e1c..439b680d 100644 --- a/ajax/editBookmark.php +++ b/ajax/editBookmark.php @@ -40,18 +40,26 @@ if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){ } $bookmark_id = (int)$_POST["id"]; +$user_id = OCP\USER::getUser(); $query = OCP\DB::prepare(" UPDATE *PREFIX*bookmarks SET url = ?, title =?, lastmodified = $_ut - WHERE id = $bookmark_id + WHERE id = ? + AND user_id = ? "); $params=array( htmlspecialchars_decode($_POST["url"]), htmlspecialchars_decode($_POST["title"]), + $bookmark_id, + $user_id, ); -$query->execute($params); + +$result = $query->execute($params); + +# Abort the operation if bookmark couldn't be set (probably because the user is not allowed to edit this bookmark) +if ($result->numRows() == 0) exit(); # Remove old tags and insert new ones. $query = OCP\DB::prepare(" @@ -66,7 +74,7 @@ $query = OCP\DB::prepare(" (bookmark_id, tag) VALUES (?, ?) "); - + $tags = explode(' ', urldecode($_POST["tags"])); foreach ($tags as $tag) { if(empty($tag)) { From a3c356a043673d693214a56c70e51e88b6f0b26d Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Thu, 21 Jun 2012 13:57:18 +0200 Subject: [PATCH 09/25] use new sanitizeHTML() function --- templates/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/list.php b/templates/list.php index fdd2b19f..1ed79264 100644 --- a/templates/list.php +++ b/templates/list.php @@ -7,7 +7,7 @@ * See the COPYING-README file. */ ?> - +
From 63959909c0a0bdc3801b0a9f23d687cb374178d4 Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Sun, 24 Jun 2012 21:24:43 +0000 Subject: [PATCH 10/25] Correct bookmark app : add through interface and remove missing css --- ajax/addBookmark.php | 2 +- templates/addBm.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ajax/addBookmark.php b/ajax/addBookmark.php index d66aab58..6b5a0f71 100644 --- a/ajax/addBookmark.php +++ b/ajax/addBookmark.php @@ -31,5 +31,5 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::checkAppEnabled('bookmarks'); require_once(OC_App::getAppPath('bookmarks').'/bookmarksHelper.php'); -$id = addBookmark($_GET['url'], $_GET['title'], $_GET['tags']); +$id = addBookmark($_POST['url'], $_POST['title'], $_POST['tags']); OCP\JSON::success(array('data' => $id)); \ No newline at end of file diff --git a/templates/addBm.php b/templates/addBm.php index dbe673f5..534bafe5 100644 --- a/templates/addBm.php +++ b/templates/addBm.php @@ -3,7 +3,6 @@ Read later - ownCloud -

Saved!

From 6bb2c54fddd88fea931e9e958abbfb96966bbb16 Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Sun, 24 Jun 2012 21:30:14 +0000 Subject: [PATCH 11/25] Prevent errors and mini enhancement of saved window in bookmarks --- bookmarksHelper.php | 3 ++- templates/addBm.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bookmarksHelper.php b/bookmarksHelper.php index 01b55111..92baac2f 100644 --- a/bookmarksHelper.php +++ b/bookmarksHelper.php @@ -90,7 +90,8 @@ function addBookmark($url, $title, $tags='') { if(empty($title)) { $metadata = getURLMetadata($url); - $title = $metadata['title']; + if(isset($metadata['title'])) // Check for problems fetching the title + $title = $metadata['title']; } if(empty($title)) { diff --git a/templates/addBm.php b/templates/addBm.php index 534bafe5..357e0a18 100644 --- a/templates/addBm.php +++ b/templates/addBm.php @@ -6,5 +6,6 @@

Saved!

+ Close the window \ No newline at end of file From 18427ca0ccf1f86b187edd35dc2d151d06d0755e Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Wed, 27 Jun 2012 21:18:15 +0000 Subject: [PATCH 12/25] Migration: Fix contacts and bookmarks --- appinfo/migrate.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/appinfo/migrate.php b/appinfo/migrate.php index e7e572f5..f1353f18 100644 --- a/appinfo/migrate.php +++ b/appinfo/migrate.php @@ -40,8 +40,8 @@ class OC_Migration_Provider_Bookmarks extends OC_Migration_Provider{ $idmap = array(); while( $row = $results->fetchRow() ){ // Import each bookmark, saving its id into the map - $query = OCP\DB::prepare( "INSERT INTO *PREFIX*bookmarks(url, title, user_id, public, added, lastmodified) VALUES (?, ?, ?, ?, ?, ?)" ); - $query->execute( array( $row['url'], $row['title'], $this->uid, $row['public'], $row['added'], $row['lastmodified'] ) ); + $bookmarkquery = OCP\DB::prepare( "INSERT INTO *PREFIX*bookmarks(url, title, user_id, public, added, lastmodified) VALUES (?, ?, ?, ?, ?, ?)" ); + $bookmarkquery->execute( array( $row['url'], $row['title'], $this->uid, $row['public'], $row['added'], $row['lastmodified'] ) ); // Map the id $idmap[$row['id']] = OCP\DB::insertid(); } @@ -51,8 +51,8 @@ class OC_Migration_Provider_Bookmarks extends OC_Migration_Provider{ $results = $query->execute( array( $oldid ) ); while( $row = $results->fetchRow() ){ // Import the tags for this bookmark, using the new bookmark id - $query = OCP\DB::prepare( "INSERT INTO *PREFIX*bookmarks_tags(bookmark_id, tag) VALUES (?, ?)" ); - $query->execute( array( $newid, $row['tag'] ) ); + $tagquery = OCP\DB::prepare( "INSERT INTO *PREFIX*bookmarks_tags(bookmark_id, tag) VALUES (?, ?)" ); + $tagquery->execute( array( $newid, $row['tag'] ) ); } } // All done! From 56b9040743609b6d2291df870c8899ad2094852b Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sat, 7 Jul 2012 15:54:52 +0200 Subject: [PATCH 13/25] CSRF check --- ajax/addBookmark.php | 2 ++ ajax/delBookmark.php | 2 ++ ajax/editBookmark.php | 2 ++ 3 files changed, 6 insertions(+) diff --git a/ajax/addBookmark.php b/ajax/addBookmark.php index 6b5a0f71..48371640 100644 --- a/ajax/addBookmark.php +++ b/ajax/addBookmark.php @@ -28,6 +28,8 @@ $RUNTIME_NOSETUPFS=true; // Check if we are a user OCP\JSON::checkLoggedIn(); +OCP\JSON::callCheck(); + OCP\JSON::checkAppEnabled('bookmarks'); require_once(OC_App::getAppPath('bookmarks').'/bookmarksHelper.php'); diff --git a/ajax/delBookmark.php b/ajax/delBookmark.php index 5a067701..f40f02eb 100644 --- a/ajax/delBookmark.php +++ b/ajax/delBookmark.php @@ -28,6 +28,8 @@ $RUNTIME_NOSETUPFS=true; // Check if we are a user OCP\JSON::checkLoggedIn(); +OCP\JSON::callCheck(); + OCP\JSON::checkAppEnabled('bookmarks'); $id = $_POST['id']; diff --git a/ajax/editBookmark.php b/ajax/editBookmark.php index 439b680d..0b37d161 100644 --- a/ajax/editBookmark.php +++ b/ajax/editBookmark.php @@ -28,6 +28,8 @@ $RUNTIME_NOSETUPFS=true; // Check if we are a user OCP\JSON::checkLoggedIn(); +OCP\JSON::callCheck(); + OCP\JSON::checkAppEnabled('bookmarks'); $CONFIG_DBTYPE = OCP\Config::getSystemValue( "dbtype", "sqlite" ); From a36e1c72d40ee0369215889ab862e64994d98dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 9 Jul 2012 16:51:16 +0200 Subject: [PATCH 14/25] remove superfluous ?> at the end of .php files (left out apps/*/templates) --- lib/bookmarks.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/bookmarks.php b/lib/bookmarks.php index e0005968..86fba45a 100644 --- a/lib/bookmarks.php +++ b/lib/bookmarks.php @@ -145,5 +145,4 @@ class OC_Bookmarks_Bookmarks{ $result = $query->execute(); return true; } -} -?> +} \ No newline at end of file From 2ec45265ab7a984f4fabc9f3cae0df8922311161 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sat, 28 Jul 2012 02:05:38 +0200 Subject: [PATCH 15/25] [tx-robot] updated from transifex --- l10n/fi_FI.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 l10n/fi_FI.php diff --git a/l10n/fi_FI.php b/l10n/fi_FI.php new file mode 100644 index 00000000..c8147474 --- /dev/null +++ b/l10n/fi_FI.php @@ -0,0 +1,12 @@ + "Kirjanmerkit", +"unnamed" => "nimetön", +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Vedä tämä selaimesi kirjanmerkkipalkkiin ja napsauta sitä, kun haluat lisätä kirjanmerkin nopeasti:", +"Read later" => "Lue myöhemmin", +"Address" => "Osoite", +"Title" => "Otsikko", +"Tags" => "Tunnisteet", +"Save bookmark" => "Tallenna kirjanmerkki", +"You have no bookmarks" => "Sinulla ei ole kirjanmerkkejä", +"Bookmarklet
" => "Kirjanmerkitsin
" +); From 6c4e9db958ef3805526e97f9cfdac3a5727fbaa4 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sun, 29 Jul 2012 02:06:29 +0200 Subject: [PATCH 16/25] [tx-robot] updated from transifex --- l10n/ca.php | 12 ++++++++++++ l10n/de.php | 12 ++++++++++++ l10n/el.php | 12 ++++++++++++ l10n/sl.php | 12 ++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 l10n/ca.php create mode 100644 l10n/de.php create mode 100644 l10n/el.php create mode 100644 l10n/sl.php diff --git a/l10n/ca.php b/l10n/ca.php new file mode 100644 index 00000000..cf90d9a8 --- /dev/null +++ b/l10n/ca.php @@ -0,0 +1,12 @@ + "Adreces d'interès", +"unnamed" => "sense nom", +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Arrossegueu-ho al navegador i feu-hi un clic quan volgueu marcar ràpidament una adreça d'interès:", +"Read later" => "Llegeix més tard", +"Address" => "Adreça", +"Title" => "Títol", +"Tags" => "Etiquetes", +"Save bookmark" => "Desa l'adreça d'interès", +"You have no bookmarks" => "No teniu adreces d'interès", +"Bookmarklet
" => "Bookmarklet
" +); diff --git a/l10n/de.php b/l10n/de.php new file mode 100644 index 00000000..9e0f1373 --- /dev/null +++ b/l10n/de.php @@ -0,0 +1,12 @@ + "Lesezeichen", +"unnamed" => "unbenannt", +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Ziehe dies zu deinen Browser-Lesezeichen und klicke es, wenn du eine Website schnell den Lesezeichen hinzufügen willst.", +"Read later" => "Später lesen", +"Address" => "Adresse", +"Title" => "Title", +"Tags" => "Tags", +"Save bookmark" => "Lesezeichen speichern", +"You have no bookmarks" => "Du hast keine Lesezeichen", +"Bookmarklet
" => "Bookmarklet
" +); diff --git a/l10n/el.php b/l10n/el.php new file mode 100644 index 00000000..f282a1bb --- /dev/null +++ b/l10n/el.php @@ -0,0 +1,12 @@ + "Σελιδοδείκτες", +"unnamed" => "ανώνυμο", +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Σύρετε αυτό στους σελιδοδείκτες του περιηγητή σας και κάντε κλικ επάνω του, όταν θέλετε να προσθέσετε σύντομα μια ιστοσελίδα ως σελιδοδείκτη:", +"Read later" => "Ανάγνωση αργότερα", +"Address" => "Διεύθυνση", +"Title" => "Τίτλος", +"Tags" => "Ετικέτες", +"Save bookmark" => "Αποθήκευση σελιδοδείκτη", +"You have no bookmarks" => "Δεν έχετε σελιδοδείκτες", +"Bookmarklet
" => "Εφαρμογίδιο Σελιδοδεικτών
" +); diff --git a/l10n/sl.php b/l10n/sl.php new file mode 100644 index 00000000..32a41629 --- /dev/null +++ b/l10n/sl.php @@ -0,0 +1,12 @@ + "Zaznamki", +"unnamed" => "neimenovano", +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Povlecite to povezavo med zaznamke v vašem brskalniku in jo, ko želite ustvariti zaznamek trenutne strani, preprosto kliknite:", +"Read later" => "Preberi kasneje", +"Address" => "Naslov", +"Title" => "Ime", +"Tags" => "Oznake", +"Save bookmark" => "Shrani zaznamek", +"You have no bookmarks" => "Nimate zaznamkov", +"Bookmarklet
" => "Bookmarklet
" +); From 1eb5764c093d218d777bee145ce5327c1efb9f2b Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Mon, 30 Jul 2012 02:05:41 +0200 Subject: [PATCH 17/25] [tx-robot] updated from transifex --- l10n/es.php | 12 ++++++++++++ l10n/sv.php | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 l10n/es.php create mode 100644 l10n/sv.php diff --git a/l10n/es.php b/l10n/es.php new file mode 100644 index 00000000..071b0dda --- /dev/null +++ b/l10n/es.php @@ -0,0 +1,12 @@ + "Marcadores", +"unnamed" => "sin nombre", +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Arrastra desde aquí a los marcadores de tu navegador, y haz clic cuando quieras marcar una página web rápidamente:", +"Read later" => "Leer después", +"Address" => "Dirección", +"Title" => "Título", +"Tags" => "Etiquetas", +"Save bookmark" => "Guardar marcador", +"You have no bookmarks" => "No tienes marcadores", +"Bookmarklet
" => "Bookmarklet
" +); diff --git a/l10n/sv.php b/l10n/sv.php new file mode 100644 index 00000000..689bd452 --- /dev/null +++ b/l10n/sv.php @@ -0,0 +1,12 @@ + "Bokmärken", +"unnamed" => "namnlös", +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Dra till din webbläsares bokmärken och klicka på det när du vill bokmärka en webbsida snabbt:", +"Read later" => "Läs senare", +"Address" => "Adress", +"Title" => "Titel", +"Tags" => "Taggar", +"Save bookmark" => "Spara bokmärke", +"You have no bookmarks" => "Du har inga bokmärken", +"Bookmarklet
" => "Skriptbokmärke
" +); From 9b9117724d06735a035bc87cb9f4d10a95178bc8 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Tue, 31 Jul 2012 22:57:24 +0200 Subject: [PATCH 18/25] [tx-robot] updated from transifex --- l10n/bg_BG.php | 12 ++++++++++++ l10n/et_EE.php | 10 ++++++++++ l10n/fr.php | 12 ++++++++++++ l10n/it.php | 12 ++++++++++++ 4 files changed, 46 insertions(+) create mode 100644 l10n/bg_BG.php create mode 100644 l10n/et_EE.php create mode 100644 l10n/fr.php create mode 100644 l10n/it.php diff --git a/l10n/bg_BG.php b/l10n/bg_BG.php new file mode 100644 index 00000000..04d731b1 --- /dev/null +++ b/l10n/bg_BG.php @@ -0,0 +1,12 @@ + "Отметки", +"unnamed" => "неозаглавено", +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Завлачете това в лентата с отметки на браузъра си и го натискайте, когато искате да отметнете бързо някоя страница:", +"Read later" => "Отмятане", +"Address" => "Адрес", +"Title" => "Заглавие", +"Tags" => "Етикети", +"Save bookmark" => "Запис на отметката", +"You have no bookmarks" => "Нямате отметки", +"Bookmarklet
" => "Бутон за отметки
" +); diff --git a/l10n/et_EE.php b/l10n/et_EE.php new file mode 100644 index 00000000..da9e4d92 --- /dev/null +++ b/l10n/et_EE.php @@ -0,0 +1,10 @@ + "Järjehoidjad", +"unnamed" => "nimetu", +"Read later" => "Loe hiljem", +"Address" => "Aadress", +"Title" => "Pealkiri", +"Tags" => "Sildid", +"Save bookmark" => "Salvesta järjehoidja", +"You have no bookmarks" => "Sul pole järjehoidjaid" +); diff --git a/l10n/fr.php b/l10n/fr.php new file mode 100644 index 00000000..508c8236 --- /dev/null +++ b/l10n/fr.php @@ -0,0 +1,12 @@ + "Favoris", +"unnamed" => "sans titre", +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Glissez ceci dans les favoris de votre navigateur, et cliquer dessus lorsque vous souhaitez ajouter la page en cours à vos marques-pages :", +"Read later" => "Lire plus tard", +"Address" => "Adresse", +"Title" => "Titre", +"Tags" => "Étiquettes", +"Save bookmark" => "Sauvegarder le favori", +"You have no bookmarks" => "Vous n'avez aucun favori", +"Bookmarklet
" => "Gestionnaire de favoris
" +); diff --git a/l10n/it.php b/l10n/it.php new file mode 100644 index 00000000..862d75bd --- /dev/null +++ b/l10n/it.php @@ -0,0 +1,12 @@ + "Segnalibri", +"unnamed" => "senza nome", +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Quando vuoi creare rapidamente un segnalibro, trascinalo sui segnalibri del browser e fai clic su di esso:", +"Read later" => "Leggi dopo", +"Address" => "Indirizzo", +"Title" => "Titolo", +"Tags" => "Tag", +"Save bookmark" => "Salva segnalibro", +"You have no bookmarks" => "Non hai segnalibri", +"Bookmarklet
" => "Bookmarklet
" +); From 946c3b4ace81463c395864347d7e21a4159b6b07 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sat, 4 Aug 2012 02:04:21 +0200 Subject: [PATCH 19/25] [tx-robot] updated from transifex --- l10n/eo.php | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 l10n/eo.php diff --git a/l10n/eo.php b/l10n/eo.php new file mode 100644 index 00000000..808cda8a --- /dev/null +++ b/l10n/eo.php @@ -0,0 +1,11 @@ + "Legosignoj", +"unnamed" => "nenomita", +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Ŝovu tion ĉi al la legosignoj de via TTT-legilo kaj klaku ĝin, se vi volas rapide legosignigi TTT-paĝon:", +"Read later" => "Legi poste", +"Address" => "Adreso", +"Title" => "Titolo", +"Tags" => "Etikedoj", +"Save bookmark" => "Konservi legosignon", +"You have no bookmarks" => "Vi havas neniun legosignon" +); From 3323ed7ccde799dde23eef065f2d8bbd0c2075e4 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Wed, 8 Aug 2012 17:13:20 +0200 Subject: [PATCH 20/25] Remove unused RUNTIME_NOSETUPFS var --- ajax/addBookmark.php | 7 +------ ajax/delBookmark.php | 5 ----- ajax/editBookmark.php | 5 ----- ajax/recordClick.php | 5 ----- ajax/updateList.php | 5 ----- 5 files changed, 1 insertion(+), 26 deletions(-) diff --git a/ajax/addBookmark.php b/ajax/addBookmark.php index 48371640..c8a64d53 100644 --- a/ajax/addBookmark.php +++ b/ajax/addBookmark.php @@ -21,11 +21,6 @@ * */ -//no apps or filesystem -$RUNTIME_NOSETUPFS=true; - - - // Check if we are a user OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); @@ -34,4 +29,4 @@ OCP\JSON::checkAppEnabled('bookmarks'); require_once(OC_App::getAppPath('bookmarks').'/bookmarksHelper.php'); $id = addBookmark($_POST['url'], $_POST['title'], $_POST['tags']); -OCP\JSON::success(array('data' => $id)); \ No newline at end of file +OCP\JSON::success(array('data' => $id)); diff --git a/ajax/delBookmark.php b/ajax/delBookmark.php index f40f02eb..ba1dfff3 100644 --- a/ajax/delBookmark.php +++ b/ajax/delBookmark.php @@ -21,11 +21,6 @@ * */ -//no apps or filesystem -$RUNTIME_NOSETUPFS=true; - - - // Check if we are a user OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); diff --git a/ajax/editBookmark.php b/ajax/editBookmark.php index 0b37d161..ad43be06 100644 --- a/ajax/editBookmark.php +++ b/ajax/editBookmark.php @@ -21,11 +21,6 @@ * */ -//no apps or filesystem -$RUNTIME_NOSETUPFS=true; - - - // Check if we are a user OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); diff --git a/ajax/recordClick.php b/ajax/recordClick.php index 1eee1718..0283f09f 100644 --- a/ajax/recordClick.php +++ b/ajax/recordClick.php @@ -21,11 +21,6 @@ * */ -//no apps or filesystem -$RUNTIME_NOSETUPFS=true; - - - // Check if we are a user OCP\JSON::checkLoggedIn(); OCP\JSON::checkAppEnabled('bookmarks'); diff --git a/ajax/updateList.php b/ajax/updateList.php index 4de2475d..cf9a2cf9 100644 --- a/ajax/updateList.php +++ b/ajax/updateList.php @@ -22,11 +22,6 @@ * */ -//no apps or filesystem -$RUNTIME_NOSETUPFS=true; - - - // Check if we are a user OCP\JSON::checkLoggedIn(); OCP\JSON::checkAppEnabled('bookmarks'); From 8f6af6e3db96399a859846c2f213025f59d58537 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Wed, 15 Aug 2012 02:07:20 +0200 Subject: [PATCH 21/25] [tx-robot] updated from transifex --- l10n/th_TH.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 l10n/th_TH.php diff --git a/l10n/th_TH.php b/l10n/th_TH.php new file mode 100644 index 00000000..64a148ef --- /dev/null +++ b/l10n/th_TH.php @@ -0,0 +1,12 @@ + "รายการโปรด", +"unnamed" => "ยังไม่มีชื่อ", +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "ลากสิ่งนี้ไปไว้ที่รายการโปรดในโปรแกรมบราวเซอร์ของคุณ แล้วคลิกที่นั่น, เมื่อคุณต้องการเก็บหน้าเว็บเพจเข้าไปไว้ในรายการโปรดอย่างรวดเร็ว", +"Read later" => "อ่านภายหลัง", +"Address" => "ที่อยู่", +"Title" => "ชื่อ", +"Tags" => "ป้ายกำกับ", +"Save bookmark" => "บันทึกรายการโปรด", +"You have no bookmarks" => "คุณยังไม่มีรายการโปรด", +"Bookmarklet
" => "Bookmarklet
" +); From 9c2eb27215b59f15eda7737c0829fca34b2d89e2 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Thu, 16 Aug 2012 02:09:15 +0200 Subject: [PATCH 22/25] [tx-robot] updated from transifex --- l10n/cs_CZ.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 l10n/cs_CZ.php diff --git a/l10n/cs_CZ.php b/l10n/cs_CZ.php new file mode 100644 index 00000000..2251969a --- /dev/null +++ b/l10n/cs_CZ.php @@ -0,0 +1,12 @@ + "Záložky", +"unnamed" => "nepojmenovaný", +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Přetáhněte do Vašeho prohlížeče a kliněte, pokud si přejete rychle uložit stranu do záložek:", +"Read later" => "Přečíst později", +"Address" => "Adresa", +"Title" => "Název", +"Tags" => "Tagy", +"Save bookmark" => "Uložit záložku", +"You have no bookmarks" => "Nemáte žádné záložky", +"Bookmarklet
" => "Záložky
" +); From e7499ff03477726ecbeaa5f50a05fd9b1f223664 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sat, 18 Aug 2012 13:56:04 +0200 Subject: [PATCH 23/25] Optimized image size --- img/bookmarks.png | Bin 496 -> 398 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/img/bookmarks.png b/img/bookmarks.png index b92e4f50a42c68293d256e21cb44d31debbbb840..3e8eed2380f0fca5157ef091fed59508e30ef93b 100644 GIT binary patch delta 371 zcmV-(0gV3e1C9fbB!5*&L_t(I%VS`m1~4--OR=}NzinY*5$ELO6yodaTcV<(!iKI+ zTU(nAs3yh6#^%1Msc9Ho0;qXvdwcu;qN1YD&d$ysYin!&2LuEhhRN&c>2U!yRoL0t zJe}4mA1Jcy!;NbAGxVZTH z!i5X}FI%?ke@jaXZUfrd+Q0??UGqORHT7#mM8x+cOO}8&!Z6VWw6?bXkB^T>(L8DZ ztqcIhcjwfpQ{m~LuC5NR0U$Nj*48D+Nm;?w)%7V*!_O^SwtzKeW@cg-07^(DB_-b- z9UUJV8yicYq-=9@b8|jhTia%!aRO??0_3EZ{EEB+1c4&K}i{yq^p2=f(K{D z0w!AyprSk={n*>v`zMh83Do!y=;RDgW+FO=hK7bR0i79QVq)S42LR^+mdkEz R_?`d&002ovPDHLkV1oP5zdQf{ delta 470 zcmV;{0V)2D1MmZoB!9O_L_t(IjqQ^$h#El{h2PGs89imy!l-Dmps{gT6hUkPVj&WQ zK)^N-2;r)`>L5+(E3OV{LaJ-72w0@B5-VXrge~l3EsPqF6@wZ@XLr-+aol+%kTzd6 z4DWsO^TPoD2nB$AKL0kEOx{GJ(VwYQ>Y1V_FKpZH%w{v|ZhttPPCrQ`5^rQ#{u&O4 zC*$$BCjx-S8ZBj1@|y(tFOihY)g_%jG0hRoyO^3x;9bP9@?Vlu~fc5sSq{ zNs>M+77J3XR)5`ukfS>|e!EAObQ}i&U|ALp=f`jy2ZA6h zZUxKb@>9KDAGh1>Z8n<)V+`x{`ayBG+o9X-Zko;J_swQ=4ebBIXf&FKLZQ!t!2p`3 zr6Q3CDVNKx$z%f4G!c)-p=sK$Mx$X4hr=t=G+*nwK2HMx;r=VdV$sbxe~JZ+x8F3vM%TI`Ila=x4oNxAUIH~)resjuLMEZb~>GJ0PJJA- Date: Thu, 23 Aug 2012 02:07:35 +0200 Subject: [PATCH 24/25] [tx-robot] updated from transifex --- l10n/lt_LT.php | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 l10n/lt_LT.php diff --git a/l10n/lt_LT.php b/l10n/lt_LT.php new file mode 100644 index 00000000..58faddc2 --- /dev/null +++ b/l10n/lt_LT.php @@ -0,0 +1,3 @@ + "be pavadinimo" +); From 4df33fdc4bd706e60836895d400c87d7f7b4268c Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Fri, 24 Aug 2012 02:07:18 +0200 Subject: [PATCH 25/25] [tx-robot] updated from transifex --- l10n/de.php | 6 +++--- l10n/fa.php | 8 ++++++++ l10n/nb_NO.php | 11 +++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 l10n/fa.php create mode 100644 l10n/nb_NO.php diff --git a/l10n/de.php b/l10n/de.php index 9e0f1373..14a54f1c 100644 --- a/l10n/de.php +++ b/l10n/de.php @@ -1,12 +1,12 @@ "Lesezeichen", "unnamed" => "unbenannt", -"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Ziehe dies zu deinen Browser-Lesezeichen und klicke es, wenn du eine Website schnell den Lesezeichen hinzufügen willst.", +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Ziehen Sie dies zu Ihren Browser-Lesezeichen und klicken Sie darauf, wenn Sie eine Website schnell den Lesezeichen hinzufügen wollen.", "Read later" => "Später lesen", "Address" => "Adresse", -"Title" => "Title", +"Title" => "Titel", "Tags" => "Tags", "Save bookmark" => "Lesezeichen speichern", -"You have no bookmarks" => "Du hast keine Lesezeichen", +"You have no bookmarks" => "Sie haben keine Lesezeichen", "Bookmarklet
" => "Bookmarklet
" ); diff --git a/l10n/fa.php b/l10n/fa.php new file mode 100644 index 00000000..b46ce911 --- /dev/null +++ b/l10n/fa.php @@ -0,0 +1,8 @@ + "نشانک‌ها", +"unnamed" => "بدون‌نام", +"Address" => "آدرس", +"Title" => "عنوان", +"Save bookmark" => "ذخیره نشانک", +"You have no bookmarks" => "شما هیچ نشانکی ندارید" +); diff --git a/l10n/nb_NO.php b/l10n/nb_NO.php new file mode 100644 index 00000000..12e63887 --- /dev/null +++ b/l10n/nb_NO.php @@ -0,0 +1,11 @@ + "Bokmerker", +"unnamed" => "uten navn", +"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Dra denne over din nettlesers bokmerker og klikk den, hvis du ønsker å hurtig legge til bokmerke for en nettside", +"Read later" => "Les senere", +"Address" => "Adresse", +"Title" => "Tittel", +"Tags" => "Etikett", +"Save bookmark" => "Lagre bokmerke", +"You have no bookmarks" => "Du har ingen bokmerker" +);