blizzz
8856fa23fe
Merge pull request #250 from owncloud/backport-246-9.0
...
[9.0] Backport of #246
2016-04-25 01:13:58 +02:00
Arthur Schiwon
8ea69ce561
Backport of #246
...
Improve encoding detection
adjust unit test
2016-04-25 01:01:05 +02:00
blizzz
ecc50c347d
Merge pull request #247 from owncloud/backport-245-9.0
...
[9.0] Do not override user-provided title when bookmarking via bookmarklet
2016-04-24 21:45:44 +02:00
Arthur Schiwon
2b5a15ee7b
Do not override user-provided title when bookmarking via bookmarklet
2016-04-24 21:05:20 +02:00
blizzz
cf97571eb6
Merge pull request #241 from owncloud/backport-240-9.0
...
[9.0] backport of #240
2016-04-24 17:43:53 +02:00
Arthur Schiwon
dbcae2ec45
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:19:12 +02:00
blizzz
06c556d832
Merge pull request #238 from owncloud/version-to-infoxml-9.0
...
[stable9] move version to info.xml
2016-04-17 22:58:37 +02:00
Arthur Schiwon
0eba8c5101
move version to info.xml
2016-04-17 22:49:54 +02:00
blizzz
3a9fb3b8d5
Merge pull request #234 from owncloud/backport-224-9.0
...
[stable9] renameTag SQL bugfix
2016-04-16 22:54:29 +02:00
HuidaeCho
e298225bf5
renameTag SQL bugfix
2016-04-16 22:47:49 +02:00
Lukas Reschke
4b021b4596
Merge pull request #228 from owncloud/update-travis-core-branch
...
Update the env.global.CORE_BRANCH setting in .travis.yml
2016-03-02 08:14:05 +01:00
Joas Schilling
a60e43a397
Update the env.global.CORE_BRANCH setting in .travis.yml
2016-03-02 07:37:45 +01:00
Jenkins for ownCloud
ff804ea4e2
[tx-robot] updated from transifex
2016-03-01 02:10:41 -05:00
Jenkins for ownCloud
7486009070
[tx-robot] updated from transifex
2016-02-24 15:10:29 -05:00
Morris Jobke
eaf12456e6
Merge pull request #225 from owncloud/better-navigation-entry
...
Better navigation entry
2016-01-12 16:11:53 +01:00
Joas Schilling
63007c029f
Better navigation entry
2016-01-12 13:38:15 +01:00
Jenkins for ownCloud
be157c6f13
[tx-robot] updated from transifex
2016-01-06 02:10:47 -05:00
blizzz
9a497c28ee
Merge pull request #176 from owncloud/LukasReschke-patch-3
...
Add PHP 7 to test matrix
2015-12-17 17:48:48 +01:00
blizzz
071405cbe7
Merge pull request #174 from owncloud/LukasReschke-patch-1
...
[master] Fix OCS id
2015-12-17 17:43:24 +01:00
Lukas Reschke
962f58e32d
Add PHP 7 to test matrix
2015-12-17 16:56:28 +01:00
Lukas Reschke
acb2479e4a
[master] Fix OCS id
2015-12-17 16:39:13 +01:00
Jenkins for ownCloud
36f6464076
[tx-robot] updated from transifex
2015-12-06 02:10:20 -05:00
Jenkins for ownCloud
f08aca779d
[tx-robot] updated from transifex
2015-11-11 02:10:40 -05:00
Jenkins for ownCloud
e72bf175f6
[tx-robot] updated from transifex
2015-11-06 02:10:51 -05:00
blizzz
70c0010911
Merge pull request #179 from owncloud/issue-136
...
Prevent dialog stating "Bookmark added. You can close the window now.…
2015-11-05 19:43:58 +01:00
Tim McIver
c1b50fd0ce
Per PR suggestion added a dialog indicating that bookmark was successfully
...
saved which closes after one second.
2015-11-05 19:15:23 +01:00
Tim McIver
f67dc417c3
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:15:23 +01:00
blizzz
8b38a26d33
Merge pull request #205 from owncloud/fix-197
...
bump app version and enable it for current OC master, fixes #197
2015-11-05 18:52:57 +01:00
blizzz
a154287116
Merge pull request #198 from owncloud/closure-for-navigation
...
Do not load routes when not needed
2015-11-05 18:07:42 +01:00
Arthur Schiwon
f72287f4d7
bump app version and enable it for current OC master, fixes #197
2015-11-05 18:00:58 +01:00
Jenkins for ownCloud
47b9e46971
[tx-robot] updated from transifex
2015-10-19 02:10:42 -04:00
Jenkins for ownCloud
44139d3bcd
[tx-robot] updated from transifex
2015-10-18 02:10:41 -04:00
Jenkins for ownCloud
42a22a538c
[tx-robot] updated from transifex
2015-10-14 02:10:39 -04:00
Joas Schilling
84cf845941
Do not load routes when not needed
2015-10-13 09:45:26 +02:00
Jenkins for ownCloud
c36d5e04d4
[tx-robot] updated from transifex
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
