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

16026 commits

Author SHA1 Message Date
Roeland Jago Douma
04a5c34cac Merge pull request #4746 from nextcloud/fix-mentioned-user-not-clickable-after-posting-or-editing-a-comment 
Fix mentioned user not clickable after posting or editing a comment
 2017-05-09 14:23:29 +02:00
Roeland Jago Douma
07fe15eea5 Merge pull request #4705 from nextcloud/htaccess-upload 
Proper exception for upload of .htaccess file via WebDAV
 2017-05-09 10:35:38 +02:00
Christoph Wurst
56a9084dd2
Do not list system users in contacts menu if sharing autocompletion is disabled 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-05-09 08:45:36 +02:00
Nextcloud bot
37b847ec48
[tx-robot] updated from transifex 2017-05-09 05:08:07 +00:00
Nextcloud bot
43275b1000
[tx-robot] updated from transifex 2017-05-09 04:32:51 +00:00
Morris Jobke
f8044cbbce Proper exception for upload of .htaccess file via WebDAV 
* fixes #2860

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-08 20:03:41 -05:00
Nextcloud bot
f6a4028fad
[tx-robot] updated from transifex 2017-05-09 00:07:51 +00:00
Nextcloud bot
9d8e9b1efb
[tx-robot] updated from transifex 2017-05-08 20:49:06 +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
Morris Jobke
fe13f214fd Merge pull request #4692 from nextcloud/unify-sharing-messages 
don't mention the owner of a file in case of a re-share by mail.
 2017-05-08 13:32:04 -05:00
Morris Jobke
2d707fdfb5 Merge pull request #4621 from nextcloud/fix_readonly_shared_calendar_proppatch 
fix PROPPATCH requests to read-only shared calendars
 2017-05-08 12:42:30 -05:00
Bjoern Schiessle
adb60ae965
don't mention the owner of a file in case of a re-share by mail. The recipient doesn't care about the owner and probably don't even know it 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-05-08 19:20:31 +02:00
Morris Jobke
df6ce6b385 Merge pull request #4675 from nextcloud/fix_4651 
Create a photo cache to speedup the contactsmenu
 2017-05-08 12:20:27 -05:00
Robin Appelman
36d0c3da69 Merge pull request #4733 from nextcloud/fix-browser-dav-root 
fix error when browsing the dav root
 2017-05-08 18:04:13 +02:00
Lukas Reschke
099234cf12
Add function to request SVG or regular fallback image 
Fixes https://github.com/nextcloud/server/issues/4647

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-08 14:51:55 +02:00
Robin Appelman
9d8936c5bf
fix error when browsing the dav root 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-08 14:34:36 +02:00
Roeland Jago Douma
dea6edb066
Fix init 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 12:40:00 +02:00
Lukas Reschke
278637feb5 Merge pull request #4556 from nextcloud/downstream-ldap-78 
LDAP: only use proxy classes as backend
 2017-05-08 12:29:38 +02:00
Georg Ehrke
255442f281
fix PROPPATCH requests to read-only shared calendars 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-05-08 12:09:15 +02:00
Roeland Jago Douma
92408390b0
Fix ImageExportPluginTest 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 11:20:49 +02:00
Roeland Jago Douma
747990b03a
No more XSS 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 11:20:49 +02:00
Roeland Jago Douma
3ab53d000f
Clear cache on vcard change/delete 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 11:20:49 +02:00
Roeland Jago Douma
34d97aa51c
Request proper size for contacts menu 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 11:20:49 +02:00
Roeland Jago Douma
dd430c2fd7
Cache the carddav photo endpoint 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 11:20:49 +02:00
Roeland Jago Douma
303c0dd6a8
Always dispatch Carddav events 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 11:20:47 +02:00
Julius Härtl
2801f5139b
Adjust login button color and remove border 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-08 10:16:30 +02:00
Julius Härtl
510f7cf1b6
Fix tests for theming backgroundColor 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-08 10:16:30 +02:00
Julius Haertl
4199a56912
Theming app: Add plain background color option 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-05-08 10:16:29 +02:00
Jan-Christoph Borchardt
010b9c4609 Fix name of external storages 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-05-08 00:33:45 -05:00
Nextcloud bot
6109afc14d
[tx-robot] updated from transifex 2017-05-08 00:07:37 +00:00
Nextcloud bot
56bb8745df
[tx-robot] updated from transifex 2017-05-07 00:07:31 +00:00
Nextcloud bot
59ee22101f
[tx-robot] updated from transifex 2017-05-06 00:07:33 +00:00
Roeland Jago Douma
57275e9944 Merge pull request #4701 from nextcloud/enforce-type 
Enforce type hints in dav app
 2017-05-05 15:33:35 +02:00
Morris Jobke
ac04fb8277 Fix invalid theming URLs 
* logo and background image had the cache buster applied twice:
  background-image: url(http://192.168.99.100/server/core/img/logo.svg?v=0?v=0);

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-05 00:37:32 -03:00
Nextcloud bot
619d09529c
[tx-robot] updated from transifex 2017-05-05 00:07:28 +00:00
Morris Jobke
49e958fa12 Enforce type hints in dav app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-04 19:32:22 -03:00
Roeland Jago Douma
b66dfa909b Merge pull request #4693 from nextcloud/fix_4644 
Do not reload the filelist on first open
 2017-05-04 14:37:45 +02:00
Roeland Jago Douma
8d66e325a9
Do not reload the filelist on first open 
Fixes: #4644

Without this patch the filelist would always reload. However since not
all the correct data was set yet it would often:

1. fireoff a propfind to ../webdav/
2. fireoff a propfind to ../webdav/<PATH>

When just opening the file list those are the same so the result is just
fine. However if opening a direct link it means that there is a race
condition on which finishes first.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-04 13:29:49 +02:00
Bjoern Schiessle
c053a275d7
check password for mail shares as well 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-05-04 11:20:20 +02:00
Nextcloud bot
806aeae71d
[tx-robot] updated from transifex 2017-05-04 00:07:29 +00:00
Nextcloud bot
3dbf30c220
[tx-robot] updated from transifex 2017-05-03 00:07:31 +00:00
blizzz
4e4bc17ff5 Merge pull request #4545 from individual-it/access-control-3726 
show error message when "files-drop" upload fails
 2017-05-03 00:21:40 +02:00
Roeland Jago Douma
24ff230f93 Merge pull request #4620 from nextcloud/preview-error-handling 
better handling of preview generation errors
 2017-05-02 21:49:14 +02:00
Lukas Reschke
68a1902586 Merge pull request #4636 from nextcloud/jquery-migrate-browser 
Remove dependency on jquery-migrate.js for browser detection
 2017-05-02 17:01:27 +02:00
Lukas Reschke
db337b4285 Merge pull request #4660 from nextcloud/fix/hide-2fa-backup-codes 
Hide 2FA backup codes if no other 2FA providers are enabled
 2017-05-02 16:08:11 +02:00
Christoph Wurst
d8b3fe460e
Hide 2FA backup codes if no other 2FA providers are enabled 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-05-02 14:40:44 +02:00
Morris Jobke
23cc309606
Handle more error cases 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-02 13:43:48 +02:00
Roeland Jago Douma
d25e13ea27
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-02 12:39:37 +02:00
Roeland Jago Douma
59e27f03b6
Add caching to the imageexport plugin 
Since we now heavily use this endpoint for the contacts menu we better
set proper caching on the images. Else this gets reload over and over
again leading to slow loading menu and unneded bytes transfered.

* cache for 1 hour by default
* added ETag for validation

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-02 12:30:34 +02:00