1
0
mirror of https://github.com/owncloud/bookmarks.git synced 2024-12-02 06:24:11 +01:00
Commit Graph

249 Commits

Author SHA1 Message Date
Lukas Reschke
56b9040743 CSRF check 2012-07-07 15:54:52 +02:00
Tom Needham
18427ca0cc Migration: Fix contacts and bookmarks 2012-06-27 21:18:31 +00:00
Brice Maron
6bb2c54fdd Prevent errors and mini enhancement of saved window in bookmarks 2012-06-24 21:30:14 +00:00
Brice Maron
63959909c0 Correct bookmark app : add through interface and remove missing css 2012-06-24 21:24:43 +00:00
Brice Maron
37b07e4e2d 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
a3c356a043 use new sanitizeHTML() function 2012-06-21 13:57:18 +02:00
Bjoern Schiessle
3daec8b8e9 check if user is allowed to edit bookmarks 2012-06-21 12:29:50 +02:00
Bjoern Schiessle
d670736d41 check if user is allowed to edit bookmarks 2012-06-21 11:50:51 +02:00
Arthur Schiwon
578982bd38 make bookmarks bookmarklet work again, kudos to Victor Dubiniuk 2012-06-20 20:04:41 +02:00
Arthur Schiwon
a7a0a933d2 make bookmarks bookmarklet work again, kudos to Victor Dubiniuk 2012-06-20 20:03:25 +02:00
Arthur Schiwon
1531b91312 bookmarks: make read later-button draggable again, fixes oc-944 2012-06-20 19:43:02 +02:00
Arthur Schiwon
14333a0cdc bookmarks: make read later-button draggable again, fixes oc-944 2012-06-20 16:31:22 +02:00
Brice Maron
b5a7f1ad29 Merge branch 'master' into multi_app_dir
Conflicts:
	apps/bookmarks/ajax/addBookmark.php
	config/config.sample.php
	lib/app.php
	remote.php
2012-06-14 21:16:59 +00:00
Marco B
aa5a6bdb9f utf8 in der DB config 2012-06-11 23:04:28 +02:00
Lukas Reschke
17eaa533e9 Using POST instead of GET. 2012-06-11 11:56:11 +02:00
Lukas Reschke
fba6113675 Using POST instead of GET. 2012-06-10 23:38:26 +02:00
Brice Maron
e122e02ee1 Correct remote and public, and last occurence of OC:: 2012-06-06 20:24:15 +00:00
Brice Maron
a5998b3d7d Unit path and webpath, correct some more 2012-06-06 20:24:15 +00:00
Bart Visscher
910061b2ee 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.
2012-05-31 13:01:30 +02:00
Frank Karlitschek
acaf75971f mark the apps as part of the shipped package and increase the requirement to ownCloud 4 2012-05-18 16:06:57 +02:00
Michael Gapczynski
f180922709 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
Thomas Mueller
3391ae307a removing executable bit - again 2012-05-15 00:52:00 +02:00
Michael Gapczynski
54dcc61123 Remove scroll to bookmarks_menu, no longer existent and the bookmark controls are always visible at the top anyways 2012-05-13 21:10:27 -04:00
Michael Gapczynski
58a4859ed3 Validate bookmark inputs, fixes bug oc-636 2012-05-13 16:58:47 -04:00
Vitaly Kuznetsov
091161ff69 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
7281a90fa4 Change label for saving bookmark button 2012-05-08 19:04:06 +00:00
Brice Maron
756c03d8ef Try to correct query string url for search in bookmark 2012-05-08 16:22:35 +00:00
Frank Karlitschek
d5a90dd8e9 ported the oc_template class 2012-05-06 23:00:36 +02:00
Frank Karlitschek
bf63fc4b9e added a nice API to get the installes Apps with names, urls and icon from the outside.
This is useful for some nice upcoming desktop and mobile integration
2012-05-05 23:42:38 +02:00
Bart Visscher
f23ff751b2 Bookmarks: Move delete code to Bookmarks class, also change to use id 2012-05-03 17:33:57 +02:00
Frank Karlitschek
7bfe6a7c89 ported oc_db 2012-05-03 13:06:08 +02:00
Frank Karlitschek
330e1f5a85 ported oc_json 2012-05-03 12:23:29 +02:00
Frank Karlitschek
c1cf03ff65 port checkAppEnabled 2012-05-02 19:08:37 +02:00
Frank Karlitschek
18322419e3 first part of the config stuff 2012-05-02 13:28:56 +02:00
Frank Karlitschek
9862084672 ported the oc_app calls 2012-05-02 00:50:26 +02:00
Frank Karlitschek
d3a3bffbca ported the rest of the OC_Helper calls 2012-05-02 00:20:45 +02:00
Frank Karlitschek
b28a034f23 port linkto and serverHost 2012-05-01 23:19:39 +02:00
Frank Karlitschek
ff20ebcb3b ported checkLoggedIn and checkAdmin 2012-05-01 22:59:38 +02:00
Frank Karlitschek
303391fd58 ported addSyript and other small stuff 2012-05-01 20:03:41 +02:00
Frank Karlitschek
2336d2350e ported getUser 2012-05-01 18:50:31 +02:00
Frank Karlitschek
fa8a3215b7 finish porting of the LOG calls or the apps to the public api 2012-05-01 17:38:27 +02:00
Frank Karlitschek
810ffdb5a8 port to use the new public api 2012-05-01 09:49:22 +02:00
Georg Ehrke
7c97c58757 some fixes fore movable apps 2012-04-26 14:52:55 +02:00
Georg Ehrke
b4b018b544 bookmarks app seems to work now :) 2012-04-25 21:20:06 +02:00
Georg Ehrke
b3b479d833 fix merge conflicts 2012-04-22 13:19:12 +02:00
Frank Karlitschek
03ee3dfaa5 make the button a bit more consistent to the other ownCloud interface 2012-04-21 23:34:24 +02:00
Georg Ehrke
64cbfbadd6 remove the require_once lib base from all (or nearly all) files 2012-04-17 19:31:29 +02:00
Arthur Schiwon
349597c8b7 Bookmarks: handle input with & and ?, fixes oc-201 2012-04-15 15:53:40 +02:00
Robin Appelman
7bfad1f3b8 reuse OC_L10N objects 2012-04-14 16:44:15 +02:00
Robin Appelman
cc2784940b keep version numbers in their own files for faster reading 2012-04-14 16:29:11 +02:00