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

30 Commits

Author SHA1 Message Date
Arthur Schiwon
07a05d4472
fix and add phpdoc 2016-08-06 11:36:20 +02:00
blizzz
1b93f9fe2d Merge pull request #265 from owncloud/some_cleanup
Some cleanup
2016-07-31 23:29:52 +02:00
Arthur Schiwon
f8ad93e23a
fix phpdoc, resolve a dependency 2016-07-31 21:14:04 +02:00
Arthur Schiwon
c28a41a239
Fix overwrite of bookmarks when importing links without URL 2016-07-30 01:46:30 +02:00
blizzz
42947ca1e4 Merge pull request #146 from MrksKwsnck/master
Exporting bookmarks results in PHP fatal error
2016-06-12 11:25:02 +02:00
blizzz
d4245f425d Merge pull request #246 from owncloud/fix-230
Improve encoding detection
2016-04-25 00:59:33 +02:00
Arthur Schiwon
1dc98e7067
Improve encoding detection 2016-04-24 21:01:44 +02:00
Arthur Schiwon
e588d1f4bb
Do not override user-provided title when bookmarking via bookmarklet 2016-04-24 20:06:47 +02:00
Arthur Schiwon
28ff9ebabe
use parse_url to verify dn, because filter_var has issues with special chars 2016-04-20 21:51:30 +02:00
HuidaeCho
bcc9d14a90 renameTag SQL bugfix 2016-01-11 21:55:32 -05:00
Lukas Reschke
9f76edb555 Allow iframes 2015-07-22 21:21:59 +02:00
Arthur Schiwon
74eb8a0848 fix updating of bookmarks via bookmarklet 2015-07-14 14:25:18 +02:00
Shikiryu
518b7644af Update for existing bookmark : now gets existing associated tags, fix #127 2015-07-14 14:25:18 +02:00
Markus Kwaśnicki
720d808dc1 Fixed PHP fatal error: Controller could not resolve namespace of Helper class. 2015-04-30 18:58:47 +02:00
blizzz
c30d34cce6 Merge pull request #129 from tflidd/table-prefix
remove fixed “oc_”-prefix.
2015-04-20 13:14:51 +02:00
tflidd
fa6c922868 more ticks 2015-04-18 16:46:15 +02:00
Morris Jobke
a6d57d2a5c Merge pull request #114 from TtuxX/patch-3
Fix http / https protocol requirement.
2015-03-10 09:54:47 +01:00
TtuxX
e85ecbed55 Improve protocols regex 2015-03-09 20:31:38 +01:00
udera
8b0011b6b5 remove fixed “oc_”-prefix. 2015-02-27 18:59:29 +01:00
TtuxX
bc1b9daa1d Fix protocol cut off + Attempt URL https upgrade
- Fix protocol cut off bug
- Automatically attemps to upgrade existing URL from http to https if user add it a second time to bookmarks application (without specifying protocol)
2015-02-14 17:01:41 +01:00
Lukas Reschke
09d0002622 Sanitize exported file properly 2015-02-02 14:02:42 +01:00
TtuxX
0c1a52e4d5 Check if URL already exists before adding
Changed the way `addBookmark` function checks if url already exists.

Now the `addBookmark` function checks wether the url one want to bookmark exists or not, independantly from its protocol.

In order to achieve this, the script :
- Removes everything from the url before the `://` part (included)
- Uses a `like` statement in the SQL query instead of `=`
- Adds a `%` to the url at the query execution
2015-01-05 22:22:43 +01:00
TtuxX
b6048dd3a8 Update bookmarkcontroller.php 2015-01-05 18:50:32 +01:00
ganomi
0bcb107bd2 Merge pull request #109 from owncloud/FixAmazon
Fix handling of website encoding.
2014-12-27 08:03:00 +01:00
ganomi
548d0252ab Fix handling of website encoding.
Exemplary case was Amazon.de which does not have UTF-8 Encoding.
2014-12-26 21:33:25 +01:00
ganomi
46d5836da3 Fix public api when querying with no filter
add test for the case
2014-12-26 19:51:28 +01:00
TtuxX
a08b252564 Update bookmarkcontroller.php 2014-12-26 13:53:53 +01:00
TtuxX
e6dcb38e25 Fix http / https protocol requirement
Fix the http / https prefix requirement when adding a bookmark by :
1 - Constructing URLs for both protocols,
2 - Retrieving both pages titles,
3 - Choosing the one which works, with a systematic preference for https.
2014-12-26 13:14:13 +01:00
TtuxX
a35e9d9c39 Remove the bookmark tags display limit
Set the limit from 10 (original default value) to -1 (load all the tags you ever created)
2014-12-09 00:19:08 +01:00
ganomi
ae81b9dcd2 This is a refactored / rewritten version of the bookmarks app using the app frameworks design and controller features.
Dependency Injection for user and db is used througout the controllers
The Routing features a consistent rest api
The Routing provides some legacy routes, so that for exampe the Android Bookmarks App still works.

There is a publicly available api that provides access to bookmarks per user.
(This is usefull in connection with the WP Plugin https://github.com/mario-nolte/oc2wp-bookmarks)
2014-11-26 12:24:18 +01:00