Commit Graph

224 Commits

Author SHA1 Message Date
Joas Schilling b2f46bfa04
Adjust all implementations in the server repo
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-01 11:35:23 +01:00
Nextcloud bot 4ca7f9c896
[tx-robot] updated from transifex 2016-12-01 01:07:17 +00:00
Nextcloud bot f075c22c72
[tx-robot] updated from transifex 2016-11-30 14:18:08 +00:00
Nextcloud bot 41dcceeb35
[tx-robot] updated from transifex 2016-11-30 01:07:16 +00:00
Nextcloud bot 0fb912e724
[tx-robot] updated from transifex 2016-11-29 17:57:47 +00:00
Nextcloud bot a84dacc16f
[tx-robot] updated from transifex 2016-11-29 17:03:24 +00:00
Nextcloud bot e8ea9a5d27
[tx-robot] updated from transifex 2016-11-29 01:06:47 +00:00
blizzz cd9d1f589f Merge pull request #2237 from nextcloud/rich-strings-and-icons-for-mention-notifications
Rich strings and icons for mention notifications
2016-11-28 18:13:54 +01:00
Nextcloud bot 4e682d4113
[tx-robot] updated from transifex 2016-11-28 01:06:56 +00:00
Nextcloud bot 9788cf04ee
[tx-robot] updated from transifex 2016-11-27 01:07:08 +00:00
Nextcloud bot 8f4ec8583d
[tx-robot] updated from transifex 2016-11-26 01:06:57 +00:00
Joas Schilling d2489ebee4
Adjust tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 11:31:35 +01:00
Joas Schilling bfecdd4422
Use the comment icon for the notifications
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 11:19:44 +01:00
Joas Schilling 56cfd0a6e4
Set the rich object string for comment notifications
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 11:19:41 +01:00
Morris Jobke a02d0975dd Merge pull request #2154 from nextcloud/comments-activities-update
Move comments activities to the new API
2016-11-22 09:56:22 +01:00
Nextcloud bot 97af4f762d
[tx-robot] updated from transifex 2016-11-20 01:06:44 +00:00
Joas Schilling 041dd937cf
Update test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 16:51:50 +01:00
Joas Schilling cf205fcaa5
Use the display name for users
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 12:20:04 +01:00
Joas Schilling 8105ba9929
Move comments activities to the new API
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 12:20:03 +01:00
Lukas Reschke bc1008ac38
Use 11.0 instead 9.2
As discussed we're changing the version from 9.2 to 11.0 to make some more sense.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-15 14:45:58 +01:00
Nextcloud bot 8c1cd07de3
[tx-robot] updated from transifex 2016-11-14 01:07:06 +00:00
Nextcloud bot cfda17d8f3
[tx-robot] updated from transifex 2016-11-10 01:07:14 +00:00
Nextcloud bot 8d7df51a0e
[tx-robot] updated from transifex 2016-11-08 01:06:57 +00:00
Nextcloud bot ca3616cb58
[tx-robot] updated from transifex 2016-11-05 01:07:14 +00:00
Nextcloud bot 122fbf0092
[tx-robot] updated from transifex 2016-11-02 01:07:09 +00:00
Nextcloud bot 20f45e6fe4
[tx-robot] updated from transifex 2016-11-01 01:06:57 +00:00
Nextcloud bot 6d2d069c17
[tx-robot] updated from transifex 2016-10-31 01:06:55 +00:00
Nextcloud bot 1187a8c183
[tx-robot] updated from transifex 2016-10-30 00:06:56 +00:00
Nextcloud bot 035890aeb1
[tx-robot] updated from transifex 2016-10-29 00:07:14 +00:00
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