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

13162 commits

Author SHA1 Message Date
Christoph Wurst
21d3fe5883
do not hard-require the token provider 
The provider might need DB access and therefore depenedency
resolution fails on the setup page where we cannot inject
the db implementation.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:11 +01:00
Christoph Wurst
6f74ecd94a
use login hook credentials as fallback 
If no session token is available, we can use the credentials provided
by the login hook.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:11 +01:00
Christoph Wurst
3316a9d294
fix @since annotations (9.1->12) 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:11 +01:00
Christoph Wurst
46adb3eced
replace session implementation if it changes at runtime 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:11 +01:00
Christoph Wurst
730442cd8f
add @since annotations and document methods 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:10 +01:00
Christoph Wurst
a6dca9e7a0
add login credential store 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:09 +01:00
Nextcloud bot
c35ea15916
[tx-robot] updated from transifex 2017-01-11 15:20:22 +00:00
Roeland Jago Douma
bc26f78eb1 Merge pull request #2849 from nextcloud/downstream-add-two-factor-exception 
Downstream add two factor exception
 2017-01-11 13:06:01 +01:00
Roeland Jago Douma
005ce8aaf6 Merge pull request #3007 from Loki3000/master 
Remove non required db requests
 2017-01-11 12:37:54 +01:00
Roeland Jago Douma
c7f0063a70
Update autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-01-11 11:02:11 +01:00
Christoph Wurst
243c9c0941
fix coding style and increase code coverage 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 11:01:54 +01:00
Cornelius Kölbel
ee8c617a6d
Update TwoFactorException.php 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-01-11 11:01:54 +01:00
Cornelius Kölbel
e077e01bf2
Add a TwoFactorException 
A Two Factor third party App may throw a TwoFactorException()
with a more detailed error message in case the authentication fails.
The 2FA Controller will then display the message of this Exception
to the user.

Working on #26593

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-01-11 11:01:52 +01:00
Roeland Jago Douma
447e388ce9 Merge pull request #2744 from nextcloud/oc_26324 
[downstream] Fix DAV stat cache to properly cache 404
 2017-01-11 08:16:40 +01:00
Roeland Jago Douma
f515c6db4a Merge pull request #2745 from nextcloud/oc_26590 
[downstream] Skip local shares in bkg scan and occ files:scan (#26590)
 2017-01-11 08:16:12 +01:00
Roeland Jago Douma
a90cbb0f09 Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefully 
Handle log_type "nextcloud" more gracefully
 2017-01-11 08:14:24 +01:00
Roeland Jago Douma
00b17c3af5
Only check for local shared storages 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-01-10 16:14:21 +01:00
Vincent Petry
706655ef20
Skip local shares in bkg scan and occ files:scan (#26590) 
Local shares should only be scanned when doing it for the owner to
avoid repeatedly rescanning the same shared storage over and over again
for every recipient.
 2017-01-10 16:11:45 +01:00
Loki3000
7e06f051c9 remove non required sql requests 
```
SELECT `appid`, `configkey`, `configvalue` FROM `preferences` WHERE `userid` = '';
```
 2017-01-10 17:16:56 +03:00
Loki3000
8ab16f87ac spaces added 2017-01-10 16:44:14 +03:00
Loki3000
6a74f7db11 spaces added 2017-01-10 16:43:43 +03:00
Loki3000
5c77923360 allowed '0' uid 2017-01-10 16:39:10 +03:00
Loki3000
b7e6c5ecdf allowed '0' uid 2017-01-10 16:37:18 +03:00
Morris Jobke
30689f338f Merge pull request #2914 from nextcloud/logrotate-logfile 
Get the logfile location while running the logrotate cron job instead…
 2017-01-10 14:28:09 +01:00
Roeland Jago Douma
aee11009bd Merge pull request #3000 from nextcloud/cache-no-store 
set 'no-store' cache header if we do not want FF to cache
 2017-01-10 14:07:13 +01:00
Morris Jobke
4dd2a1e679 Merge pull request #2943 from nextcloud/kill_old_preview_code 
Cleanup old preview code
 2017-01-10 13:50:14 +01:00
Roeland Jago Douma
a5bf14ada3 Merge pull request #2955 from nextcloud/make-share-by-mail-work-without-linkshares 
share by mail should continue to work, even if public links are disabled
 2017-01-10 13:06:20 +01:00
Joas Schilling
7fa063ceca
Better fallback for unknown log types 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-10 12:59:13 +01:00
Loki3000
74a2938f8e fix spaces 2017-01-10 14:21:23 +03:00
Loki3000
5262779101 fix brackets 2017-01-10 13:29:35 +03:00
Loki3000
b0ff59d42f remove non required db requests 2017-01-10 13:09:33 +03:00
Loki3000
33259b41cd remove non required db requests 2017-01-10 13:05:21 +03:00
Roeland Jago Douma
b847dfcee9 Merge pull request #2925 from nextcloud/remove-close-wrapper 
replace close:// streamwrapper with CallBackWrapper
 2017-01-10 10:21:10 +01:00
Loki3000
135198bf0d Default value for null user 
For guest users on every request executes query:
SELECT `uid`, `displayname` FROM `users` WHERE LOWER(`uid`) = LOWER(null)
as I see, uid can't be equal to null by design.
 2017-01-09 23:34:23 +03:00
Christoph Wurst
fe6416072d
set 'no-store' cache header if we do not want FF to cache 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-09 21:29:59 +01:00
Lukas Reschke
307d45e3bd Merge pull request #2987 from nextcloud/no-empty-bundle 
dont write a certificate bundle if the shipped ca bundle is empty
 2017-01-09 21:10:11 +01:00
Morris Jobke
9a5b9d8555 Merge pull request #2992 from nextcloud/fix_subdir_install_style 
Fix subdir install style
 2017-01-09 18:37:08 +01:00
Robin Appelman
817e974c5f
dont write a certificate bundle if the shipped ca bundle is empty 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-09 16:51:27 +01:00
Lukas Reschke
05d27ec148 Merge pull request #2985 from nextcloud/fix-trusted-domain-error 
Allow access to CSS resources
 2017-01-09 16:29:09 +01:00
Roeland Jago Douma
dec4b26355
Fix subdir install style 
* We need to pass the serverroot so that it can include the right files.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-01-09 16:19:54 +01:00
Joas Schilling
fee18d6c78 Merge pull request #2814 from nextcloud/appstore_etag_validation 
Add ETag validation to appstore requests
 2017-01-09 14:56:20 +01:00
Lukas Reschke
69f3430552
Allow access to CSS resources 
Fixes https://github.com/nextcloud/server/issues/2984

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-01-09 12:53:58 +01:00
Joas Schilling
e7ff1ba548
Add tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-09 10:55:40 +01:00
Nextcloud bot
4f9ff96f79
[tx-robot] updated from transifex 2017-01-09 08:24:58 +00:00
Robin Appelman
54f96e5f58
Get the logfile location while running the logrotate cron job instead of when registering the job 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-06 16:10:07 +01:00
Roeland Jago Douma
4a2fbe9a5b Merge pull request #2930 from nextcloud/kill-group-restriction-when-not-applicable 
Remove group restrictions when those are not allowed anymore
 2017-01-06 15:38:13 +01:00
Robin Appelman
e40ecc1aa1
update autoloader 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-06 15:33:33 +01:00
Robin Appelman
5774d3e82c
replace close:// streamwrapper with CallBackWrapper 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-06 15:33:32 +01:00
Roeland Jago Douma
73fcb69cad Merge pull request #2934 from nextcloud/quota-stream-non-global 
remove the need to register the quota streamwrapper globally
 2017-01-06 15:25:20 +01:00
Morris Jobke
5e02c7f7bd
Theme update pages via CSS 
* SCSS on-the-fly generation isn't allowed during update
* fallback to plain CSS

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-06 12:36:16 +01:00