blizzz
7fe61c9bbc
Merge pull request #252 from owncloud/backport-246-8.1
...
[8.1] backport of #246
2016-04-25 01:14:17 +02:00
Arthur Schiwon
b3bc413283
backport of #246
...
Improve encoding detection
adjust unit test
2016-04-25 01:03:29 +02:00
blizzz
fa41f5df87
Merge pull request #249 from owncloud/backport-245-8.1
...
[8.1] Do not override user-provided title when bookmarking via bookmarklet
2016-04-24 21:45:59 +02:00
Arthur Schiwon
040be8a3a0
Do not override user-provided title when bookmarking via bookmarklet
2016-04-24 21:08:50 +02:00
blizzz
2b54c65b91
Merge pull request #243 from owncloud/backport-240-8.1
...
[8.1] Backport 240 8.1
2016-04-24 17:58:13 +02:00
Arthur Schiwon
9e96563dd8
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:43:18 +02:00
blizzz
16a002c1d5
Merge pull request #236 from owncloud/backport-224-8.1
...
[stable8.1] renameTag SQL bugfix
2016-04-16 23:02:29 +02:00
HuidaeCho
67728e12e5
renameTag SQL bugfix
2016-04-16 22:56:06 +02:00
blizzz
ead4cd9a15
Merge pull request #175 from owncloud/LukasReschke-patch-2
...
[stable8.1] Use proper OCS id
2015-12-17 17:48:03 +01:00
Lukas Reschke
fb70c164f5
[stable8.1] Use proper OCS id
2015-12-17 16:42:14 +01:00
blizzz
2d5077f5d1
Merge pull request #209 from owncloud/backport-179-stable8.1
...
[backport] [stable8.1] autoclosing bookmarklet
2015-11-05 20:01:52 +01:00
Tim McIver
c1c5244392
Per PR suggestion added a dialog indicating that bookmark was successfully
...
saved which closes after one second.
2015-11-05 19:55:37 +01:00
Tim McIver
7a179818dd
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:55:29 +01:00
blizzz
1b01f2f977
Merge pull request #207 from owncloud/backport-198-stable8.1
...
[backport] [stable8.1] Do not load routes when not needed
2015-11-05 19:04:36 +01:00
Joas Schilling
11f6c14b88
Do not load routes when not needed
2015-11-05 18:14:05 +01:00
Arthur Schiwon
7a635de8af
bump version
2015-10-30 23:28:44 +01:00
Lukas Reschke
01b027ed07
Allow iframes
2015-08-03 11:41:23 +02:00
blizzz
2a8d32717b
Merge pull request #177 from owncloud/backport-173-stable8.1
...
Backport of #173 (Reintroduce tags and fix editing existing entries)
2015-07-21 00:24:35 +02:00
Shikiryu
f5e526fbd8
Backport of #173 (Reintroduce tags and fix editing existing entries)
...
Adding tags in bookmarklet, fix #127
Update for existing bookmark : now gets existing associated tags, fix #127
add tagit
fix updating of bookmarks via bookmarklet
2015-07-21 00:17:40 +02:00
Jan-Christoph Borchardt
e0becee838
use proper inline style for bookmark add button and feedback
2015-07-13 15:51:39 +02:00
blizzz
ef789df012
Merge pull request #166 from owncloud/fix-162-stable8.1
...
fix unit test, fixes #162 on stable8.1
2015-07-09 00:09:14 +02:00
Arthur Schiwon
b3c927f834
fix unit test
2015-07-08 22:20:31 +02:00
Joas Schilling
2a2218c348
Merge pull request #161 from owncloud/update-travis-oc-target-branch
...
Update owncloud target version in .travis.yml
2015-07-02 15:32:53 +02:00
Joas Schilling
d408cca63a
Update owncloud target version in .travis.yml
2015-07-01 08:47:40 +02:00
Lukas Reschke
b50b08cd26
Set minimum version to 8.1
2015-07-01 02:22:32 +02:00
Jenkins for ownCloud
e699ce5fff
[tx-robot] updated from transifex
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
Jenkins for ownCloud
088ddb37e1
[tx-robot] updated from transifex
2015-06-04 02:10:29 -04:00
Jenkins for ownCloud
5b6e1fb6cc
[tx-robot] updated from transifex
2015-05-14 02:10:28 -04:00
Thomas Müller
27430b50b5
Merge pull request #148 from owncloud/update-travis-branches-only-setting
...
Update the branches.only setting in .travis.yml
2015-05-12 09:30:44 +02:00
Joas Schilling
a5f07512ca
Update the branches.only setting in .travis.yml
2015-05-11 15:24:11 +02:00
Jenkins for ownCloud
5403b49dc3
[tx-robot] updated from transifex
2015-05-06 02:10:26 -04:00
Jenkins for ownCloud
40b31bf91d
[tx-robot] updated from transifex
2015-05-05 02:10:26 -04:00
Jenkins for ownCloud
d609c297ee
[tx-robot] updated from transifex
2015-05-04 02:10:26 -04:00
Jenkins for ownCloud
e34bae9288
[tx-robot] updated from transifex
2015-05-02 02:10:25 -04:00
Jenkins for ownCloud
a557d930d5
[tx-robot] updated from transifex
2015-04-25 02:10:30 -04:00
blizzz
c30d34cce6
Merge pull request #129 from tflidd/table-prefix
...
remove fixed “oc_”-prefix.
2015-04-20 13:14:51 +02:00
Jenkins for ownCloud
aed0699642
[tx-robot] updated from transifex
2015-04-19 02:10:18 -04:00
tflidd
fa6c922868
more ticks
2015-04-18 16:46:15 +02:00
Jenkins for ownCloud
c6daa711cf
[tx-robot] updated from transifex
2015-04-06 02:10:18 -04:00
Jenkins for ownCloud
a710ecc2bd
[tx-robot] updated from transifex
2015-04-02 02:10:32 -04:00
Jenkins for ownCloud
d7fba596cf
[tx-robot] updated from transifex
2015-03-23 02:10:28 -04:00
Jenkins for ownCloud
929225c442
[tx-robot] updated from transifex
2015-03-19 02:10:34 -04:00
Oliver Kohl D.Sc.
c522347d2c
Undifined index
...
This prevents the undefined index notice to show up in the log.
2015-03-11 13:58:38 +01: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
Jenkins for ownCloud
9e7674c684
[tx-robot] updated from transifex
2015-03-09 02:10:29 -04:00
udera
8b0011b6b5
remove fixed “oc_”-prefix.
2015-02-27 18:59:29 +01:00
Jenkins for ownCloud
d6443a3e51
[tx-robot] updated from transifex
2015-02-25 02:10:20 -05:00
Jenkins for ownCloud
53e797bd9a
[tx-robot] updated from transifex
2015-02-21 02:10:19 -05:00
