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

6523 commits

Author SHA1 Message Date
Roeland Jago Douma
78a318d388
Add test if repair step is already done 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-19 20:26:53 +01:00
Roeland Jago Douma
ccb05dbb17
Adds background job to cleanup all previews. 
* A repair step that inserts a background job for each user
* Each background job will delete for 15 seconds if it takes longer we
reschedule. This is done so instances that don't use the system cron
won't time out.
* Added tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-19 20:14:44 +01:00
Lukas Reschke
8ec2e34576 Merge pull request #1602 from nextcloud/ignore-mod-env 
Add system config htaccess.IgnoreFrontController for prettyURLs w/o mod_env
 2016-11-18 21:42:56 +01:00
Morris Jobke
46768e71d9 Merge pull request #2076 from nextcloud/log_preview_access 
Dispatch event on preview request
 2016-11-18 20:45:29 +01:00
Morris Jobke
332eaec4c0 Merge pull request #1447 from nextcloud/password-confirmation-for-some-actions 
Password confirmation for some actions
 2016-11-18 15:42:30 +01:00
Morris Jobke
faee255ff4 Merge pull request #840 from nextcloud/theming-icon-endpoint 
Add dynamic icon creation
 2016-11-18 15:35:34 +01:00
Lukas Reschke
cc500c2810 Merge pull request #2199 from nextcloud/readfile-close-handle 
close the file handle after readfile
 2016-11-18 14:58:03 +01:00
Robin Appelman
8b9ad46ba3 Merge pull request #768 from nextcloud/s3-objectstore 
Add S3 objectstore backend
 2016-11-18 14:55:07 +01:00
Robin Appelman
89d37575a3
close the file handle after readfile 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-18 12:19:49 +01:00
Joas Schilling
bb7787a157
Add the 15 seconds to the window, instead of removing 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-18 12:10:51 +01:00
Joas Schilling
827b6a610e
Introduce PasswordConfirmRequired annotation 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-18 11:57:16 +01:00
Joas Schilling
d75e35b75e
Introduce the UI for password confirmation 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-18 11:57:16 +01:00
Morris Jobke
ccdf387041 Merge pull request #2184 from nextcloud/share-join-cache 
Get the share root info directly when querying for shares
 2016-11-18 11:33:33 +01:00
Julius Haertl
2e8dd21815
Improve caching 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-18 10:23:24 +01:00
Julius Haertl
237034818d
Check if dynamic icons can be used 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-18 10:23:24 +01:00
Julius Haertl
9ac5476c4e
Add cachebuster to favicons 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-18 10:23:23 +01:00
Julius Haertl
c7adcb85ae
Theming: Fix default parameters in icon routes 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-18 10:23:23 +01:00
Julius Haertl
2d65b8c600
Theming: Add favicon-touch and fix icon creation with non svg images 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-18 10:23:22 +01:00
Julius Haertl
da6285b84f
Core: load favicon from theming app 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-18 10:23:22 +01:00
Robin Appelman
5acbdf1e36
also work with group shares 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-17 23:30:50 +01:00
Morris Jobke
d3900fc0d5 Merge pull request #2177 from nextcloud/appmanager-getapppath 
Expose getAppPath to public API
 2016-11-17 22:39:34 +01:00
Julius Haertl
caacb6c261
Expose getAppPath to public API 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-17 19:24:24 +01:00
Robin Appelman
2f03fcab4a
let the share backend get the node cacheentry to save queries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-17 18:48:38 +01:00
Robin Appelman
14cdeafc3e
make source cache injectable in cache wrappers 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-17 18:48:38 +01:00
Robin Appelman
07e51a719a
Allow aliasing columns when using the query builder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-17 18:48:35 +01:00
Morris Jobke
02bfd91553 Merge pull request #2176 from nextcloud/share-cache-root-info 
reuse the known rootinfo in the shared cache when possible
 2016-11-17 18:47:39 +01:00
Morris Jobke
54ca411ff0 Merge pull request #2167 from nextcloud/mountmanager-lockdown 
ensure we setup the mount manager when in lockdown
 2016-11-17 16:56:55 +01:00
Robin Appelman
30e7c27d86
reuse the known rootinfo in the shared cache when possible 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-17 14:59:31 +01:00
Robin Appelman
73dfe1835a
use lower loglevel for token cleanup messages 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-17 10:42:12 +01:00
Joas Schilling
de983e61e3 Merge pull request #2170 from nextcloud/ocs_person_to_controller 
OCS person to controller
 2016-11-17 09:40:16 +01:00
Lukas Reschke
13610ad2d0 Merge pull request #2164 from nextcloud/token-login-wanring 
fix warning with token login
 2016-11-17 03:28:39 +01:00
Morris Jobke
8a02647e65 Merge pull request #2122 from nextcloud/downstream-26520 
Hack to prevent warning for read-only wrapper in public links
 2016-11-17 00:54:08 +01:00
Felix Epp
1614b310ef Add system config htaccess.IgnoreFrontController for prettyURLs w/o mod_env 
Added the system config which sets all conditions to true that query the
FrontControllerActive mod_env variable.

Signed-off-by: Felix A. Epp <work@felixepp.de>
 2016-11-16 22:28:49 +01:00
Roeland Jago Douma
1baa2b8deb
Move OC\OCS\Person to OCSController 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-16 19:21:00 +01:00
Morris Jobke
b373f52fa8
only use one kind of hack for the storage wrappers of the sharing code 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-16 19:04:47 +01:00
Vincent Petry
e7b1196dd6
Hack to prevent warning for read-only wrapper in public links 
Storage wrappers should normally always be registered inside a presetup
hook. However in the public link scenario this is not possible and
there is currently no good alternative with the current architecture.

Instead of logging a warning every time, this fix prevents the warning
to be shown but also adds a FIXME in the code for the future. This is
ok because this app is already using private/internal APIs at the
moment and should be reworked properly in the future.
 2016-11-16 19:04:42 +01:00
Roeland Jago Douma
577a8a730f
Use getvalue to fetch the value 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-16 18:52:49 +01:00
Morris Jobke
2960b97fc7
Don't update value if it is already set to the same value 
* this PR makes sure to warm up the cache for that user
* then the logic within the "if is in cache" code can be used to reduce needed queries
* inspired by @andreas-p - https://github.com/nextcloud/server/pull/2128

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-16 18:52:49 +01:00
Robin Appelman
a7c0d99705
ensure we setup the mount manager when in lockdown 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 17:24:37 +01:00
Robin Appelman
0e88b519d1
fix warning with token login 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 16:33:56 +01:00
Roeland Jago Douma
61453f5fd5 Merge pull request #719 from nextcloud/lockdown 
Allow restricting of app password permissions
 2016-11-16 16:17:28 +01:00
Roeland Jago Douma
5f789fdebc Merge pull request #2150 from nextcloud/move_buttons_to_bottom 
Move social buttons to bottom on admin page
 2016-11-16 15:37:11 +01:00
Robin Appelman
3ab160dd5a
fopen s3 objects directly to work around unexplainable guzzle bug 
For some reason when a text file started with a valid hex character ([0-9a-f]) it would eat the text untill the first newline
The new code does basically the same thing as guzzle/s3-sdk did only without wrapping everything in a guzzle stream

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:30:37 +01:00
Robin Appelman
4235b18a88
allow passing a stream to StreamResponse 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:30:36 +01:00
Robin Appelman
0ee958595e
Improve isMounted to handle primary storage object store 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:30:36 +01:00
Robin Appelman
eefd059716
add amazon s3 objectstore backend 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:30:36 +01:00
Robin Appelman
64e896cc0d
split testing of objectstoragestorage and objectstore implementations 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:30:36 +01:00
Robin Appelman
0a246f9852
split off s3 connection logic 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:30:36 +01:00
Robin Appelman
e77432783b
Add test for setting up fake fs 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:24:32 +01:00
Roeland Jago Douma
e5bc80b31d
Adds TokenProvider and Mapper tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-16 15:24:31 +01:00