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

1215 Commits

Author SHA1 Message Date
Thomas Müller
8bb4d0bf13 Merge pull request #3 from Kawohl/fixcompat
fixed compatibility
2017-08-07 12:09:05 +02:00
Jonathan Kawohl
835b206a64 fixed opening bracket 2017-08-03 11:45:55 +02:00
Kawohl
516887da4e fixed compatibility 2017-03-09 15:06:22 +00:00
Thomas Müller
6bce61c99a Merge pull request #2 from Kawohl/patch-2
remove nextcloud version
2017-03-09 15:17:52 +01:00
Jonathan Kawohl
086bdbec6b remove nextcloud version
removed because nextcloud is developing on their own
2017-03-09 14:58:06 +01:00
Roeland Jago Douma
8f6af9379c Merge pull request #304 from nextcloud/11
Update to 11
2016-11-15 22:31:46 +01:00
Morris Jobke
848b0014f2
Update to 11
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-15 21:52:18 +01:00
blizzz
7910aef7c3 Merge pull request #290 from owncloud/fix-289
avoid 500 when accessing bookmarks while being logged out, fixes #289
2016-09-25 21:08:32 +02:00
Arthur Schiwon
b7d9150c3a
avoid 500 when accessing bookmarks while being logged out, fixes #289
use correct var
2016-09-25 20:55:17 +02:00
blizzz
fad7c62111 Merge pull request #291 from owncloud/travis-reduce-php-5.5
master of Nc and oC does not support PHP 5.5 anymore
2016-09-25 20:52:21 +02:00
Arthur Schiwon
cee2c45770
master of Nc and oC does not support PHP 5.5 anymore 2016-09-25 20:38:03 +02:00
blizzz
9d566f80e9 Merge pull request #288 from owncloud/remove_standalone_info
remove deprecated standalone element
2016-08-29 11:55:41 +02:00
Arthur Schiwon
623b9982d0
remove deprecated standalone element 2016-08-29 10:58:58 +02:00
blizzz
8a04a7bbff Merge pull request #287 from owncloud/fix-warning
fix undefined offset warning
2016-08-27 01:28:41 +02:00
Arthur Schiwon
90a0b39e11
fix undefined offset warning 2016-08-27 00:50:07 +02:00
blizzz
87680b01fc Merge pull request #254 from owncloud/universal-build
master branch to be now release branch for any Nc/OC version starting 9.0
2016-08-26 23:21:47 +02:00
blizzz
850d62fb4c Merge pull request #285 from owncloud/port-284
[master] accept pages that return 401-403, show error message on other error c…
2016-08-26 16:47:36 +02:00
Arthur Schiwon
b11076608f
Master tests starting stable9 branch
try out a universal test

second shot

trying nc and oc, throw away php 5.4 and server versions below 9.0

all env information in one line, otherwise to many useless builds are composed

drop some cases, fix typo

fix url, further reduce number of tests scenarios

url fix, and further reduce tests scenarios

moar fixes

test against the desired server branch

attempt to reduce more test scenarios

more url fixes

fix branch, excludes did not work

adjust version info
2016-08-26 16:45:30 +02:00
Arthur Schiwon
32b2bae6ef
accept pages that return 401-403, show error message on other error codes 2016-08-26 12:37:43 +02:00
Jan-Christoph Borchardt
40f5f9836d Merge pull request #281 from owncloud/fix-svg-viewbox
Fix viewBox of SVG to allow proper scaling in Firefox
2016-08-20 23:33:21 +02:00
Morris Jobke
8a9d96bc73 Fix viewBox of SVG to allow proper scaling in Firefox 2016-08-19 17:12:29 +02:00
blizzz
8fcf165ed7 Merge pull request #261 from TtuxX/master
Restore broken tag selection functionality
2016-08-07 22:42:51 +02:00
blizzz
1c7a831a3c Merge pull request #266 from owncloud/fix-title-length
increase title size to 4096, and cut title and description before wri…
2016-08-07 11:52:43 +02:00
blizzz
2f651b6a9d Merge pull request #267 from owncloud/cleanup-controllers
Cleanup controllers
2016-08-06 11:47:11 +02:00
Arthur Schiwon
07a05d4472
fix and add phpdoc 2016-08-06 11:36:20 +02:00
Arthur Schiwon
fbf50e85a9
increase title size to 4096, and cut title and description before writing to DB 2016-08-06 01:10:10 +02:00
Jenkins for ownCloud
2c06515017 [tx-robot] updated from transifex 2016-08-03 20:11:27 -04:00
Jenkins for ownCloud
f6099ebfd4 [tx-robot] updated from transifex 2016-08-02 20:12:50 -04:00
Jenkins for ownCloud
7b184947d4 [tx-robot] updated from transifex 2016-08-01 20:12:53 -04:00
blizzz
1b93f9fe2d Merge pull request #265 from owncloud/some_cleanup
Some cleanup
2016-07-31 23:29:52 +02:00
blizzz
9b214e5753 Merge pull request #264 from owncloud/fix-overwrite-on-import
Fix overwrite of bookmarks when importing links without URL
2016-07-31 23:23:54 +02:00
Arthur Schiwon
f8ad93e23a
fix phpdoc, resolve a dependency 2016-07-31 21:14:04 +02:00
Arthur Schiwon
ba3d2aeeaf
substitute OCP\User::getUser, formatting 2016-07-31 20:26:15 +02:00
Arthur Schiwon
42ed81097a
fix/add php doc 2016-07-31 20:13:21 +02:00
blizzz
c419da84b4 Merge pull request #263 from owncloud/bump-max-version-req
bump max Nc/OC version
2016-07-30 01:47:28 +02:00
Arthur Schiwon
c28a41a239
Fix overwrite of bookmarks when importing links without URL 2016-07-30 01:46:30 +02:00
Arthur Schiwon
39aa2035a4
bump max Nc/OC version 2016-07-30 01:44:03 +02:00
Jenkins for ownCloud
e54865000a [tx-robot] updated from transifex 2016-07-19 02:10:44 -04:00
Jenkins for ownCloud
1122117c36 [tx-robot] updated from transifex 2016-07-12 02:10:51 -04:00
Tim
b3e0893d1f Update bookmarks.css 2016-07-01 04:35:49 +02:00
Tim
46b177ab5d Tags under filter search bar
Ensure the selected tags appear below the tags filter search bar.
2016-07-01 03:41:39 +02:00
Tim
215f19a1e5 Full width tag filter bar
Ensure the tag filter bar is as large as the one for adding bookmarks
2016-07-01 03:38:16 +02:00
Tim
642df90adb Make tag filter bar visible 2016-07-01 03:36:20 +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
340afcc049 Merge pull request #258 from janklostermann/patch-1
added documentation, category, website, bugs, repository
2016-06-07 10:29:51 +02:00
Jenkins for ownCloud
600a3fa202 [tx-robot] updated from transifex 2016-06-03 02:11:19 -04:00
janklostermann
bbe2fde9a8 added documentation, category, website, bugs, repository 2016-06-02 15:51:54 +02:00
Jenkins for ownCloud
589d260c36 [tx-robot] updated from transifex 2016-06-01 02:11:11 -04:00
blizzz
d4245f425d Merge pull request #246 from owncloud/fix-230
Improve encoding detection
2016-04-25 00:59:33 +02:00
Arthur Schiwon
3428c3638a
adjust unit test 2016-04-24 22:09:35 +02:00