1183 Commits

This Branch

This Branch

All Branches

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
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
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
blizzz	ff6e1f48a4	Merge pull request #245 from owncloud/dont-overrride-title ... Do not override user-provided title when bookmarking via bookmarklet	2016-04-24 21:04:13 +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
blizzz	5535cbbfb5	Merge pull request #240 from owncloud/parse_url-not-filtervar ... use parse_url to verify dn, because filter_var has issues with specia…	2016-04-24 15:44:52 +02:00
Arthur Schiwon	3b3fd65598	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 15:29:15 +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
blizzz	5ee85bb140	Shamelessly copy issue template from core	2016-04-17 22:58:11 +02:00
blizzz	f5f2d665cd	Merge pull request #224 from HuidaeCho/renameTag-sql-bugfix ... renameTag SQL bugfix	2016-04-16 22:42:09 +02:00
blizzz	2228b8f45b	Merge pull request #233 from owncloud/bump-version-0.8 ... Increase max OC version, bump version to 0.8, move version number to …	2016-04-16 22:36:11 +02:00
Arthur Schiwon	de5a1b5305	Increase max OC version, bump version to 0.8, move version number to info.xml	2016-04-16 22:26:08 +02:00
Jenkins for ownCloud	a43fc522d3	[tx-robot] updated from transifex	2016-04-09 02:10:40 -04:00
Jenkins for ownCloud	f1b606aa0a	[tx-robot] updated from transifex	2016-03-28 02:10:22 -04: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
HuidaeCho	bcc9d14a90	renameTag SQL bugfix	2016-01-11 21:55:32 -05: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