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

1152 Commits

Author SHA1 Message Date
Arthur Schiwon
f27723369f js cleanup: refactor addBookmark functionality 2015-12-22 23:21:53 +01:00
Arthur Schiwon
b58c90249b js cleanup: remove settings related code from bookmarks.js 2015-12-22 13:14:15 +01:00
Arthur Schiwon
0adbc2b1cf js cleanup: initialize stuff in new OCA.Bookmarks.App, replace first init runs and functions in bookmarks.js 2015-12-22 01:48:45 +01:00
Arthur Schiwon
1f8ee4d068 move related tags getter to tags controller 2015-12-20 22:01:39 +01:00
Arthur Schiwon
4ecd7885ea introduce clean javascript, preperations 2015-12-20 22:00:17 +01:00
Arthur Schiwon
fc5291d3e7 sidebar with tags 2015-12-18 00:24:59 +01: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
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 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