Commit Graph

428 Commits

Author SHA1 Message Date
Arthur Schiwon 8d9f485b35
when writing a comment, render mentions as they'd appear anywhere
i.e. avatar with displaymenu and contactsmenu-popover

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:33 +02:00
Arthur Schiwon ec5607544c
turn textarea to contenteditable div
we will need it for nice formatting of the mentioned user

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:33 +02:00
Arthur Schiwon d1afbedc5f
setup atwho autocomplete
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:33 +02:00
Arthur Schiwon 8e60a2bd28
add At.js and dependencies
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:33 +02:00
Arthur Schiwon 04fafdd505
fix class name in info.xml
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:13:37 +02:00
Arthur Schiwon 8722458d2a
ensure that sorting is stable
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:13:37 +02:00
Arthur Schiwon fd6daf8d19
AutoCompletion backend
* introduce a Controller for requests
* introduce result sorting mechanism
* extend Comments to retrieve commentors (actors) in a tree
* add commenters sorter
* add share recipients sorter

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:13:32 +02:00
Nextcloud bot 436daf92e5
[tx-robot] updated from transifex 2017-10-07 00:08:31 +00:00
Nextcloud bot 3d981c0d40
[tx-robot] updated from transifex 2017-10-04 00:08:27 +00:00
Nextcloud bot 8be053516b
[tx-robot] updated from transifex 2017-09-30 00:08:25 +00:00
Nextcloud bot e5d39e63d1
[tx-robot] updated from transifex 2017-09-28 00:08:36 +00:00
Joas Schilling 10c7ecb5e9
Use the wrapper to get the parameters which was added in #6369
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-19 15:01:43 +02:00
Nextcloud bot 5ce3c7003b
[tx-robot] updated from transifex 2017-09-13 00:08:12 +00:00
Joas Schilling 521ede8f5f
Allow translations of the comments activity in the emails too
Message and object data is not available on emails atm,
so we can not use them either...

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-05 18:10:32 +02:00
Nextcloud bot 7b8bd8188e
[tx-robot] updated from transifex 2017-08-25 00:08:59 +00:00
Nextcloud bot 6b978ebd29
[tx-robot] updated from transifex 2017-08-19 00:08:26 +00:00
Nextcloud bot c9612b9324
[tx-robot] updated from transifex 2017-08-11 00:08:20 +00:00
Nextcloud bot 8549fcf6e4
[tx-robot] updated from transifex 2017-08-09 00:08:20 +00:00
Roeland Jago Douma 201bbb962c
Fix Comments
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:16 +02:00
Nextcloud bot d95b46ffb7
[tx-robot] updated from transifex 2017-07-24 00:08:01 +00:00
Nextcloud bot ce7c62d9bb
[tx-robot] updated from transifex 2017-07-22 00:08:07 +00:00
Nextcloud bot 125767265d
[tx-robot] updated from transifex 2017-07-17 00:08:02 +00:00
Nextcloud bot a23cdd04bb
[tx-robot] updated from transifex 2017-07-15 00:08:54 +00:00
Nextcloud bot 3865c77279
[tx-robot] updated from transifex 2017-07-14 00:08:37 +00:00
Nextcloud bot 261513b04a
[tx-robot] updated from transifex 2017-07-13 00:08:31 +00:00
Nextcloud bot 13295c2d1d
[tx-robot] updated from transifex 2017-07-12 00:08:43 +00:00
Nextcloud bot cf8db31bce
[tx-robot] updated from transifex 2017-07-09 00:08:31 +00:00
Morris Jobke b4deba2078 Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emails
Use PNGs for icons in activity emails
2017-07-07 11:05:00 +02:00
Nextcloud bot 146c699eb4
[tx-robot] updated from transifex 2017-06-21 00:08:15 +00:00
Joas Schilling 90fa27694a
Use PNG version of the icons for shipped activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-20 13:48:51 +02:00
Nextcloud bot 26d6c4a64a
[tx-robot] updated from transifex 2017-06-17 00:08:26 +00:00
Nextcloud bot 74654288e6
[tx-robot] updated from transifex 2017-06-16 00:08:44 +00:00
Nextcloud bot 7a269ae872
[tx-robot] updated from transifex 2017-06-15 00:08:40 +00:00
Nextcloud bot dc61fb999d
[tx-robot] updated from transifex 2017-06-14 00:08:39 +00:00
Nextcloud bot ea64cb0028
[tx-robot] updated from transifex 2017-06-13 00:08:22 +00:00
Nextcloud bot a74901fce1
[tx-robot] updated from transifex 2017-06-08 00:08:26 +00:00
Nextcloud bot bb884c341f
[tx-robot] updated from transifex 2017-06-06 00:08:45 +00:00
Nextcloud bot 8801b68d45
[tx-robot] updated from transifex 2017-06-01 00:08:38 +00:00
Nextcloud bot b9b7f8bede
[tx-robot] updated from transifex 2017-05-30 00:08:44 +00:00
Nextcloud bot 4be17dff0f
[tx-robot] updated from transifex 2017-05-29 00:08:33 +00:00
Nextcloud bot 6cc26efbc5
[tx-robot] updated from transifex 2017-05-24 00:08:22 +00:00
Nextcloud bot 9c8a838624
[tx-robot] updated from transifex 2017-05-23 00:08:29 +00:00
Joas Schilling 3ec9d91bd0
Split multi-author entries
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:39:49 +02:00
Joas Schilling bc8fbc1a67
Bump app versions as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:35:25 +02:00
Joas Schilling fdfe8f7f15
Adjust version requirement
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:32:05 +02:00
Lukas Reschke 15f7fe022b Merge pull request #4554 from nextcloud/pointer-cursor-on-clickable-user
Make it clear that you can now click on usernames
2017-05-16 16:29:09 +02:00
Nextcloud bot fb78774eb8
[tx-robot] updated from transifex 2017-05-10 00:08:31 +00:00
Daniel Calviño Sánchez 0db3a413b3 Fix mentioned user not clickable after posting or editing a comment
The contactsMenu plugin was called on avatar elements from
_postRenderItem, which is called when a new comment is added to the
collection. Due to this contactsMenu was not called when messages were
edited; when a new comment is posted _postRenderItem is called, but at
that time the "mentions" attribute is not filled yet, so "@username" is
not replaced by avatars in the message and thus contactsMenu has no
avatars to be called on.

Calling contactsMenu was moved to a new method, _postRenderMessage,
which is called from _postRenderItem and from the success callback when
fetching the model in _onSubmitSuccess (which replaces "@username" by
avatars in the message after posting or editing a comment).

Fixes #4555

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-08 22:24:33 +02:00
Daniel Calviño Sánchez 002018d8ad Add missing unit tests for comments with mentions
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-08 21:55:22 +02:00
Nextcloud bot 2152d5f1f6
[tx-robot] updated from transifex 2017-05-01 00:07:32 +00:00
Joas Schilling 5bc593a92c
Make it clear that you can now click on usernames
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-27 15:33:16 +02:00
Georg Ehrke 6d7714f182
fix CommentsTabsView js test
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:15 +02:00
Georg Ehrke 897bd5cfef
add contactsmenu popover to comments
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
Nextcloud bot e5fe41e16b
[tx-robot] updated from transifex 2017-04-26 00:07:43 +00:00
Joas Schilling 5be1010d45
Fix invalid character
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 11:06:27 +02:00
Roeland Jago Douma 4004e39f75
Move systemtags and comments to new accesslist functions
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-20 14:34:28 +02:00
Nextcloud bot adf316c3af
[tx-robot] updated from transifex 2017-04-20 00:07:36 +00:00
Nextcloud bot c40b7acb09
[tx-robot] updated from transifex 2017-04-18 20:47:45 +00:00
Nextcloud bot df2235c71f
[tx-robot] updated from transifex 2017-04-17 00:07:33 +00:00
Nextcloud bot 0f96d5a641
[tx-robot] updated from transifex 2017-04-14 00:07:36 +00:00
Nextcloud bot f984cf0987
[tx-robot] updated from transifex 2017-03-30 00:07:41 +00:00
Nextcloud bot 6309b9ec1d
[tx-robot] updated from transifex 2017-03-28 00:07:53 +00:00
Nextcloud bot d9ebc2626f
[tx-robot] updated from transifex 2017-03-27 00:07:55 +00:00
Nextcloud bot 0981f9a18a
[tx-robot] updated from transifex 2017-03-26 01:07:03 +00:00
Lukas Reschke bdd71b6081
Merge JS for comments
Shaves off 6 requests.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 19:49:43 +01:00
noveens 40228c0c2b
added quit option in commentstabview.js
added quit option in notif in app.js

added quit option in notif in file-upload.js

added quit option in notif in fileinfomodel.js

added quit option in notif in filelist.js

added quit option in notif in filelist.js

added quit option in notif in tagsplugin.js

added quit option in notif in statusmanager.js

added quit option in notif in external.js

added quit option in notif in versionstabview.js

added quit option in notif in notification.js

changes according to the latest review.

timeout removed since there is a button to close it

translation capability added

typo fixed

test files updated

small errors fixed

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 13:12:29 -06:00
Nextcloud bot 9e1e7dac47
[tx-robot] updated from transifex 2017-03-18 01:07:50 +00:00
Nextcloud bot 37fcc41004
[tx-robot] updated from transifex 2017-03-12 01:08:05 +00:00
Joas Schilling d4200a08cc
Get the user folder of the correct user
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-09 21:07:37 +01:00
Nextcloud bot 53195b156c
[tx-robot] updated from transifex 2017-03-02 16:48:52 +00:00
Nextcloud bot aecec74a04
[tx-robot] updated from transifex 2017-03-01 01:07:42 +00:00
Nextcloud bot 556b958af2
[tx-robot] updated from transifex 2017-02-25 01:25:07 +00:00
Nextcloud bot 47c6a8019f
[tx-robot] updated from transifex 2017-02-16 01:07:44 +00:00
Nextcloud bot 41276f720b
[tx-robot] updated from transifex 2017-02-15 01:07:29 +00:00
Morris Jobke c5dffc465c Merge pull request #3472 from nextcloud/enable-avatars-always
Always enable avatars
2017-02-14 09:22:02 -06:00
Nextcloud bot 7113af3f91
[tx-robot] updated from transifex 2017-02-14 01:07:20 +00:00
Morris Jobke 200a28255e
Always enable avatars
* we introduced this setting in the begining because our
  avatar support caused some performance issues, but we
  fixed them and should only provide one way how Nextcloud
  looks

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-13 17:53:33 -06:00
Nextcloud bot 5e4bbb394c
[tx-robot] updated from transifex 2017-02-07 01:08:50 +00:00
Nextcloud bot b946ec9d6c
[tx-robot] updated from transifex 2017-02-02 01:07:05 +00:00
Nextcloud bot 1952560ac7
[tx-robot] updated from transifex 2017-02-01 01:06:57 +00:00
Nextcloud bot 05e3aa491a
[tx-robot] updated from transifex 2017-01-26 01:07:15 +00:00
Nextcloud bot 30e9d67ee9
[tx-robot] updated from transifex 2017-01-24 01:07:14 +00:00
Nextcloud bot d0c6179ec1
[tx-robot] updated from transifex 2017-01-21 01:07:47 +00:00
Nextcloud bot c35ea15916
[tx-robot] updated from transifex 2017-01-11 15:20:22 +00:00
Joas Schilling bb84db02cb
Cleanup comment tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 12:03:34 +01:00
Joas Schilling e675c2a66c
Set the comment link on render instead of creation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 11:18:33 +01:00
Nextcloud bot 4f9ff96f79
[tx-robot] updated from transifex 2017-01-09 08:24:58 +00:00
Nextcloud bot 2e0cf21f7f
[tx-robot] updated from transifex 2017-01-04 12:09:43 +00:00
Nextcloud bot acad4ba93e
[tx-robot] updated from transifex 2017-01-03 01:07:46 +00:00
Roeland Jago Douma fdf10e242d Merge pull request #2850 from nextcloud/downstream-26603
Fixed size issues on main detail view and disappearing of share recipients (#26603)
2017-01-02 21:19:43 +01:00
Nextcloud bot 5c50df72b7
[tx-robot] updated from transifex 2017-01-01 01:07:30 +00:00
Nextcloud bot b399ad2fee
[tx-robot] updated from transifex 2016-12-28 01:07:41 +00:00
Arthur Schiwon 754760fdbe
mention property to follow same style
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-23 17:01:58 +01:00
Michael Jobst 969c19b2e9
Fixed size issues on main detail view and disappearing of share recipients (#26603)
* fixed size issues on main detail view and disappearing of share recipients

* Changes due to code comments

* Moved reloadProperties() to FileInfoModel

* Solved Scrutinizer issues

* Bugfix: undefined value used on error

* check if options are set for FileInfoModel.initialize()

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-23 16:56:55 +01:00
Nextcloud bot fe9a38d5b5
[tx-robot] updated from transifex 2016-12-21 01:07:18 +00:00
Nextcloud bot f50252c7c1
[tx-robot] updated from transifex 2016-12-20 12:02:31 +00:00
Joas Schilling 6de0eb0b74
Remove leading slash from sharing activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-15 15:53:48 +01:00
Joas Schilling edec1fafe7
Update app versions and requirements
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-13 20:41:55 +01:00
Nextcloud bot 0c6c85bafb
[tx-robot] updated from transifex 2016-12-12 01:07:18 +00:00
Nextcloud bot ea7a69f198
[tx-robot] updated from transifex 2016-12-11 01:07:18 +00:00
Nextcloud bot 7cb99e74db
[tx-robot] updated from transifex 2016-12-10 01:07:15 +00:00
Nextcloud bot 2a647f4d3a
[tx-robot] updated from transifex 2016-12-06 01:07:19 +00:00
Nextcloud bot dda39728e3
[tx-robot] updated from transifex 2016-12-05 01:07:41 +00:00
Nextcloud bot 181cf9c7f3
[tx-robot] updated from transifex 2016-12-03 01:07:26 +00:00
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