Commit graph

295 commits

Author SHA1 Message Date
Morris Jobke
48ce0ef19c Merge pull request #1926 from nextcloud/fix-comment-mentions-in-activities
Fix comment mentions in activities
2016-10-28 22:47:15 +02:00
Joas Schilling
286482656b
Fix comment mentions in activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-28 12:32:10 +02:00
Nextcloud bot
ad597d498d
[tx-robot] updated from transifex 2016-10-28 00:07:11 +00:00
Morris Jobke
cde7f535bd Merge pull request #1738 from nextcloud/comments-provide-displaynames-with-mentions
comment mentions: show displayname not uid
2016-10-26 14:02:49 +02:00
Arthur Schiwon
b12b52b73b
fix JS test and introduce tests for rendering mentions to displaynames
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-25 18:33:59 +02:00
Nextcloud bot
e23a298a81
[tx-robot] updated from transifex 2016-10-25 09:36:09 +00:00
Arthur Schiwon
ab3954745c
avoid that all avatars are copied to the author row when editing comments
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-21 22:57:06 +02:00
Arthur Schiwon
763a99ec30
consolidate error handling
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-19 13:56:49 +02:00
Arthur Schiwon
bc18a2900e
fix avatar displaying after submit (either edit or new)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-19 12:47:53 +02:00
Arthur Schiwon
185433967e
display avatar (if enabled) alongside displaynames
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-19 00:34:00 +02:00
Arthur Schiwon
70bd6cafd4
fix regex
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-19 00:34:00 +02:00
Arthur Schiwon
b21ce6ee5e
improve regex, fixes replacements of usernames with same trunk
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-19 00:34:00 +02:00
Arthur Schiwon
0e926efc9b
show displayname not uid in commit mentions
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-19 00:34:00 +02:00
Arthur Schiwon
5d98ab83e9
resolve displayname via manager and registerable resolvers
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-19 00:34:00 +02:00
Arthur Schiwon
fea3e20a80
move mention extraction to (I)Comment and report mentions via DAV
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-19 00:33:55 +02:00
Nextcloud bot
943d9737e4
[tx-robot] updated from transifex 2016-10-18 00:06:51 +00:00
Morris Jobke
96f8f209b9 Merge pull request #1449 from nextcloud/comments-user-mention
Notifications for simple @-mentioning in comments
2016-10-17 09:30:47 +02:00
Arthur Schiwon
70c7781aa8
apply some polish
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-14 15:36:05 +02:00
Arthur Schiwon
1bcd2ca8e3
emit pre-update event for comments
* notifications can be cleaned up, no polluted DB
* updating comments will re-notify users or remove notifications, depending on the message

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-12 18:06:22 +02:00
Morris Jobke
675230f86d Merge pull request #1407 from nextcloud/multiline_comments
Bring back multiline comments
2016-10-11 16:17:51 +02:00
skjnldsv
dcddd4b9d5 fix textarea submit 2016-10-11 12:33:20 +02:00
Nextcloud bot
0beecbf2c5
[tx-robot] updated from transifex 2016-10-08 00:06:50 +00:00
Arthur Schiwon
a9671a4dc2
adjust wording of the notification
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-08 01:17:51 +02:00
Arthur Schiwon
a35d4e7b44
remove notifications of deleted comments from the DB
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-08 01:10:49 +02:00
Arthur Schiwon
006da9afd7
use different files route/controller
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-07 17:27:33 +02:00
Arthur Schiwon
e1073cf442
Notificacations for simple @-mentioning in comments
(WIP) notify user when mentioned in comments

Fix doc, and create absolute URL for as notification link.

PSR-4 compatibility changes

also move notification creation to comments app

Do not notify yourself

unit test for controller and application

smaller fixes

- translatable app name
- remove doubles in mention array
- micro perf optimization
- display name: special label for deleted users, keep user id for users that could not be fetched from userManager

Comment Notification-Listener Unit Test

fix email adresses

remove notification when triggering comment was deleted

add and adjust tests

add missing @license tags

simplify NotificationsController registration

appinfo simplification, php docs

make string easier to translate

adjust test

replace dispatcher-based listeners with a registration method and interface

safer to not pass optional data parameter to setSubject for marking as processed. ID and mention suffices

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

update comment

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-07 17:11:19 +02:00
Morris Jobke
fe2116ecf7 Merge pull request #1519 from nextcloud/better-comments-in-activity-sidebar
Better comments in activity sidebar
2016-10-05 23:56:10 +02:00
Joas Schilling
43265befac
Update file header
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-05 14:33:54 +02:00
Vincent Petry
dba72a48cd
Fix activity rendering plugin name
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-05 14:21:26 +02:00
Joas Schilling
ed70d4a2dc
Mark the methods as copied
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-05 14:21:26 +02:00
Joas Schilling
bd0c9489f6
Make sure the CSS rules apply to the activityTabView as well
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-05 14:21:25 +02:00
Joas Schilling
724cd50e52
Register a ActivityTabView plugin
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-05 14:21:25 +02:00
Joas Schilling
fe6c9f7f47
Remove resolved FIXME
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-05 14:21:25 +02:00
Joas Schilling
b8cf2fb58b
Do not shorten comments in the activity sidebar
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-05 14:21:22 +02:00
Joas Schilling
671f16f706
Add icons to activity navigation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-05 11:38:06 +02:00
Roeland Jago Douma
c83b3e6bd5
Fix js test 2016-10-04 13:07:44 +02:00
Roeland Jago Douma
5ca50d9f31
Add autosize to comments input
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-04 13:04:56 +02:00
Nextcloud bot
07a1be2e06
[tx-robot] updated from transifex 2016-10-03 00:12:47 +00:00
Nextcloud bot
6297d201df
[tx-robot] updated from transifex 2016-10-02 00:16:25 +00:00
Nextcloud bot
da03018add
[tx-robot] updated from transifex 2016-10-01 00:08:23 +00:00
Nextcloud bot
99076a8c0d
[tx-robot] updated from transifex 2016-09-30 00:08:13 +00:00
Nextcloud bot
4b873b35b7
[tx-robot] updated from transifex 2016-09-29 00:07:08 +00:00
Lukas Reschke
2eab2ffa22 Merge pull request #1553 from nextcloud/fix-comment-count-translation
Fix comment count tooltip
2016-09-28 23:17:05 +02:00
Joas Schilling
c9c64141ee
Fix comment count tooltip
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-09-28 10:54:37 +02:00
skjnldsv
71830b285c Svgo optimization
Signed-off-by: John Molakvoæ <fremulon@protonmail.com>
2016-09-27 20:56:26 +02:00
Nextcloud bot
810f72df46
[tx-robot] updated from transifex 2016-09-27 00:09:46 +00:00
Nextcloud bot
6a873acf46
[tx-robot] updated from transifex 2016-09-22 00:11:32 +00:00
Nextcloud bot
d24e78d1ff
[tx-robot] updated from transifex 2016-09-21 00:09:40 +00:00
Nextcloud bot
70660d0d6c
[tx-robot] updated from transifex 2016-09-20 00:09:37 +00:00
Nextcloud bot
bcc4b5cd0a
[tx-robot] updated from transifex 2016-09-18 00:09:26 +00:00
Nextcloud bot
4fdee00c27
[tx-robot] updated from transifex 2016-09-15 00:12:37 +00:00
Nextcloud bot
7ffadc7e26
[tx-robot] updated from transifex 2016-09-14 00:10:31 +00:00
Nextcloud bot
f5aafdc897
[tx-robot] updated from transifex 2016-09-09 00:09:31 +00:00
Nextcloud bot
b992bf2142
[tx-robot] updated from transifex 2016-09-08 00:10:21 +00:00
Nextcloud bot
1110ef52ed
[tx-robot] updated from transifex 2016-09-07 00:09:25 +00:00
Nextcloud bot
5d48809609
[tx-robot] updated from transifex 2016-09-06 00:09:18 +00:00
Nextcloud bot
8b484eedf0
[tx-robot] updated from transifex 2016-09-05 00:09:10 +00:00
Nextcloud bot
fc02c4a980
[tx-robot] updated from transifex 2016-09-04 00:09:21 +00:00
Nextcloud bot
e7f618ef14
[tx-robot] updated from transifex 2016-09-03 00:09:24 +00:00
Nextcloud bot
ab876619dc
[tx-robot] updated from transifex 2016-09-02 00:09:11 +00:00
Joas Schilling
80e8d3db35
Use live timestamp on comments tab 2016-09-01 09:02:36 +02:00
Nextcloud bot
4a5cd74fb2
[tx-robot] updated from transifex 2016-09-01 00:09:24 +00:00
Joas Schilling
28792a010c
Prevent parse error on editing an HTML comment 2016-08-29 14:18:34 +02:00
Morris Jobke
6d7c5e2265 Merge pull request #903 from nextcloud/allow-disable-comments
Revert "Always add activities for comments to the stream"
2016-08-18 16:51:42 +02:00
Roeland Jago Douma
71d81eef08 Merge pull request #927 from nextcloud/drop-unneeded-statements
white-space: pre-wrap is supported on all current browsers
2016-08-18 15:09:43 +02:00
Joas Schilling
9f58e62925
Fix double ending quotes 2016-08-18 11:44:03 +02:00
Morris Jobke
436fb00162
white-space: pre-wrap is supported on all current browsers
* Chrome 1, Firefox 3, IE8, Opera 8 and Safari 3
* see https://developer.mozilla.org/en-US/docs/Web/CSS/white-space
2016-08-18 11:18:44 +02:00
Lukas Reschke
5580a77bd7 Merge pull request #714 from nextcloud/comments-layout
fix design details in comments sidebar
2016-08-18 11:04:20 +02:00
Morris Jobke
869c841082
Improve layout of cancel button in the comments sidebar 2016-08-18 09:07:03 +02:00
Morris Jobke
8c960821f1
Fix layout of comments submit button on all screen sizes
* tested in IE10, IE11, Edge, Chrome and Firefox
2016-08-18 08:57:46 +02:00
Roeland Jago Douma
ba4633b165
Add viewBox to app icons
If we don't add a viewbox a lot of browsers will just say NOPE!!! when
we ask them to scale.
2016-08-17 15:23:51 +02:00
Joas Schilling
af46b64ef2
Revert "Always add activities for comments to the stream"
This reverts commit 48c41b888c
2016-08-17 13:30:32 +02:00
Roeland Jago Douma
0d96478758
Fix js unit test 2016-08-17 11:48:26 +02:00
Roeland Jago Douma
252ddcc1a4
Fix edit comment layout 2016-08-17 11:35:18 +02:00
Jan-Christoph Borchardt
efd1cf57da
fix design details in comments sidebar 2016-08-17 11:12:49 +02:00
Nextcloud bot
0cc8b8b244
[tx-robot] updated from transifex 2016-08-17 00:09:19 +00:00
Nextcloud bot
8c424c7971
[tx-robot] updated from transifex 2016-08-16 00:10:47 +00:00
Nextcloud bot
f3124b5052
[tx-robot] updated from transifex 2016-08-15 00:12:16 +00:00
Nextcloud bot
4da01eeef6
[tx-robot] updated from transifex 2016-08-13 00:13:29 +00:00
Joas Schilling
dae6432ae7
Increment the versions and adjust the capitilization 2016-08-08 16:45:40 +02:00
Nextcloud bot
c44c9a55f4
[tx-robot] updated from transifex 2016-08-05 00:10:09 +00:00
Nextcloud bot
258ee140a4
[tx-robot] updated from transifex 2016-08-04 00:11:51 +00:00
Nextcloud bot
0874460e48
[tx-robot] updated from transifex 2016-08-03 00:11:12 +00:00
Nextcloud bot
2565a39361
[tx-robot] updated from transifex 2016-07-30 00:11:16 +00:00
Jan-Christoph Borchardt
b709d59a1e Add app icons for Comments and Tags (#579)
* add icon for Comments app

* add icon for Tags app
2016-07-26 19:42:54 +02:00
Joas Schilling
7400ff05ac
Also increase the min version 2016-07-22 14:46:52 +02:00
Robin Appelman
6062b6365b bumb compatible app versions for core apps 2016-07-22 13:04:23 +02:00
Joas Schilling
03cb588ea9 Merge pull request #500 from nextcloud/bump_version
Bump version
2016-07-22 10:03:42 +02:00
Joas Schilling
813f0a0f40
Fix apps/ 2016-07-21 18:13:57 +02:00
Joas Schilling
86129a8b88
Increase app versions 2016-07-21 15:50:30 +02:00
Nextcloud bot
e29835a702
[tx-robot] updated from transifex 2016-07-12 00:09:34 +00:00
Nextcloud bot
67278d12e1
[tx-robot] updated from transifex 2016-07-11 00:09:22 +00:00
Nextcloud bot
c108d816ac
[tx-robot] updated from transifex 2016-07-09 00:09:16 +00:00
Nextcloud bot
a84250e0af [tx-robot] updated from transifex 2016-07-08 00:09:25 +00:00
Nextcloud bot
4a0efa38c0 [tx-robot] updated from transifex 2016-07-07 08:58:00 +00:00
Nextcloud bot
da2363a1dd [tx-robot] updated from transifex 2016-07-06 13:28:06 +00:00
Jenkins for ownCloud
2d2d2267f7 [tx-robot] updated from transifex 2016-07-01 01:57:04 -04:00
Jenkins for ownCloud
1b9fa4dd5f [tx-robot] updated from transifex 2016-06-30 01:55:56 -04:00
Jenkins for ownCloud
2b0f053126 [tx-robot] updated from transifex 2016-06-29 05:52:18 -04:00
Jenkins for ownCloud
894b7d93f6 [tx-robot] updated from transifex 2016-06-28 01:57:10 -04:00
Jenkins for ownCloud
ee90bef50a [tx-robot] updated from transifex 2016-06-27 01:55:57 -04:00
Jenkins for ownCloud
52eab2a61a [tx-robot] updated from transifex 2016-06-26 01:55:53 -04:00
Jenkins for ownCloud
3d65979f0a [tx-robot] updated from transifex 2016-06-25 01:56:48 -04:00
Vincent Petry
56ad4cdfec
Show error message when posting an invalid comment
When an internal server error occurs while creating or updating a
comment, display a proper error notification in the UI.
2016-06-24 10:17:12 +02:00
Jenkins for ownCloud
b85bcccc09 [tx-robot] updated from transifex 2016-06-22 01:54:55 -04:00
Jenkins for ownCloud
bd13353c4d [tx-robot] updated from transifex 2016-06-20 01:54:50 -04:00
Jenkins for ownCloud
cc532bb14a [tx-robot] updated from transifex 2016-06-17 02:00:01 -04:00
Jenkins for ownCloud
3840466f9a [tx-robot] updated from transifex 2016-06-13 12:21:11 +00:00
Jenkins for ownCloud
e8a66f8e7d [tx-robot] updated from transifex 2016-06-10 05:55:19 +00:00
Jenkins for ownCloud
a9f666f36e [tx-robot] updated from transifex 2016-06-01 01:56:03 -04:00
Jenkins for ownCloud
a95275d27b [tx-robot] updated from transifex 2016-05-27 01:55:35 -04:00
Joas Schilling
c9fda84841
Make the root collection neutral so it does not only work for files 2016-05-23 09:03:48 +02:00
Jenkins for ownCloud
bca7586574 [tx-robot] updated from transifex 2016-05-21 01:55:53 -04:00
Jenkins for ownCloud
7ca5b35379 [tx-robot] updated from transifex 2016-05-19 01:54:58 -04:00
Jenkins for ownCloud
bafa02d312 [tx-robot] updated from transifex 2016-05-16 01:54:58 -04:00
Jenkins for ownCloud
7c28f62e20 [tx-robot] updated from transifex 2016-05-15 01:55:34 -04:00
Jenkins for ownCloud
1fb7be42e5 [tx-robot] updated from transifex 2016-05-10 03:30:51 -04:00
Jenkins for ownCloud
10e0fc0629 [tx-robot] updated from transifex 2016-05-09 02:08:23 -04:00
Jenkins for ownCloud
5d35844aff [tx-robot] updated from transifex 2016-05-08 01:54:53 -04:00
Jenkins for ownCloud
6a95af0a4b [tx-robot] updated from transifex 2016-05-06 01:54:56 -04:00
Jenkins for ownCloud
48be0b781a [tx-robot] updated from transifex 2016-05-05 01:55:08 -04:00
Jenkins for ownCloud
cd7f4ed96f [tx-robot] updated from transifex 2016-05-04 02:11:59 -04:00
Roeland Douma
2e4b41550e Merge pull request #24406 from owncloud/psr4-comments-systemtags-updatenotifications
Move comments, systemtags and updatenotifications to PSR-4
2016-05-04 08:03:11 +02:00
Vincent Chan
5f2a19e965 fixes indentation 2016-05-03 12:29:43 +02:00
Vincent Chan
bc0d136511 adds functionality to submit comments with cmd+Enter 2016-05-03 12:26:05 +02:00
Joas Schilling
9ad4a89816
Move comments, systemtags and updatenotifications to PSR-4 2016-05-03 10:20:59 +02:00
Vincent Chan
7ac1cb68f6 Submit comment on ctrl+Enter
closes #24302
2016-05-02 19:52:13 +02:00
Jenkins for ownCloud
a323111bd1 [tx-robot] updated from transifex 2016-05-02 02:08:49 -04:00
Jenkins for ownCloud
ff8980d59c [tx-robot] updated from transifex 2016-05-01 01:55:00 -04:00
Jenkins for ownCloud
ba0099f73a [tx-robot] updated from transifex 2016-04-28 01:55:14 -04:00
Jenkins for ownCloud
2b67f87ea8 [tx-robot] updated from transifex 2016-04-27 01:55:59 -04:00
Jenkins for ownCloud
14c3491977 [tx-robot] updated from transifex 2016-04-26 04:50:32 -04:00
Jenkins for ownCloud
4dc17e4863 [tx-robot] updated from transifex 2016-04-24 01:55:06 -04:00
Jenkins for ownCloud
afce892e9c [tx-robot] updated from transifex 2016-04-23 01:56:02 -04:00
Jenkins for ownCloud
ded84bf571 [tx-robot] updated from transifex 2016-04-22 01:54:58 -04:00
Jenkins for ownCloud
02ecd040e6 [tx-robot] updated from transifex 2016-04-21 01:58:49 -04:00
Joas Schilling
48c41b888c
Always add activities for comments to the stream 2016-04-11 14:57:51 +02:00
Jenkins for ownCloud
e68c4b1d73 [tx-robot] updated from transifex 2016-04-09 12:28:39 -04:00
Jenkins for ownCloud
1576a9a10b [tx-robot] updated from transifex 2016-04-07 01:56:01 -04:00
Jenkins for ownCloud
fb8c8ef38b [tx-robot] updated from transifex 2016-04-06 01:56:24 -04:00
Jenkins for ownCloud
deca08a683 [tx-robot] updated from transifex 2016-04-02 01:55:25 -04:00
Jenkins for ownCloud
82da373ee7 [tx-robot] updated from transifex 2016-03-31 01:55:24 -04:00
Jenkins for ownCloud
fc708c1e04 [tx-robot] updated from transifex 2016-03-30 01:57:41 -04:00
Jenkins for ownCloud
dd5bbc31f2 [tx-robot] updated from transifex 2016-03-29 01:55:16 -04:00
Jenkins for ownCloud
a092fe3bf8 [tx-robot] updated from transifex 2016-03-28 01:55:08 -04:00
Jenkins for ownCloud
1079554284 [tx-robot] updated from transifex 2016-03-27 01:55:45 -04:00
Jenkins for ownCloud
3e33b686b1 [tx-robot] updated from transifex 2016-03-26 01:55:15 -04:00
Jenkins for ownCloud
ae97b8e1c2 [tx-robot] updated from transifex 2016-03-25 01:55:47 -04:00
Jenkins for ownCloud
4b3af9dfe7 [tx-robot] updated from transifex 2016-03-24 01:57:28 -04:00
Joas Schilling
b2f4e4559f Add comment icons and "You commented" translations 2016-03-21 09:41:13 +01:00