wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
49737 commits 157 branches 562 tags 714 MiB
Commit graph

597 commits

Author SHA1 Message Date
Roeland Jago Douma
027f69df3f
Merge pull request #13227 from nextcloud/fix-opening-search-results-for-comments 
Fix opening search results for comments
 2018-12-24 14:20:24 +01:00
Nextcloud bot
9d5f7c7f62
[tx-robot] updated from transifex 2018-12-24 01:11:46 +00:00
Daniel Calviño Sánchez
bc74a44cbc Fix opening search results for comments 
"OC.dirname" removes everything after the last "/", so a path without
slashes is returned without changes. "result.path" does not include
leading nor trailing "/", so when the path is for a file or folder in
the base folder "OC.dirname(result.path)" returns "result.path".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-12-21 21:49:10 +01:00
Nextcloud bot
4be6aa5270
[tx-robot] updated from transifex 2018-12-20 01:11:44 +00:00
Nextcloud bot
3068f07ad9
[tx-robot] updated from transifex 2018-12-16 01:12:32 +00:00
Nextcloud bot
7034df7d77
[tx-robot] updated from transifex 2018-12-13 01:11:56 +00:00
Nextcloud bot
386875cabe
[tx-robot] updated from transifex 2018-12-10 01:11:36 +00:00
Nextcloud bot
802a978bb5
[tx-robot] updated from transifex 2018-11-28 01:11:55 +00:00
Joas Schilling
1751c28c28
Bump versions of server and the requirements of apps 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-23 10:28:40 +01:00
Nextcloud bot
d664a9b37b
[tx-robot] updated from transifex 2018-11-23 01:12:51 +00:00
Joas Schilling
aa88254f64
Shorten index name of calendar changes table 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-14 10:14:23 +01:00
Nextcloud bot
fef51895c2
[tx-robot] updated from transifex 2018-11-14 01:12:12 +00:00
Nextcloud bot
da57aaf814
[tx-robot] updated from transifex 2018-11-09 01:12:25 +00:00
Joas Schilling
1b4f1b9a63
Populate the mention-notification with the actual message 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-08 12:10:09 +01:00
Joas Schilling
375589b274
Fix the comments UI and activities for space-mentions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-07 12:33:44 +01:00
Nextcloud bot
54a30a4b81
[tx-robot] updated from transifex 2018-11-06 01:12:39 +00:00
Nextcloud bot
9d7f02ec47
[tx-robot] updated from transifex 2018-11-04 01:14:02 +00:00
Arthur Schiwon
0d1370f2f6
Revert "Populate the mention-notification with the actual message" 
This reverts commit d295ff5367.
 2018-10-31 16:16:51 +01:00
Joas Schilling
d295ff5367
Populate the mention-notification with the actual message 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-10-30 13:29:58 +01:00
Nextcloud bot
0092e3adec
[tx-robot] updated from transifex 2018-10-27 00:12:35 +00:00
Julius Härtl
d14434fa2e
Adjust some jsdocs 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-24 16:24:16 +02:00
Nextcloud bot
a9fb21f9fc
[tx-robot] updated from transifex 2018-10-23 14:54:28 +00:00
Roeland Jago Douma
97717ae3a7
Merge pull request #11905 from nextcloud/design/noid/tab-icons 
Add icon to file sidebar tabs
 2018-10-19 16:53:56 +02:00
Morris Jobke
1b44bdfb58
Add .l10nignore files for compiled assets 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-10-19 10:29:36 +02:00
Julius Härtl
45804b5bef
Add icon to file sidebar tabs 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-18 15:54:17 +02:00
Roeland Jago Douma
e7443ee892
Move more comments to compiled handlebars 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-15 19:52:22 +02:00
Nextcloud bot
d9fe68ed12
[tx-robot] updated from transifex 2018-10-05 00:12:56 +00:00
Roeland Jago Douma
363ec1d3c3
Remove leftover ' 
Followup to #11583

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-04 16:02:09 +02:00
Roeland Jago Douma
d281f2625d
Move Comments to compiled handlebars 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-04 09:53:44 +02:00
Joas Schilling
e375107aa4
Redirect guests to login if they follow the link of a comment mention-notification 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-10-02 08:40:34 +02:00
Nextcloud bot
bdb01064e2
[tx-robot] updated from transifex 2018-09-25 00:12:07 +00:00
Nextcloud bot
cce9f25d86
[tx-robot] updated from transifex 2018-09-23 00:12:30 +00:00
Nextcloud bot
bd89af478e
[tx-robot] updated from transifex 2018-09-22 00:12:06 +00:00
blizzz
7f6d42c263
Merge pull request #11258 from nextcloud/fix-contacts-menu-on-mentions 
Fix contacts menu on mentions
 2018-09-18 11:42:26 +02:00
blizzz
7ab19366dc
Merge pull request #11257 from nextcloud/prevent-comment-being-composed-from-overlapping-the-submit-button 
Prevent comment being composed from overlapping the submit button
 2018-09-18 11:40:53 +02:00
Daniel Calviño Sánchez
9cb8b51d42 Fix position of contacts menu shown on mentions 
There are no default CSS rules for the contacts menu, as its position
depends on the element on which it is shown. Note, however, that if no
explicit rules are provided the contacts menu on mentions is affected by
the rules for the contacts menu on shares from the sharing tab.

The contacts menu is now positioned to show the tip of the arrow
horizontally aligned with the center of the avatar, and with the top of
the menu slightly below the bottom border of the mention.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-09-15 19:53:06 +02:00
Daniel Calviño Sánchez
527d237289 Fix contacts menu not triggered on certain areas of a mention 
The contacts menu was triggered only when the avatar or the name of the
user were clicked. Due to this, clicking on certain (small) areas of a
mention (like the right end, or the space between the avatar and the
name) did not show the contacts menu. Now the contacts menu is shown
when any area of the mention is clicked.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-09-15 18:42:52 +02:00
Nextcloud bot
6112adfe06
[tx-robot] updated from transifex 2018-09-14 00:12:27 +00:00
Nextcloud bot
10351cb9da
[tx-robot] updated from transifex 2018-09-13 00:12:08 +00:00
Nextcloud bot
e9c644412c
[tx-robot] updated from transifex 2018-09-10 00:13:36 +00:00
Daniel Calviño Sánchez
c65042099f Prevent comment being composed from overlapping the submit button 
The submit button is placed in the text area using absolute positioning,
so it is not taken into account when calculating the text layout. Due to
this it is necessary to add an explicit padding to the right of the text
area to prevent the text from overlapping the submit button.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-09-06 18:10:18 +02:00
Roeland Jago Douma
0899f2cbc4
Merge pull request #11064 from nextcloud/fix-markup-and-style-of-mentions-in-comments 
Fix markup and style of mentions in comments
 2018-09-05 20:49:11 +02:00
Daniel Calviño Sánchez
bd75366016 Add new line at the end of file 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-09-05 18:35:38 +02:00
Daniel Calviño Sánchez
92bf1cec44 Ensure that the avatar and the user name will be kept together 
Otherwise a line break could be added between the avatar and the user
name when the wrapper is close to the right border of the message.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-09-05 18:35:38 +02:00
Daniel Calviño Sánchez
45cde96d83 Remove unneeded CSS rule for mentions 
Most of the properties of the rule are not needed for mentions, so the
rule is no longer applied to them; the only needed property was moved to
the main rule for mentions.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-09-05 18:35:37 +02:00
Daniel Calviño Sánchez
99989b37ff Fix pointer cursor not shown on avatars 
When the cursor is on an avatar wrapper the cursor is shown as a pointer
to inform the user that it can be clicked (which will either show the
contacts menu or insert a mention, depending on the case); the cursor
must be explicitly defined for the "img" element that shows the avatar
too, or otherwise the default cursor would be shown.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-09-05 18:35:37 +02:00
Daniel Calviño Sánchez
83bf3095cf Highlight mentions to the current user 
Like done in Talk, mentions to the current user are now shown with the
primary colors to make them more prominent.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-09-05 18:35:37 +02:00
Daniel Calviño Sánchez
be5a1faf70 Ensure that the user name is shown in bold in mentions 
Different browsers use different font weights for strong elements
(Chromium uses "bold", but Firefox uses "bolder", which is relative to
the font weight of the parent), so now the user name in mentions is
explicitly shown with a bold weight.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-09-05 18:35:37 +02:00
Daniel Calviño Sánchez
63ab5d919e Reformat embedded HTML code to resemble HTML code 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-09-05 18:35:37 +02:00
Daniel Calviño Sánchez
db1fce6a59 Remove space between avatar and user name 
The avatar should be shown immediately after the avatar to be able to
accurately define the space between them using only CSS rules.

Note that in the case of the "atwho" menu it is not really needed, as a
whitespace removal seems to be done automatically by the plugin, but it
was modified for its displayed elements too for consistency.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-09-05 18:35:37 +02:00
Daniel Calviño Sánchez
c9ce96ff05 Show avatar using "span" instead of "div" 
Visually it makes no difference, but as the ".avatar" element is inside
a "span" element it can not be a block element to be compliant with the
HTML specification.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-09-05 18:33:10 +02:00
Joas Schilling
47cc5e5895
Update version requirements and versions of shipped apps 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-09-05 14:27:06 +02:00
Nextcloud bot
021dad53be
[tx-robot] updated from transifex 2018-09-01 00:12:17 +00:00
Morris Jobke
ab9672a32f
Merge pull request #10913 from nextcloud/do-not-parse-html-in-user-id-and-display-name 
Do not parse HTML in user id and display name
 2018-08-30 20:52:20 +02:00
Nextcloud bot
4da9a15b32
[tx-robot] updated from transifex 2018-08-30 00:12:07 +00:00
Nextcloud bot
27141a960f
[tx-robot] updated from transifex 2018-08-29 00:12:07 +00:00
Joas Schilling
5ba881ba41 Do not parse HTML in user id and display name 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-08-28 18:57:07 +02:00
Nextcloud bot
8b47f45afa
[tx-robot] updated from transifex 2018-08-27 00:12:14 +00:00
Julius Härtl
e312766783
Fix contactsmenu for mentioned users in comments 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-25 18:25:47 +02:00
Nextcloud bot
d644cafae7
[tx-robot] updated from transifex 2018-08-25 00:12:33 +00:00
Nextcloud bot
503fbc953e
[tx-robot] updated from transifex 2018-08-24 00:12:20 +00:00
Nextcloud bot
c0f48a7b40
[tx-robot] updated from transifex 2018-08-23 00:12:59 +00:00
Nextcloud bot
ccb040ee01
[tx-robot] updated from transifex 2018-08-13 00:12:09 +00:00
Roeland Jago Douma
90a656305b
Bump autoloaders 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-10 15:03:22 +02:00
Nextcloud bot
1cb8fe3cb0
[tx-robot] updated from transifex 2018-08-08 00:13:19 +00:00
Nextcloud bot
0c7a17795b
[tx-robot] updated from transifex 2018-07-28 00:12:07 +00:00
Nextcloud bot
6ccc34f5af
[tx-robot] updated from transifex 2018-07-27 00:12:20 +00:00
Nextcloud bot
e98f4de66a
[tx-robot] updated from transifex 2018-07-26 00:12:01 +00:00
Morris Jobke
61397ee091
Merge pull request #9222 from nextcloud/feature/noid/search-for-files-by-comments 
Allow to search files by comments
 2018-07-25 20:30:00 +02:00
Morris Jobke
2dd55b0550
Brighter comments icon 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-25 20:28:49 +02:00
Joas Schilling
ac2314e3d0 Add pagination support 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-25 18:53:45 +02:00
Joas Schilling
8c7969e730 Allow to search by comments 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-25 18:53:44 +02:00
Julius Härtl
6d29b36200
Limit small avatar rendering only to inline mentions 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-25 14:26:04 +02:00
Joas Schilling
80207d72fa Correctly register everything via the Application class 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-25 10:26:06 +02:00
John Molakvoæ (skjnldsv)
52af49ead5
Fixed comments design 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-24 12:34:03 +02:00
John Molakvoæ (skjnldsv)
b7317a35e7
Focus the comment input on tab select/loading 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-24 12:34:02 +02:00
Nextcloud bot
241e5705cb
[tx-robot] updated from transifex 2018-07-24 00:12:01 +00:00
Morris Jobke
9732712dda
Merge pull request #10286 from nextcloud/bugfix/noid/comments-layout 
Fix comment input overlay on empty discussion
 2018-07-19 10:36:25 +02:00
Julius Härtl
9771b70c8f
Fix inline avatar display for mentions in comments 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-18 20:28:02 +02:00
Julius Härtl
750b204ac7
Fix comment input overlay on empty discussion 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-18 19:52:16 +02:00
Nextcloud bot
a22bc0e787
[tx-robot] updated from transifex 2018-07-10 08:21:14 +00:00
Nextcloud bot
a6666071be
[tx-robot] updated from transifex 2018-06-27 00:11:52 +00:00
Nextcloud bot
e4551106f5
[tx-robot] updated from transifex 2018-06-22 00:12:11 +00:00
Nextcloud bot
f9c98d8621
[tx-robot] updated from transifex 2018-06-21 00:12:47 +00:00
John Molakvoæ (skjnldsv)
26918e4103
Various apps scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-20 19:20:51 +02:00
Nextcloud bot
5e5671983c
[tx-robot] updated from transifex 2018-06-17 00:12:48 +00:00
Nextcloud bot
d91bed9490
[tx-robot] updated from transifex 2018-06-12 00:12:46 +00:00
Nextcloud bot
ae3bdb4fb9
[tx-robot] updated from transifex 2018-06-09 00:13:06 +00:00
Nextcloud bot
bba1663350
[tx-robot] updated from transifex 2018-06-06 00:12:36 +00:00
Nextcloud bot
36d74047f7
[tx-robot] updated from transifex 2018-06-03 00:12:47 +00:00
Nextcloud bot
d3fceb9b83
[tx-robot] updated from transifex 2018-06-01 00:12:28 +00:00
Nextcloud bot
9ac36dc30b
[tx-robot] updated from transifex 2018-05-31 00:12:36 +00:00
Nextcloud bot
7df563ee39
[tx-robot] updated from transifex 2018-05-30 00:12:08 +00:00
Nextcloud bot
2b2bbe359e
[tx-robot] updated from transifex 2018-05-28 00:12:45 +00:00
Nextcloud bot
9e00b51c87
[tx-robot] updated from transifex 2018-05-27 00:13:07 +00:00
Nextcloud bot
f0fdac8078
[tx-robot] updated from transifex 2018-05-26 00:13:01 +00:00
Nextcloud bot
60734cd79d
[tx-robot] updated from transifex 2018-05-25 00:14:54 +00:00
Nextcloud bot
4bbad8f88a
[tx-robot] updated from transifex 2018-05-23 00:15:44 +00:00
Nextcloud bot
0d90c5ebc4
[tx-robot] updated from transifex 2018-05-22 00:13:31 +00:00
Nextcloud bot
514b374923
[tx-robot] updated from transifex 2018-05-18 00:13:45 +00:00