Commit Graph

28 Commits

Author SHA1 Message Date
Brice Maron e5c56b2433 Merge branch 'master' into multi_app_dir
Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php
2012-06-21 17:15:35 +00:00
Bjoern Schiessle 34739b7ec5 use new sanitizeHTML() function 2012-06-21 13:57:18 +02:00
Brice Maron cc494259d3 Unit path and webpath, correct some more 2012-06-06 20:24:15 +00:00
Michael Gapczynski cbfbbe672c Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115
Conflicts:
	apps/files/templates/index.php
2012-05-17 15:38:28 -04:00
Vitaly Kuznetsov 6f981738bb Fix some non-utf8-friendly htmlentities (resulting in wrong display of utf8-encoded directory names for example) 2012-05-10 09:10:53 +00:00
Brice Maron 41d0308806 Change label for saving bookmark button 2012-05-08 19:04:06 +00:00
Georg Ehrke 3f64eb25ab some fixes fore movable apps 2012-04-26 14:52:55 +02:00
Marvin Thomas Rabe 196d619689 Little bookmark improvement 2012-02-22 23:58:38 +01:00
Marvin Thomas Rabe 3988ec2813 Updated bookmark form 2012-02-22 23:22:17 +01:00
Marvin Thomas Rabe 5387820a3b changed look of bookmarklet 2012-02-22 23:08:50 +01:00
Alessandro Cosentino 70f9936651 sharing code between the two bookmarklets 2012-02-22 16:38:05 -05:00
Marvin Thomas Rabe fd72f2bd29 Removed redundant code. 2012-02-22 16:04:32 +01:00
Marvin Thomas Rabe b3f3b8c23f UI problems solved. Bookmarks app updated. 2012-02-22 16:04:31 +01:00
Alessandro Cosentino 490c9db15d Added bookmarklet for browser. Inspired by Google Bookmarks 2012-02-19 20:18:27 -05:00
Marvin Thomas Rabe 6b64aa3faf removed description. changed target to _blank. removed sorting. updated layout. 2011-10-08 13:54:45 +02:00
Marvin Thomas Rabe 590ff0ced9 moved bookmarklet to personal. username must be provided when adding a new user. 2011-10-08 13:10:49 +02:00
Marvin Thomas Rabe 5a40804773 bookmarks are now translatable 2011-10-01 11:14:43 +02:00
Golnaz Nilieh 67addb4882 Add support of editing bookmarks. 2011-09-13 15:40:09 +04:30
Bart Visscher 760b47a62f Use OC_Helper::linkTo also for absolute urls.
One central place to check for https.
2011-09-09 22:19:15 +02:00
Golnaz Nilieh c5aa139296 Use an animated gif in add-bookmark form, while fetching metadata. 2011-09-06 17:13:03 +04:30
Arthur Schiwon e6bdd25667 fix: links with parameters get cut off at & 2011-08-25 13:51:48 +02:00
Arthur Schiwon e0a69bbeac Make bookmarks sortable by clicks 2011-08-25 12:55:13 +02:00
Arthur Schiwon 55a8ee34bd Make appeareance of the bookmarklet a bit nicer, still room for improvement left 2011-08-25 12:15:03 +02:00
Arthur Schiwon 7cd592e055 Added a Bookmarklet for the Bookmarks app 2011-08-24 22:16:44 +02:00
Arthur Schiwon 0f3ef8aeb0 check if tag is set, might not show bookmarks on some systems without doing so 2011-08-24 14:36:03 +02:00
Golnaz Nilieh 5d310ebf92 * Use encodeEntities() function to check input
* Separate tags by space
2011-08-19 16:18:08 +04:30
Jan-Christoph Borchardt b885bad2ee wording fix for bookmarks 2011-08-16 12:45:44 +02:00
Arthur Schiwon 5608aaee8a initial commit of Bookmarks App 2011-08-15 22:05:07 +02:00