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

47004 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
e73bfd5331
Merge pull request #12552 from nextcloud/fix/11146/respect_disabled_password_reset 
Respect the disabled setting for lost_password_link
 2018-11-20 15:52:32 +01:00
John Molakvoæ
ebc690bbe3
Merge pull request #12491 from nextcloud/share-menu-click-fix 
Fix share link password input
 2018-11-20 15:35:22 +01:00
John Molakvoæ (skjnldsv)
7a9ea03943
Fix share link password input 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-20 14:40:40 +01:00
Joas Schilling
b8fcf6e9b3
Allow empty strings in getAbsoluteURL 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-20 13:36:16 +01:00
Joas Schilling
2b18b9ae96
Update the URLGenerator test to current state of art 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-20 13:36:15 +01:00
Morris Jobke
a9de88e96e
Merge pull request #12350 from nextcloud/filepicker-sorting 
Enable sorting in file picker
 2018-11-20 13:34:51 +01:00
Roeland Jago Douma
43d6ae7476
Respect the disabled setting for lost_password_link 
Fixes #11146
As documented when it is set to disabled the user can't request a lost
password.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-20 13:28:40 +01:00
Morris Jobke
53418f2795
Merge pull request #12543 from nextcloud/fix/12498/bearer_tokens_are_apptokens 
Bearer tokens are app token
 2018-11-20 11:49:33 +01:00
Morris Jobke
cc6c30e769
Merge pull request #12494 from nextcloud/cache-notfound-id 
return the correct value when trying to get a non existing item from cache by id
 2018-11-20 09:51:18 +01:00
Morris Jobke
8e65f08617
Merge pull request #12500 from nextcloud/swift-object-not-found 
forward object not found error in swift as dav 404
 2018-11-20 09:49:57 +01:00
Roeland Jago Douma
a343a60a68
Handle permission in update of share better 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-20 09:42:01 +01:00
Morris Jobke
2be8930cdf
Merge pull request #12539 from nextcloud/fix-redirect-design 
Fix redirect page design details
 2018-11-20 09:34:15 +01:00
Roeland Jago Douma
c2beb36bfc
Bearer tokens are app token 
Fixes #12498

This means that we set that it is a proper app token once it is
validated. This will allow the 2FA middleware to just run the same
check.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-20 09:23:57 +01:00
Nextcloud bot
c9af398644
[tx-robot] updated from transifex 2018-11-20 01:12:39 +00:00
Jan-Christoph Borchardt
256f989a71
Fix CSS specificity preventing buttons displayed in pill style 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-11-19 21:56:38 +01:00
Jan-Christoph Borchardt
4c2dad9ec4
Fix header text color on redirect page 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-11-19 21:54:37 +01:00
Robin Appelman
aa6f7947ba
add test for non existing file by id 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-19 17:37:59 +01:00
Morris Jobke
1d8f7e7806
Merge pull request #12525 from nextcloud/contrast-fix-updatenotifications 
Fix updatenotifications display, dependencies and csp
 2018-11-19 16:05:50 +01:00
Morris Jobke
cef8eadf2a
Add PHPDoc for thrown exception 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-19 15:34:07 +01:00
Morris Jobke
7ea7eb0b4a
Merge pull request #12495 from nextcloud/login-theming-primary-fix 
Fix login primary colour and feedback
 2018-11-19 15:26:40 +01:00
Morris Jobke
5af6289959
Merge pull request #12401 from pachulo/fix/11107/fix-php-mail-warning 
Fix the warning appearing in the admin section when mail_smtpmode is not configured
 2018-11-19 15:23:45 +01:00
Morris Jobke
802e4a79d1
JSUnit tests are not compatible with let/const yet 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-19 15:22:10 +01:00
Morris Jobke
85a491a6fb
Translate name for "(copy)" 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-19 13:57:27 +01:00
Ido Green
313aee91ca
Per the last comment on having only (copy) for the first one 
Signed-off-by: Ido Green <greenido@gmail.com>
 2018-11-19 13:57:23 +01:00
Ido Green
48d74482c1
Use the new naming per the comments on #9931 
More details here: https://github.com/nextcloud/server/issues/9931#issuecomment-402318120

Signed-off-by: Ido Green <greenido@gmail.com>
 2018-11-19 13:57:17 +01:00
Ido Green
c320f48599
cleaning after comments on issue 10825 
More: https://github.com/nextcloud/server/pull/10825#issuecomment-415800850

Signed-off-by: Ido Green <greenido@gmail.com>
 2018-11-19 13:57:13 +01:00
Ido Green
c794452689
fixing issue 9931 - copy a file to the same directory 
Signed-off-by: Ido Green <greenido@gmail.com>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-19 13:56:40 +01:00
John Molakvoæ (skjnldsv)
3b16a76ba0
Fix login primary colour and feedback 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-19 13:19:59 +01:00
Robin Appelman
35251928d5
forward object not found error in switch as dav 404 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-19 11:34:38 +01:00
Morris Jobke
8e4f0f9d17
Use the proper default values 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-19 10:57:51 +01:00
Morris Jobke
ea46c111a0
Merge pull request #12515 from nextcloud/papercut/12295/grid-view-lazy-loading 
Make number of file list entries depending on the width for grid view
 2018-11-19 10:52:54 +01:00
John Molakvoæ (skjnldsv)
e7d5651781
Fix updatenotifications display, dependencies and csp 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-19 10:26:04 +01:00
Morris Jobke
a9e7b65de8
Merge pull request #12496 from nextcloud/revert-icon-theming-fix 
Fix revert icon position on theming settings
 2018-11-19 10:19:58 +01:00
Nextcloud bot
367560ccd6
[tx-robot] updated from transifex 2018-11-19 01:12:04 +00:00
Roeland Jago Douma
dd74d1ac11
Merge pull request #12517 from nextcloud/bugfix/noid/files-external-templates 
Fix loading of files external templates file
 2018-11-18 20:18:08 +01:00
Roeland Jago Douma
14f7b2c466
Merge pull request #12518 from nextcloud/bugfix/noid/htaccess-woff2 
Fix loading of .woff2 files in .htaccess
 2018-11-18 14:07:22 +01:00
Julius Härtl
9536a40025
Fix loading of files external templates file 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-18 11:13:46 +01:00
Julius Härtl
b9f2ce2796
Fix loading of .woff2 files in .htaccess 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-18 11:02:20 +01:00
Julius Härtl
eb039608f9
Make number of file list entries depending on the width for grid view 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-18 10:44:53 +01:00
Nextcloud bot
8bf7ec26e0
[tx-robot] updated from transifex 2018-11-18 01:12:58 +00:00
Nextcloud bot
1f82aad842
[tx-robot] updated from transifex 2018-11-17 01:12:47 +00:00
John Molakvoæ (skjnldsv)
ce6e77ad74
Fix revert icon position on theming settings 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-16 18:35:42 +01:00
Robin Appelman
5d5cfefd35
return the correct value when trying to get a non existing item from cache by id 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-16 17:26:42 +01:00
Morris Jobke
fe13db424e
Merge pull request #12489 from nextcloud/bugfix/11179/safari-performance 
Only use width and opacity for transition
 2018-11-16 16:24:49 +01:00
John Molakvoæ
1942280763
Merge pull request #12487 from nextcloud/settings-svg-icons-scss-fix 
Remove unused svg api route
 2018-11-16 16:23:26 +01:00
Julius Härtl
edd7dde27b
Only use width and opacity for transition 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-16 15:42:23 +01:00
John Molakvoæ (skjnldsv)
2eba5f9460
Remove unused sg api route 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-16 15:39:46 +01:00
Morris Jobke
8a5ac26ca6
Merge pull request #12484 from nextcloud/loader-color-fixes 
Fix loader colours for better visibility
 2018-11-16 14:53:09 +01:00
Julius Härtl
5e5cced48c
Properly align loading indicator when switching folders 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-16 14:50:40 +01:00
Ivan Sein
ce20cb2d40 Format Nextcloud Talk clients sessions. 
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
 2018-11-16 14:47:41 +01:00