From 188e4c02e34998707d2ff4272cab274a42018679 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Mon, 7 Jul 2014 17:24:22 +0200 Subject: [PATCH 1/7] add ocsid --- appinfo/info.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/appinfo/info.xml b/appinfo/info.xml index 13a8ba95..033b6a8f 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -8,4 +8,5 @@ 4.93 true + 166042 From c43167ec9714bd22c8bd63dc7fd7c3f41b03c4a1 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Mon, 7 Jul 2014 17:24:38 +0200 Subject: [PATCH 2/7] increment version number --- appinfo/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/version b/appinfo/version index 1d71ef97..bd73f470 100644 --- a/appinfo/version +++ b/appinfo/version @@ -1 +1 @@ -0.3 \ No newline at end of file +0.4 From c03923e3d596c6f3cdf716f045d14634b4b9d999 Mon Sep 17 00:00:00 2001 From: s2 Date: Wed, 6 Aug 2014 14:35:14 +0200 Subject: [PATCH 3/7] fix bookmarks search results display --- lib/search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/search.php b/lib/search.php index b44db590..b19b3bd7 100644 --- a/lib/search.php +++ b/lib/search.php @@ -35,7 +35,7 @@ class OC_Search_Provider_Bookmarks extends OC_Search_Provider{ $bookmarks = OC_Bookmarks_Bookmarks::searchBookmarks($search_words); $l = new OC_l10n('bookmarks'); //resulttype can't be localized, javascript relies on that type foreach($bookmarks as $bookmark) { - $results[]=new OC_Search_Result($bookmark['title'], '', $bookmark['url'], (string) $l->t('Bookm.'), null); + $results[]=new OC_Search_Result($bookmark['title'], $bookmark['title'], $bookmark['url'], (string) $l->t('Bookm.'), null); } return $results; From 9d0b73e085cb943cf1b9f963fef9d78dcdaf5233 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 20 Aug 2014 15:50:56 +0200 Subject: [PATCH 4/7] remove shadow from icon --- img/bookmarks.png | Bin 808 -> 503 bytes img/bookmarks.svg | 246 ++-------------------------------------------- 2 files changed, 6 insertions(+), 240 deletions(-) diff --git a/img/bookmarks.png b/img/bookmarks.png index 5aa0079931162fe6f0b120a5c7035c2680247a11..b70fe8c571c1b87c10e341f5aacf4064ccf2c9a9 100644 GIT binary patch literal 503 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dya{_!qT>lSZ;F`&;1azlyNswPK z0~0elAHSHmgo2{Fmad+OjhBCDOlDbQb6fw^B`a2L*s}k?p`*vn-G27&{f94KzkUDx z_n&p-@eZK&>z*!-Arg{n4_=?tWWd0BLA$JXW5U6EqSi(K|KI01@kS-`(B$V2p1UcF z2nDJHqQz2SD(DK0;wWkTLN*367LyzsP-c%{@|X5;oc=3POz`OOr0AF6%0 zt-3@_+$u)RgQbLPg2ww78?==}Ee)@)Z1VYgM&`NIzb#Jxgtsl27#_7wsO{e5wsih! z%DnCod)RsT`PCe|8!|mk3oMh=HJa&8Gi-<0047(dh`GQ00eVFNmK|32nc)#WQYI&010qNS#tmY4c7nw z4c7reD4Tcy000?uMObuGZ)S9NVRB^vcXxL#X>MzCV_|S*E^l&Yo9;Xs0007|NklSL&YH^l61{2o%$y@sDE@TT}u(_AJF%FCHjR2M|i*Q=X>wo``ty5#B(YZrC12D zA%xh7;_)H^d~tJg^Q*c(Cix?j5y?;^pU>|*jzh_kWg8*L9i8sjy#_N`(N7u?Hv=3Wrik_Df31LZNUt)&Kxj zYqi<{{8qJEjR00h9sqz2z$_Mv7ru0*VzGDuzyzQ_IspDPrUd|R0c->K2H;B9b(*Hh zdc8i3&w9O1(=@5;IssfMk8S0-03ddkDHIq&h)=Ot?0?Dyd*&(FUO zO@E+AV1QIAm5CZ)n1^owA;d&Foz{o=Qw?9G(|>7Q2r=RB;IlariNsQ;)A8I~Qp!Ih z_ef^c*i*j^sMF~%kw`50aeM=;udl!N0QX4ll1zEjq)6_nIrpTz9(M||+3d?ZtMm)N zju7G%fGq$`kCG;UEj4FH)eLw&_z{qNL-L5^2a?l4XW3^=tJ)*w - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - + + + + + + From 99ea5ad709db0365fd72a84cfe40081207ca0fce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Wed, 20 Aug 2014 16:03:00 +0200 Subject: [PATCH 5/7] remove index - there is already a PK on this column --- appinfo/database.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/appinfo/database.xml b/appinfo/database.xml index 6e45d5e1..923e50c6 100644 --- a/appinfo/database.xml +++ b/appinfo/database.xml @@ -73,15 +73,6 @@ true 4 - - - id - true - - id - descending - - From ea4c9ddbd81ac6f7c3fd8f4387ea9b913e93c1fc Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 5 Nov 2014 09:56:22 +0100 Subject: [PATCH 6/7] Add requesttoken --- ajax/import.php | 6 ++++-- templates/settings.php | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ajax/import.php b/ajax/import.php index 5bf8bfe9..670dde46 100644 --- a/ajax/import.php +++ b/ajax/import.php @@ -1,7 +1,9 @@
@@ -14,6 +15,7 @@
" method="post" enctype="multipart/form-data"> +

From 480099f1dff6fcb17861975d38c9aac943527c86 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 5 Nov 2014 10:15:54 +0100 Subject: [PATCH 7/7] Disable entity loader just in case --- lib/bookmarks.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bookmarks.php b/lib/bookmarks.php index 36faffca..c74adb71 100644 --- a/lib/bookmarks.php +++ b/lib/bookmarks.php @@ -402,6 +402,7 @@ class OC_Bookmarks_Bookmarks{ public static function importFile($file){ libxml_use_internal_errors(true); + $loadEntities = libxml_disable_entity_loader(true); $dom = new domDocument(); $dom->loadHTMLFile($file); @@ -423,6 +424,7 @@ class OC_Bookmarks_Bookmarks{ self::addBookmark($ref, $title, $tags,$desc_str ); } OCP\DB::commit(); + libxml_disable_entity_loader($loadEntities); return array(); }