1
0
mirror of https://github.com/owncloud/bookmarks.git synced 2025-02-23 20:54:23 +01:00

1154 Commits

Author SHA1 Message Date
Arthur Schiwon
930e1e1ce6
increase title size to 4096, and cut title and description before writing to DB 2016-08-07 12:31:44 +02:00
Arthur Schiwon
b2bc5f3c58
Fix overwrite of bookmarks when importing links without URL 2016-08-07 12:31:12 +02:00
blizzz
8bdbd82134 Merge pull request #269 from owncloud/backport-146-8.2
[stable8.2] Fixed PHP fatal error: Controller could not resolve namespace of Help…
2016-08-06 12:32:27 +02:00
Markus Kwaśnicki
a63955e677
Fixed PHP fatal error: Controller could not resolve namespace of Helper class. 2016-08-06 12:23:00 +02:00
blizzz
0ab13254f3 Fix version number v8.2.7 v8.2.7RC1 v8.2.6 v8.2.6RC1 v8.2.5 v8.2.5RC2 v8.2.5RC1 v8.2.4 v8.2.4RC2 v8.2.4RC1 bookmarks-v0.6.1 2016-04-25 01:15:34 +02:00
blizzz
22d637fd1f Merge pull request #251 from owncloud/backport-246-8.2
[8.2] Backport of #246
2016-04-25 01:14:08 +02:00
Arthur Schiwon
e4bbb2277e
Backport of #246
Improve encoding detection

adjust unit test
2016-04-25 01:02:16 +02:00
blizzz
a8f3be527d Merge pull request #248 from owncloud/backport-245-8.2
[8.2] Do not override user-provided title when bookmarking via bookmarklet
2016-04-24 21:45:52 +02:00
Arthur Schiwon
30b7c79f4a
Do not override user-provided title when bookmarking via bookmarklet 2016-04-24 21:06:56 +02:00
blizzz
ec246aca5b Merge pull request #242 from owncloud/backport-240-8.2
[8.2] backport of #240
2016-04-24 17:35:43 +02:00
Arthur Schiwon
4e6a21b940
backport of #240
use parse_url to verify dn, because filter_var has issues with special chars

Add test on adding bookmark with URL containing umlaut

Does not relate to this issue (different code path, not covered by tests
yet), but still it is a good addition.
2016-04-24 17:29:13 +02:00
blizzz
bc32b6ff95 Merge pull request #235 from owncloud/backport-224-8.2
[stable8.2] renameTag SQL bugfix
2016-04-16 23:02:15 +02:00
HuidaeCho
07e96874a3
renameTag SQL bugfix 2016-04-16 22:51:01 +02:00
blizzz
d105fb86b8 Merge pull request #220 from owncloud/fix-ocs-id-stable82
[stable8.2] Fix OCS id
v8.2.3 v8.2.3RC2 v8.2.3RC1 v8.2.2
2015-12-17 17:50:01 +01:00
Lukas Reschke
6c146ff3ad Fix OCS id 2015-12-17 16:44:58 +01:00
blizzz
0ccc842f45 Merge pull request #213 from owncloud/fix-version-requirement
Only specify one owncloud version requirement
v8.2.2RC1 v8.2.1 v8.2.1RC4 v8.2.1RC3 v8.2.1RC2
2015-11-09 16:10:26 +01:00
Joas Schilling
1df014b2e9 Only specify one owncloud version requirement 2015-11-09 10:33:25 +01:00
blizzz
0859ce1d8c Merge pull request #208 from owncloud/backport-179-stable8.2
[backport] [stable8.2] autoclosing bookmarklet
2015-11-05 19:58:44 +01:00
Tim McIver
986165ffb2 Per PR suggestion added a dialog indicating that bookmark was successfully
saved which closes after one second.
2015-11-05 19:50:49 +01:00
Tim McIver
839b8d9205 Prevent dialog stating "Bookmark added. You can close the window now." from
displaying when creating a bookmark using bookmarklet. Addresses issue 136.
2015-11-05 19:50:43 +01:00
blizzz
7ea5902af2 Merge pull request #206 from owncloud/backport-198-stable8.2
[backport][stable8.2] Do not load routes when not needed
2015-11-05 18:54:20 +01:00
Joas Schilling
46599d8224 Do not load routes when not needed 2015-11-05 18:10:43 +01:00
Arthur Schiwon
2928208f49 bump version v8.2.1RC1 bookmarks-v0.6 2015-10-30 23:29:12 +01:00
Joas Schilling
bb10618d42 Merge pull request #199 from owncloud/update-travis-core-branch
Update the env.global.CORE_BRANCH setting in .travis.yml
v8.2.0
2015-10-19 08:43:05 +02:00
Joas Schilling
0712f4e5fc Update the env.global.CORE_BRANCH setting in .travis.yml 2015-10-14 08:12:41 +02:00
Jenkins for ownCloud
c36d5e04d4 [tx-robot] updated from transifex v8.2RC3 v8.2RC2 v8.2RC1 v8.2beta1 2015-09-04 02:10:41 -04:00
Jenkins for ownCloud
b4a88a6830 [tx-robot] updated from transifex 2015-08-26 02:10:45 -04:00
blizzz
5b69efb7fb Merge pull request #182 from owncloud/allow-iframes
Allow iframes
2015-08-03 11:40:21 +02:00
Jenkins for ownCloud
48ab0605dd [tx-robot] updated from transifex 2015-08-02 02:10:44 -04:00
Lukas Reschke
9f76edb555 Allow iframes 2015-07-22 21:21:59 +02:00
Jenkins for ownCloud
1b0433b329 [tx-robot] updated from transifex 2015-07-21 02:10:36 -04:00
blizzz
d5e896e6a4 Merge pull request #173 from owncloud/bookmarklet-tags-and-overwrite
[bookmarklet] Reintroduce tags and fix editing existing entries
2015-07-21 00:14:44 +02:00
blizzz
344f14e3b6 Update .scrutinizer.yml
Have a timeout for code coverage so that it does not turn red immediately.  Just like in core.
2015-07-14 14:27:09 +02:00
Arthur Schiwon
74eb8a0848 fix updating of bookmarks via bookmarklet 2015-07-14 14:25:18 +02:00
Shikiryu
15c5c50a77 add tagit 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
Shikiryu
52ec490ad4 Adding tags in bookmarklet, fix #127 2015-07-14 14:25:18 +02:00
blizzz
5047156849 Merge pull request #165 from RealRancor/add_contributing
Add CONTRIBUTING.md
2015-07-14 14:17:34 +02:00
Jenkins for ownCloud
e5acadc10e [tx-robot] updated from transifex 2015-07-13 02:10:41 -04:00
Jan-Christoph Borchardt
f57bb4803a Merge pull request #170 from owncloud/add-button-style
use proper inline style for bookmark add button and feedback
2015-07-12 10:45:30 +02:00
Jan-Christoph Borchardt
4264783f66 use proper inline style for bookmark add button and feedback 2015-07-10 14:26:22 +02:00
Jenkins for ownCloud
876f11b74e [tx-robot] updated from transifex 2015-07-10 02:10:35 -04:00
blizzz
c90fe346ed Merge pull request #164 from owncloud/fix-162-master
fix unit test, fixes #162 on master
2015-07-09 00:08:02 +02:00
Arthur Schiwon
2dfa9a80bf bump max OC version 2015-07-08 22:41:03 +02:00
RealRancor
1e3405dd2e Add CONTRIBUTING.md 2015-07-08 22:14:52 +02:00
Arthur Schiwon
c97a23b39b fix unit test 2015-07-08 22:08:45 +02:00
Thomas Müller
1b4be5de3f No OC_Log 2015-07-04 16:11:17 +02:00
Lukas Reschke
834ab59a12 Set minimum version to 8.1 2015-07-01 02:22:14 +02:00
Jenkins for ownCloud
e699ce5fff [tx-robot] updated from transifex v8.1RC2 2015-06-14 02:10:20 -04:00
Jenkins for ownCloud
aa5c1ee227 [tx-robot] updated from transifex 2015-06-05 02:10:28 -04:00