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

7635 commits

Author SHA1 Message Date
Roeland Jago Douma
325637f4f3
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-19 18:49:27 +01:00
Roeland Jago Douma
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
Julius Härtl
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
Roeland Jago Douma
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
John Molakvoæ (skjnldsv)
a118817a69
Add loading icon on avatar 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-19 18:49:26 +01:00
Roeland Jago Douma
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
blizzz
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
Roeland Jago Douma
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
Daniel Calviño Sánchez
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
Roeland Jago Douma
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
Roeland Jago Douma
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
Bjoern Schiessle
41ee23a054
make occ command more generic 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-12-18 21:14:45 +01:00
Bjoern Schiessle
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
Bjoern Schiessle
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
Morris Jobke
d2d73f1ce8
Also replace all other occurences 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-18 20:57:11 +01:00
Roeland Jago Douma
d6e74fe375
Use injected AppManager 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-18 20:26:44 +01:00
Morris Jobke
784d256103
Merge pull request #7480 from nextcloud/fix_7454 
Check for FreeType functions required for avatars
 2017-12-13 18:25:05 +01:00
Roeland Jago Douma
ee20741526 Add tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-13 17:22:58 +01:00
Roeland Jago Douma
7618473a44 Add warning regarding freetype support 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-13 17:20:48 +01:00
John Molakvoæ (skjnldsv)
21fbcba68d
Removed unwanted and unused spacer 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-12 16:45:56 +01:00
John Molakvoæ (skjnldsv)
133cbd16e4
Fixed firefox guest header height 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-12 16:10:32 +01:00
Roeland Jago Douma
45772473a9
Set autocomplete on share password input 
Fixes #6821

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-12 11:33:12 +01:00
John Molakvoæ (skjnldsv)
bb04e10651
Fixed width on app details 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-11 18:22:21 +01:00
John Molakvoæ (skjnldsv)
a1b4869774
Fixed scrolling in app list 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-11 17:26:43 +01:00
John Molakvoæ (skjnldsv)
d3c324cc9b
Fixed popover menu in entry 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-11 17:26:43 +01:00
blizzz
4fc8984d89
Merge pull request #6079 from nextcloud/fix-antivirus 
Parse Sabre Exception in OC.Files.Client and file-upload
 2017-12-11 17:12:02 +01:00
Morris Jobke
5bc8c94a11
Merge pull request #7249 from nextcloud/guest-flex 
Guest flex instead of absolute
 2017-12-11 15:41:53 +01:00
Roeland Jago Douma
c1fcd6fc98
Merge pull request #7324 from nextcloud/no-sorters-no-instances 
don't create sorter instances when none was requested
 2017-12-11 15:27:44 +01:00
Nextcloud bot
8ed728c1a2
[tx-robot] updated from transifex 2017-12-11 01:10:20 +00:00
Nextcloud bot
a684f033bd
[tx-robot] updated from transifex 2017-12-10 01:10:25 +00:00
Morris Jobke
ed7beb929e
Merge pull request #6876 from nextcloud/always_img_avatar 
Always generate avatar
 2017-12-08 23:58:17 +01:00
Morris Jobke
6aac1ffa33
Merge pull request #7115 from nextcloud/fix-flow 
Fix flow
 2017-12-08 16:01:57 +01:00
Morris Jobke
4c19e75f5d
Merge pull request #7390 from nextcloud/update-php-info 
Show hint that PHP 5.6 will not be supported in Nextcloud 14 anymore
 2017-12-08 15:33:27 +01:00
Morris Jobke
ace96a406a
Show hint that PHP 5.6 will not be supported in Nextcloud 14 anymore 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-08 10:02:41 +01:00
Nextcloud bot
ef2b0969dd
[tx-robot] updated from transifex 2017-12-08 01:10:13 +00:00
Nextcloud bot
7d529c081a
[tx-robot] updated from transifex 2017-12-07 01:10:37 +00:00
Tobias Kaminsky
430f60db21
Merge pull request #6670 from nextcloud/handle-encryption-state-in-web-interface 
Handle encryption state in web interface
 2017-12-06 16:19:17 +01:00
Nextcloud bot
9505c56447
[tx-robot] updated from transifex 2017-12-06 01:10:23 +00:00
Nextcloud bot
f25d55c972
[tx-robot] updated from transifex 2017-12-05 01:10:20 +00:00
Morris Jobke
41c1f862f1
Merge pull request #7319 from nextcloud/remove-svg-shadows 
Remove svg shadows
 2017-12-04 22:40:07 +01:00
Morris Jobke
a62cc27058
Fix syntax error 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-04 22:39:06 +01:00
Nextcloud bot
567757c793
[tx-robot] updated from transifex 2017-12-04 01:10:30 +00:00
Nextcloud bot
bd1e357eef
[tx-robot] updated from transifex 2017-12-03 01:10:22 +00:00
Nextcloud bot
cec236f0af
[tx-robot] updated from transifex 2017-12-02 01:10:32 +00:00
Nextcloud bot
ffc627e18e
[tx-robot] updated from transifex 2017-12-01 01:10:20 +00:00
Marin Treselj
314bfeb6b8 Define icon-shadow only in context of icon-white 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-11-30 18:26:26 +01:00
Nextcloud bot
49ec86a81f
[tx-robot] updated from transifex 2017-11-30 01:13:19 +00:00
Roeland Jago Douma
ba648eecdf
Move avatar code to Avatar Class 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-29 14:23:15 +01:00
Roeland Jago Douma
604596ec16
Always generate avatar 
Even if no avatar is set we should just generate the image. This to not
duplicate the code on all the clients. And only server images from the
avtar endpoint.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-29 14:23:15 +01:00
Nextcloud bot
095eba0aa3
[tx-robot] updated from transifex 2017-11-29 01:10:12 +00:00