8916735dd3
Add missing timeout multiplier
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-22 09:13:47 +01:00
37238725d6
Fix typo in callback name
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-22 08:57:50 +01:00
dc8809e754
Merge pull request #7498 from nextcloud/fix_7497
...
Better handle avatars
2017-12-20 12:38:05 +01:00
0ff3c81fc1
Fix failing AvatarTest
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-12-19 18:49:27 +01:00
325637f4f3
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 18:49:27 +01:00
328047f638
Also do callback on the failing function
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 18:49:26 +01:00
4c3eb80a91
Hide delete button if the avatar is a generated one
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-12-19 18:49:26 +01:00
d497f79625
Fix fallback when image loading fails
...
With the new avatar endpoint there is no difference between unknown
users and errors when generating the placeholder avatar. Therefore the
avatar function will now show the old placeholder if both a user and
displayname was given as parameters.
In case there is no displayname provided we cannot build the proper
placeholder so the unknown user placeholder is shown.
The displayname is not required for the avatar anymore, so we can
get rid of the old code path for placeholders.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 18:49:26 +01:00
6b5e3a9365
Still call callback once avatar is loaded
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 18:49:26 +01:00
a118817a69
Add loading icon on avatar
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-19 18:49:26 +01:00
0f235aec1f
Update avatar on displayname change
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 18:49:26 +01:00
a4ca92f29a
Remove generated avatar on displayname change
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 18:49:26 +01:00
6371b76598
Since we now always generate an avatar do not load the placeholder
...
The js and php code differ ever so slightly. So having the placeholder
for a second and then the image is just weird.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 18:49:25 +01:00
b6fcf59881
Merge pull request #7576 from nextcloud/fix_7574
...
Use javascript to send the actual password reset
2017-12-19 18:05:14 +01:00
cfd116b5f9
Merge pull request #7566 from nextcloud/fix-opening-the-menu-in-a-share-page
...
Fix opening the menu in a share page
2017-12-19 14:41:42 +01:00
cdaf99cf58
Use javascript to send the actual password reset
...
Fixes #7574
During some refactoring the event linked to password reset got removed.
This ment that we just submitted a normal POST but without the CSRF
token. And none of the js magic to redirect afterwards.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 14:00:47 +01:00
e550a3ddd8
Merge pull request #7562 from nextcloud/fix-wrongly-cached-result
...
Cache final result of update check
2017-12-19 10:12:33 +01:00
48b62a0eee
Fix opening the menu in a Share page
...
".popovermenu" elements are visible or not depending on whether they
also have the "open" CSS class or not. "#header .menu" elements were
always hidden, so when both rules applied to the same element, like in
the menu of a Share page, the element was always hidden due to
"#header .menu" being more specific than ".popovermenu" and thus
overriding its rules. Now, "#header .menu" elements are hidden only if
they are not a ".popovermenu" too.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-19 06:58:58 +01:00
2ec181e084
Add acceptance test for opening the menu in a public shared link
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-19 06:55:47 +01:00
b01d20c0d7
Merge pull request #7556 from nextcloud/smb-stat-exception
...
handle exceptions in SMB::stat
2017-12-18 22:31:05 +01:00
e294323df2
Merge pull request #7517 from nextcloud/add-index-to-share-table
...
Add index to share_with column in the share table
2017-12-18 22:23:53 +01:00
a84d11de7b
Merge pull request #7531 from nextcloud/ldap/createdistributed
...
don't use deprecated method for requesting memcache
2017-12-18 22:08:32 +01:00
1beffa058a
Cache final result of update check
...
If the parsed data is not a valid response we should not cache it and only cache the preprocessed result set.
Fixes #7442
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 21:48:58 +01:00
60297ed7e0
Merge pull request #7560 from nextcloud/fix_7309
...
Use injected AppManager
2017-12-18 21:26:22 +01:00
21489d5f24
update autoloader
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-18 21:16:08 +01:00
41ee23a054
make occ command more generic
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-18 21:14:45 +01:00
de98581421
add index for share_with table for newly created tables
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-18 21:14:45 +01:00
fda98ee917
add occ command to add a index to share_with at the share table
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-18 21:14:45 +01:00
4ed12ff9c8
Merge pull request #7561 from nextcloud/fix_7548
...
Let DI handle the background job
2017-12-18 21:12:33 +01:00
094d41937a
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-18 21:06:52 +01:00
d2d73f1ce8
Also replace all other occurences
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 20:57:11 +01:00
5ce943aa85
don't use deprecated method for requesting memcache
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-18 20:57:11 +01:00
0b7136940e
Let DI handle the background job
...
Fixes #7548
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-18 20:42:06 +01:00
d6e74fe375
Use injected AppManager
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-18 20:26:44 +01:00
cb5433062f
Merge pull request #7553 from nextcloud/scssphp-0.7.2
...
Upgrade leafo/scssphp to 0.7.2
2017-12-18 19:37:26 +01:00
3fa13b48fc
handle exceptions in SMB::stat
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-18 15:55:46 +01:00
913cb2b9c6
Merge pull request #7554 from nextcloud/fix-7546
...
Fix default parameter of OC_DB::executeAudited()
2017-12-18 15:24:11 +01:00
bdf4111013
Merge pull request #7555 from nextcloud/smb-copy-rename-log
...
additional debug logging on smb copy/rename failures
2017-12-18 15:02:18 +01:00
3da92a9a78
Merge pull request #7490 from nextcloud/fix_7428
...
Respect sharing options when searching using MailPlugin #7428
2017-12-18 14:08:52 +01:00
4f0d03e172
additional debug logging on smb copy/rename failures
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-18 13:59:58 +01:00
d19dcfd0eb
Fix default parameter of OC_DB::executeAudited()
...
* fixes #7546
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 13:58:54 +01:00
97f80f5581
Merge pull request #7505 from nextcloud/do-not-update-if-app-comes-from-git
...
Do not update apps if it comes from git
2017-12-18 13:43:58 +01:00
8df6ad4631
Upgrade leafo/scssphp to 0.7.2
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 13:41:28 +01:00
e8a4f83000
Fix and tests for MailPlugin
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-12-16 08:46:03 +01:00
9d60f7fc64
Don't show users which e-mail address match if they belong to a group we may share with
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-12-15 19:09:46 +01:00
19ffdecb4f
Merge pull request #7527 from nextcloud/fix-drag-shadow-not-visible-when-dragging-a-file-on-a-narrow-screen
...
Fix drag shadow not visible when dragging a file on a narrow screen
2017-12-15 13:52:09 +01:00
cfb3f44459
Merge pull request #7523 from nextcloud/check_empty_content_length
...
Also check for empty content length
2017-12-15 10:30:15 +01:00
ca70694502
Also check for empty content lenth
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-14 21:48:59 +01:00
b19b137969
Merge pull request #7504 from nextcloud/shorter-css-prefixes
...
Reduce length of md5 in scss caching
2017-12-14 12:12:15 +01:00
b8778b0d85
Test fixes 2
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-14 11:32:53 +01:00
Daniel Calviño Sánchez
Morris Jobke
Julius Härtl
Roeland Jago Douma
John Molakvoæ (skjnldsv)
blizzz
Roeland Jago Douma
Bjoern Schiessle
Robin Appelman
Tobia De Koninck