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

12995 commits

Author SHA1 Message Date
Robin Appelman
c694bd3455
remove old logging section 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-21 13:46:31 +01:00
Roeland Jago Douma
9bc4ac367f
Do not trigger appconfig queries when we are not yet installed 
Fixes #2209

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-21 13:13:53 +01:00
Robin Appelman
58685413d2
fix white screen of death in maintenance mode when theming is disabled 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-21 13:10:55 +01:00
Lukas Reschke
fb91bf6a5b
Add a signer class for signing 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-21 11:30:00 +01:00
Lukas Reschke
6f4cb12be2
Add identity proof 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-21 11:30:00 +01:00
Lukas Reschke
53c8391e96
Add private 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-21 11:30:00 +01:00
Bjoern Schiessle
08e6541a88
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-21 11:29:58 +01:00
Bjoern Schiessle
8f33d9d1c0
update system address book if the user change the personal settings 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-21 11:29:57 +01:00
Björn Schießle
40b99734d3
introduce accounts table and keep it up-to-date with the data added to the personal settings 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-21 11:29:41 +01:00
Joas Schilling
558f169671
Move the validation into one place only 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-21 09:23:37 +01:00
Joas Schilling
4652d203e3
Make sure we don't scan files that can not be accessed 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-21 09:23:32 +01:00
Nextcloud bot
ba9b17c906
[tx-robot] updated from transifex 2016-11-21 01:06:58 +00:00
Nextcloud bot
97af4f762d
[tx-robot] updated from transifex 2016-11-20 01:06:44 +00:00
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
Nextcloud bot
b1ee9862f8
[tx-robot] updated from transifex 2016-11-19 01:06:44 +00: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
922f51e901
Update class map 
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
Nextcloud bot
00fffae47f
[tx-robot] updated from transifex 2016-11-18 01:07:04 +00: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
Morris Jobke
9cec82d084 Merge pull request #2153 from nextcloud/version-hint 
add explanatory text of what to do on app version error
 2016-11-17 15:43:50 +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
Nextcloud bot
ab18d2f55e
[tx-robot] updated from transifex 2016-11-17 01:07:02 +00: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
Joas Schilling
bdaf334c53
Move file sharing activities to the new API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 16:45:08 +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
Robin Appelman
4837904ad6
update autoloader 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:24:30 +01:00
Robin Appelman
4c3d18a9fc
explicit types 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:24:29 +01:00
Robin Appelman
a4ea20a259
cast to int 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:24:29 +01:00
Robin Appelman
c5df58ec69
phpdoc 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-16 15:24:28 +01:00
Robin Appelman
7e9e5db496
fix setscope 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-11-16 15:24:28 +01:00
Robin Appelman
1afccde16a
allow configuring filesystem access 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-11-16 15:24:27 +01:00
Robin Appelman
b4e27d35f5
app password scope wip 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-11-16 15:24:27 +01:00
Robin Appelman
2389e0f250
read lockdown scope from token 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-11-16 15:24:27 +01:00
Robin Appelman
b56f2c9ed0
basic lockdown logic 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-11-16 15:24:23 +01:00
Morris Jobke
43e22f4da4
Add autoloader path for newly installed apps too 
* followup to https://github.com/nextcloud/server/pull/2148
* problem noticed in https://github.com/nextcloud/files_antivirus/pull/11

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-16 12:55:34 +01:00
Joas Schilling
6a525fadbb
Show all in one message 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 12:27:22 +01:00
Joas Schilling
a845f7bc01
Fix wrong copyright headers 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 12:20:04 +01:00
Roeland Jago Douma
d03446a0ae Merge pull request #2148 from nextcloud/add_autoloader_before_enabling 
Add autoloader before enabling apps
 2016-11-16 12:09:39 +01:00
Jan-Christoph Borchardt
b228ed7bef add explanatory text of what to do on app version error 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-11-16 11:47:39 +01:00
Roeland Jago Douma
0200f34dd1
Move social buttons to bottom on admin page 
For #2134

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-16 10:48:31 +01:00
Joas Schilling
6b88d56e3a
Update the since version to 11.0.0 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:29:27 +01:00
Joas Schilling
6047493b6d
Fix integration tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:46 +01:00
Joas Schilling
b5f1296d1f
Make sure they are always arrays 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:46 +01:00
Joas Schilling
b8958ee937
Fix activity manager tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:45 +01:00
Joas Schilling
c2a5c1f2c6
Allow combining events 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:45 +01:00
Joas Schilling
b2248efd75
Allow to register Providers 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:45 +01:00
Joas Schilling
72f0d9981e
Add ROS and icon support to the events 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:45 +01:00
Joas Schilling
a366602961
Validate the input into Event already 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:44 +01:00
Joas Schilling
13ff56bfc5
Allow to register settings/types via info.xml 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:44 +01:00
Joas Schilling
280d5325c7
Allow to register activity filters via info.xml 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:40 +01:00
Morris Jobke
3c00ff2616 Merge pull request #2145 from nextcloud/docs_to_com 
docs are on nc.com
 2016-11-16 00:57:35 +01:00
Morris Jobke
cb97cf559b Merge pull request #2144 from nextcloud/fix_1303 
Do not cache version info in the session
 2016-11-15 23:13:53 +01:00
Roeland Jago Douma
d826e04757
Add autoloader before enabling apps 
Else apps that require already autoloading in the installer
(files_antivius) die hard!

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-15 22:28:57 +01:00
Roeland Jago Douma
28babd319b Merge pull request #2137 from nextcloud/make-sure-tests-run-on-phpunit-4-again 
Add a magic wrapper to allow phpunit4 to run the code again
 2016-11-15 21:48:55 +01:00
Roeland Jago Douma
39f336035b
docs are on nc.com 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-15 19:17:42 +01:00
Roeland Jago Douma
f07d75a4dd
@since 9.2.0 to @since 11.0.0 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-15 18:51:52 +01:00
Roeland Jago Douma
7a8bf6ea26
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-15 18:10:17 +01:00
Roeland Jago Douma
028c668293
Do not cache version info in the sessions 
If the session is cleared and closed for whatever reason the loadVersion
will write to the session anyways. This will lead to an exception.

This should fix #1303

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-15 17:53:12 +01:00
Lukas Reschke
5fd428413b
Adjust previous fallbacks 
11.0 is 11 and not 9.2 anymore

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-15 15:07:58 +01:00
Joas Schilling
e76ef9aaa8
Add a magic wrapper from hell to allow phpunit4 to run the code again 
Remove this once phpunit 5 is the lowest supported version, by reverting:
https://github.com/nextcloud/server/pull/2137

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-15 14:49:14 +01:00
Roeland Jago Douma
0e60b78378 Merge pull request #2117 from nextcloud/master-add-bruteforce-check-to-person-endpoint 
Add bruteforce checker to Person.php
 2016-11-14 17:18:31 +01:00
Roeland Jago Douma
b7e13b43fb Merge pull request #2114 from nextcloud/downstream-26498 
make object prefix configurable
 2016-11-14 17:07:00 +01:00
Roeland Jago Douma
1e3d806416 Merge pull request #2113 from nextcloud/downstream-26299 
We need to ensure that the app holding the objectstore implementation…
 2016-11-14 16:44:16 +01:00
Lukas Reschke
0d89c14911
Add bruteforce checker to Person.php 
Also check for attempts on this endpoint

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-14 15:26:23 +01:00
Jörn Friedrich Dreyer
4a9361905d
make object prefix configurable 2016-11-14 15:10:56 +01:00
Thomas Müller
895b638a2c
We need to ensure that the app holding the objectstore implementation is loaded - fixes owncloud/objectstore#38 2016-11-14 15:00:45 +01:00
Thomas Müller
506ccdbd8d
Introduce an event for first time login based on the last login time stamp 
Use firstLogin event to trigger creation of default calendar and default address book

Delay login of admin user after setup so that firstLogin event can properly be processed for the admin

Fixing tests ...

Skeleton files are not copied over -> only 3 cache entries are remaining

Use updateLastLoginTimestamp to properly setup lastLogin value for a test user
 2016-11-14 14:50:10 +01:00
Morris Jobke
fdd904414f Merge pull request #2068 from nextcloud/sharetypesinfolder-no-getdirectorycontent 
remove unneeded getDirectoryContent when getting share types for a folder
 2016-11-14 11:49:24 +01:00
Morris Jobke
16a110e803 Merge pull request #2067 from nextcloud/fileinfo-lazy-substorages 
only query substorages to calculate the final mtime/size/etag when we need it
 2016-11-14 11:39:02 +01:00
Nextcloud bot
8c1cd07de3
[tx-robot] updated from transifex 2016-11-14 01:07:06 +00:00
Lukas Reschke
7cb0df28e2
Prevent downgrade attacks for apps 
We should verify the app versions when installing a new update, otherwise this could result in downgrade attacks when an attacker just copies the old signature.

Plus it prevents the case that in case of a bug in the appstore actually an older version gets installed.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-11 18:53:26 +01:00
Roeland Jago Douma
99ada40df4
Dispatch event on preview request 
Fixes: #73

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-10 14:28:09 +01:00
Robin Appelman
cbcdf69dc2
only query substorages to calculate the final mtime/size/etag lazily 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-10 13:59:22 +01:00
Roeland Jago Douma
931493b70e
Get correct L10N for Settings Manager 
Fixes #2022

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-10 11:08:37 +01:00
Nextcloud bot
cfda17d8f3
[tx-robot] updated from transifex 2016-11-10 01:07:14 +00:00
Robin Appelman
74024c8f28
fix phpdoc 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-09 16:59:03 +01:00
Christoph Wurst
0ebffa4a5f do not double encode the redirect url 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-11-09 16:14:46 +01:00
Morris Jobke
742c215946 Merge pull request #2058 from nextcloud/better-error-message-for-installation-error 
Use a better error message and point the users to the support channels
 2016-11-09 13:59:33 +01:00
Lukas Reschke
9305094b8b
Add test and adjust PHP function arguments 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-09 10:49:57 +01:00
Joas Schilling
2f7e291101
Correctly catch the "soft errors" now 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-09 10:30:19 +01:00
Joas Schilling
224dfaf1e6
Use a better error message and point the users to the support channels 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-09 09:10:32 +01:00
Joas Schilling
706b5c3fb6
Use a php class for the definitions to avoid loading problems 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-09 08:52:07 +01:00
Roeland Jago Douma
100cec59a7 Merge pull request #2037 from nextcloud/fix-preview-urls 
Fix preview URLs
 2016-11-08 18:29:57 +01:00
Björn Schießle
1ad3043e4f Merge pull request #1998 from nextcloud/share-by-mail-notification 
add share by mail activity
 2016-11-08 17:37:46 +01:00
Joas Schilling
9296038d78
Fix preview URLs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-08 16:39:13 +01:00
Bjoern Schiessle
25bcd71d02
add activity if a file was shared by mail 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-08 15:58:52 +01:00
Bjoern Schiessle
3bc643ec23
add new definition 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-08 15:42:07 +01:00
Bjoern Schiessle
087dab85b4
add activity for share by mail 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-08 15:42:07 +01:00
Donquixote
537d588726
refactoring code to reduce cyclomatic complexit 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-07 08:18:16 +01:00
Nextcloud bot
8d954c0ece
[tx-robot] updated from transifex 2016-11-07 01:07:03 +00:00
Nextcloud bot
e217040402
[tx-robot] updated from transifex 2016-11-06 01:07:48 +00:00
Nextcloud bot
ca3616cb58
[tx-robot] updated from transifex 2016-11-05 01:07:14 +00:00
Lukas Reschke
a9547a2fd7 Merge pull request #2015 from nextcloud/swift-bucket 
allow using 'bucket' to set the swift container
 2016-11-04 21:46:59 +01:00
Morris Jobke
f42d5b6e56 Merge pull request #2007 from nextcloud/downstream-26411 
[oc] Fix initMountPoints to set usersSetup earlier
 2016-11-04 15:03:52 +01:00
Robin Appelman
b72e5a2e4e
allow using 'bucket' to set the swift container 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-04 14:15:18 +01:00
Roeland Jago Douma
a56717673f
Remove adding sharedialogmailview 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-04 07:41:35 +01:00
Nextcloud bot
479d76d426
[tx-robot] updated from transifex 2016-11-04 01:07:04 +00:00
Lukas Reschke
c0bbae28f0 Merge pull request #1741 from nextcloud/new_preview 
Improve previews
 2016-11-03 21:07:16 +01:00
Vincent Petry
237dab675e
Fix initMountPoints to set usersSetup earlier 
This is needed because in some cases like LDAP, the user manager itself
might trigger avatar updates which would internally also call
initMountPoints with the same user. This could cause the same user to
be setup twice, and in some sharing situations could cause recursive
deduplication of shares by adding "(2)" every time.
 2016-11-03 20:45:40 +01:00
Lukas Reschke
8bf57462ea Merge pull request #2002 from nextcloud/propagate-mtime-iont 
explicitly cast mtime to int in propagation
 2016-11-03 20:43:13 +01:00
Robin Appelman
95ac9f60ce
Cap the number of queries we save in the query logger 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-03 16:00:28 +01:00
Robin Appelman
7be62d083e
explicitly cast mtime to int 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-03 14:36:46 +01:00
Roeland Jago Douma
7ba7949dc1 Merge pull request #1994 from nextcloud/proper-cron-hints 
Show a hint for system based cron user name
 2016-11-03 14:11:37 +01:00
Roeland Jago Douma
87855aa97b
Added genertor helper & tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
d720a2fb57
Moved over files_versions 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
a6ca81b474
Update autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00