Morris Jobke
b6397ef73a
Merge pull request #236 from nextcloud/master-sync-upstream
...
[Master] sync upstream
2016-06-28 09:02:03 +02:00
Jenkins for ownCloud
894b7d93f6
[tx-robot] updated from transifex
2016-06-28 01:57:10 -04:00
Robin Appelman
2a72eff9ee
Fix getting the certificate bundle for dav external storage ( #25274 )
...
* Fix getting the certificate bundle for dav external storages
* Log the original exception in dav external storage
2016-06-27 22:26:43 +02:00
Christoph Wurst
1710de8afb
Login hooks ( #25260 )
...
* fix login hooks
* adjust user session tests
* fix login return value of successful token logins
* trigger preLogin hook earlier; extract method 'loginWithPassword'
* call postLogin hook earlier; add PHPDoc
2016-06-27 22:16:22 +02:00
Robin Appelman
88ef163276
handle unavailable fed shares while testing for availability ( #25277 )
...
* More explicit http status codes
* handle unavailable fed shares while testing for availability
2016-06-27 21:34:28 +02:00
Lukas Reschke
e0445856b9
Merge pull request #59 from nextcloud/theming-app
...
Theming app
2016-06-27 21:14:40 +02:00
Lukas Reschke
6670d37658
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-27 18:23:00 +02:00
Bjoern Schiessle
2a990a0db5
verify user password on change
2016-06-27 14:08:11 +02:00
Bjoern Schiessle
d4989c8037
remove old hook, no longer needed
2016-06-27 14:05:27 +02:00
Bjoern Schiessle
630e4b1b46
check password for link shares
2016-06-27 14:05:27 +02:00
Vincent Petry
199c8e304c
Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadperms
...
Add explicit delete permission to link shares
2016-06-27 12:14:05 +02:00
Vincent Petry
7269611722
Merge pull request #25258 from owncloud/integritycheck-whennotinstalled
...
Make code integrity check work when OC is not installed yet
2016-06-27 11:58:35 +02:00
Lukas Reschke
89e889c832
Check if server is installed
...
AppManager has a dependency on Nc being installed
2016-06-27 10:26:23 +02:00
Lukas Reschke
27b699bdbc
Migrate logic to dynamic controller
...
Also adds support for having custom login backgrounds
2016-06-27 10:26:23 +02:00
Bjoern Schiessle
10f6ca20bc
write theme settings to database
2016-06-27 10:26:22 +02:00
Lukas Reschke
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
2016-06-26 12:55:05 +02:00
Christoph Wurst
89198e62e8
check login name when authenticating with client token
2016-06-24 13:57:09 +02:00
Vincent Petry
e677ad56fd
Make code integrity check work when OC is not installed yet
2016-06-24 10:24:41 +02:00
Vincent Petry
0ad065cb8d
Repair step to adjust link share delete permissions
2016-06-24 09:48:48 +02:00
Vincent Petry
955635c7aa
Add explicit delete permission to link shares
...
Link shares always allowed deletion, however internally the permissions
were stored as 7 which lacked delete permissions. This created an
inconsistency in the Webdav permissions.
This fix makes sure we include delete permissions in the share
permissions, which now become 15.
In case a client is still passing 7 for legacy reasons, it gets
converted automatically to 15.
2016-06-24 09:48:48 +02:00
Jenkins for ownCloud
29068d3845
[tx-robot] updated from transifex
2016-06-24 01:56:13 -04:00
Vincent Petry
3db5de95bd
Merge pull request #25172 from owncloud/token-login-validation
...
Token login validation
2016-06-22 13:58:56 +02:00
VicDeo
854352d9a0
occ web executor ( #24957 )
...
* Initial web executor
* Fix PHPDoc
Fix broken integration test
OccControllerTests do not require database access - moch them all!
Kill unused sprintf
2016-06-22 13:12:36 +02:00
Vincent Petry
c49ff83f18
Merge pull request #25208 from owncloud/uploadfolder-firemkdirhooksforparents
...
Fire hooks for mkdir for folder upload
2016-06-22 10:21:00 +02:00
Joachim Sokolowski
fa19e4c2eb
some text-changes to nextcloud
2016-06-22 08:41:10 +02:00
karakayasemi
c8b7a059b4
Fire hooks for mkdir for folder upload
...
fromTmpFile function, usual mkdir call is only working for file's parent
directory. Does not care upper parent folders. I added a recursive
function that creates parent non-existing folders with usual mkdir.
2016-06-21 17:10:52 +02:00
Christoph Wurst
7f22aeb5d6
redirect to new login route ( #25099 )
...
* redirect to new login route
* encode anchor in url and restore it client-side
2016-06-21 16:14:51 +02:00
Lukas Reschke
097cba8b38
Merge pull request #185 from nextcloud/fix-permission-issue
...
Show error message if config file is not readable
2016-06-21 12:14:24 +02:00
Morris Jobke
191a6c65d9
Show error message if config file is not readable
...
* when the config file is not writable there is a error message shown
* same happens now if the config file is not readable
* fixes #180
2016-06-21 11:25:38 +02:00
Lukas Reschke
2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-21 11:18:22 +02:00
Christoph Wurst
b805908dca
update session token password on user password change
2016-06-21 10:24:25 +02:00
Jenkins for ownCloud
0e575c7eea
[tx-robot] updated from transifex
2016-06-21 03:49:50 -04:00
Vincent Petry
88b9f5a357
Merge pull request #25162 from owncloud/password-login-forbidden-hint
...
Password login forbidden hint
2016-06-20 17:05:20 +02:00
Morris Jobke
0194873c55
fix german l10n
2016-06-20 13:14:24 +02:00
Morris Jobke
e95c15e53a
fix more strings
2016-06-20 13:14:24 +02:00
Thomas Müller
2951a70fcb
Update ExcludeFileByNameFilterIterator.php ( #25184 )
...
Gentoo & derivatives use a tool named webapp-config which places two files in a webapp-config manager web application:
1: .webapp tag with more detailed info on the configuration done by webapp-config
2: .webapp-appname with the list of files installed by the tool to be able to later only delete stuff that was installed (in case of upgrade) and updated configurations.
2016-06-20 12:02:23 +02:00
Christoph Wurst
56199eba37
fix unit test warning/errors
2016-06-20 10:41:23 +02:00
Vincent Petry
e2b0a0f18f
Merge pull request #25174 from owncloud/tokenmapper-close-cursor
...
close cursor after loading a token
2016-06-20 09:54:15 +02:00
Vincent Petry
01041045da
Merge pull request #25168 from owncloud/capped-user-cache
...
Capped cache for user config
2016-06-20 09:53:58 +02:00
Christoph Wurst
9d74ff02a4
fix nitpick
2016-06-20 09:13:47 +02:00
Jenkins for ownCloud
bd13353c4d
[tx-robot] updated from transifex
2016-06-20 01:54:50 -04:00
Florian Preinstorfer
f6e9322f1e
Remove obsolete contacts_cards_properties table
...
The table contacts_cards_properties was part of the contacts app until
ownCloud 8.2. It got replaced with cards_properties (part of dav).
See also: ownCloud/core #21889
2016-06-19 15:40:37 +02:00
Florian Preinstorfer
217144dd95
Drop obsolete tables: gallery_albums and gallery_photos
...
Commit 34a21a63ce
renamed gallery_albums
to pictures_images_cache and removed gallery_photos entirely.
2016-06-19 14:01:42 +02:00
Christoph Wurst
b0f2878f6e
close cursor after loading a token
2016-06-17 16:13:28 +02:00
Christoph Wurst
1889df5c7c
dont create a session token for clients, validate the app password instead
2016-06-17 15:42:28 +02:00
Christoph Wurst
0c0a216f42
store last check timestamp in token instead of session
2016-06-17 15:42:28 +02:00
Christoph Wurst
c4149c59c2
use token last_activity instead of session value
2016-06-17 15:42:28 +02:00
Jörn Friedrich Dreyer
66560b8ed9
Capped cache for user config
2016-06-17 12:58:55 +02:00
Vincent Petry
73e284e1e1
Use getLazyRootFolder from RemoveRootShares repair step
...
This prevents the command registration to setup the FS too early when
FS-related apps might need upgrading.
2016-06-17 11:09:12 +02:00
Christoph Wurst
82b50d126c
add PasswordLoginForbiddenException
2016-06-17 11:02:07 +02:00
Jenkins for ownCloud
cc532bb14a
[tx-robot] updated from transifex
2016-06-17 02:00:01 -04:00
Vincent Petry
82beee57e4
Merge pull request #25132 from owncloud/2fa-load-apps-before-query
...
load 2FA provider apps before querying classes
2016-06-16 17:04:19 +02:00
Jörn Friedrich Dreyer
592ac6f7da
emit correct signal when disabling an app
2016-06-16 14:17:06 +02:00
Christoph Wurst
a40d64ff7f
load 2FA provider apps before querying classes
2016-06-16 10:12:16 +02:00
Vincent Petry
9c328de4ab
Merge pull request #24415 from owncloud/optimize_sharingdisabled_for_user
...
Optimize isSharingDisabledForUser
2016-06-16 09:27:48 +02:00
Vincent Petry
1251df3e17
Merge pull request #25075 from owncloud/fix_23265
...
Remove shares of the root folder
2016-06-16 09:27:06 +02:00
Vincent Petry
5de6432441
Merge pull request #25056 from owncloud/fs-usermountcache-capped
...
Capped cache for cache info in UserMountCache
2016-06-15 13:01:28 +02:00
Vincent Petry
05967a6904
Merge pull request #25093 from owncloud/issue-12816-clean-tags-from-deleted-users
...
Clean up tags of deleted users
2016-06-15 12:20:29 +02:00
Vincent Petry
f163eedfa2
Merge pull request #25102 from owncloud/preview-delete-performance
...
Preview delete performance
2016-06-15 11:58:50 +02:00
Vincent Petry
3e9353dd69
Merge pull request #25082 from owncloud/fix-sessionless-clients
...
Fix sessionless clients
2016-06-15 10:45:55 +02:00
Jenkins for ownCloud
be4a29d75f
[tx-robot] updated from transifex
2016-06-15 05:54:49 +00:00
Robin Appelman
01d9ad6b14
optimized size propagation on deletes
2016-06-14 17:17:43 +02:00
Robin Appelman
dfcaeeabb3
propagator batching when removing thumbnails
2016-06-14 17:17:29 +02:00
Robin Appelman
1fddd62c1c
remvoe duplicate rmdir
2016-06-14 17:06:24 +02:00
Joas Schilling
123bf78ca8
Clean up tags of deleted users
2016-06-14 12:38:09 +02:00
Roeland Jago Douma
28d070730d
Fix case with no user
2016-06-14 11:34:41 +02:00
Vincent Petry
ce676c4eb6
Merge pull request #25076 from owncloud/mount-cache-invalid
...
handle invalid storages in LazyStorageMountInfo
2016-06-14 10:52:21 +02:00
Roeland Jago Douma
ae3d0d96fe
Optimize isSharingDisabledForuser
2016-06-14 10:17:06 +02:00
Jenkins for ownCloud
5887afbb37
[tx-robot] updated from transifex
2016-06-14 08:02:15 +02:00
Arthur Schiwon
ae02685e6f
Merge branch 'master' of https://github.com/owncloud/core into downstream-160614
2016-06-14 01:06:25 +02:00
Christoph Wurst
465807490d
create session token only for clients that support cookies
2016-06-13 19:44:05 +02:00
Christoph Wurst
331d88bcab
create session token on all APIs
2016-06-13 15:38:34 +02:00
Vincent Petry
86d7241be2
Capped cache for cache info in UserMountCache
2016-06-13 15:08:12 +02:00
Roeland Jago Douma
64471b5d4a
Remove shares of the root folder
...
Fixes #23265
(A possibly costly) repair job to remove cyclic shares.
2016-06-13 15:07:41 +02:00
Jenkins for ownCloud
3840466f9a
[tx-robot] updated from transifex
2016-06-13 12:21:11 +00:00
Bjoern Schiessle
5f2bc3a96d
emit correct signal if a app get's disabled
2016-06-13 13:36:23 +02:00
Robin Appelman
338cd4033a
handle invalid storages in LazyStorageMountInfo
2016-06-13 13:31:45 +02:00
Christoph Wurst
5daa9a5417
fail hard if 2fa provider can not be loaded ( #25061 )
2016-06-13 12:46:45 +02:00
Arthur Schiwon
42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611
2016-06-11 15:34:43 +02:00
Lukas Reschke
842cc2a788
Merge pull request #19 from nextcloud/files-drop
...
add "hide file list" option
2016-06-10 18:29:09 +02:00
Vincent Petry
52a0c939ab
Merge pull request #24863 from owncloud/propagator-batching
...
Propagator batching for the file scanner
2016-06-10 17:45:52 +02:00
Vincent Petry
21de838b85
Merge pull request #24898 from owncloud/avatar_repair
...
Repair job to fix permissions for avatars
2016-06-10 17:02:11 +02:00
Vincent Petry
ffb2838dd8
Merge pull request #25055 from owncloud/enc-cappedcache-getaccesslist
...
Use capped cache for encryption's user access list
2016-06-10 15:35:39 +02:00
Jörn Friedrich Dreyer
c14198b874
fetchall appconfig entries ( #23835 )
2016-06-10 15:20:22 +02:00
Jörn Friedrich Dreyer
c668588e17
map oracle driver options to params ( #23938 )
2016-06-10 14:07:31 +02:00
Vincent Petry
77caa0e913
Use capped cache for encryption's user access list
2016-06-10 13:02:41 +02:00
Roeland Jago Douma
28d9ad2817
Empty string is null on oracle
2016-06-10 12:44:49 +02:00
Roeland Jago Douma
1b66db72d9
Repair job to fix permissions for avatars
...
Fixes #22978
On some older installations the permissions for the userRoot and the
avatars are not correct. This breaks since we now use the Node API in
the avatar code.
This repair job makes sure that the permissions are set correctly.
* Unit tests added
2016-06-10 12:44:49 +02:00
Vincent Petry
a0d8702a1c
Merge pull request #25051 from owncloud/2fa-raw-php-files
...
Check 2FA state for raw php files too
2016-06-10 11:56:21 +02:00
Vincent Petry
68c3b23e04
Merge pull request #24080 from owncloud/support-calendar-class-property
...
Extract CLASS property from calendar object and store it in the database
2016-06-10 11:22:11 +02:00
Vincent Petry
d81dac24aa
Merge pull request #25025 from owncloud/clear_old_calendar_shares
...
Add repair step to clean old calendar shares
2016-06-10 10:42:04 +02:00
Christoph Wurst
7b3dc806eb
Check 2FA state for raw php files too
2016-06-10 09:52:52 +02:00
Jenkins for ownCloud
e8a66f8e7d
[tx-robot] updated from transifex
2016-06-10 05:55:19 +00:00
Arthur Schiwon
a636e4ff28
Downstream 2016-06-09
...
Merge branch 'master' of https://github.com/owncloud/core into downstream-160609
2016-06-09 18:45:12 +02:00
blizzz
51fd2602a7
Revert "Downstream 2016-06-08"
2016-06-09 17:41:57 +02:00
Vincent Petry
6ba18934e6
Merge pull request #25000 from owncloud/fix-email-login-dav
...
Allow login by email address via webdav as well
2016-06-09 16:28:06 +02:00
Roeland Jago Douma
7d51fd0310
Add repair step to clean old calendar/contact shares
...
fixes #21889
2016-06-09 15:48:45 +02:00
Bjoern Schiessle
bb54ab0db8
add hide file list option
2016-06-09 15:15:17 +02:00
Jenkins for ownCloud
6aab7d7232
[tx-robot] updated from transifex
2016-06-09 14:00:02 +02:00
Robin Appelman
49db29727c
make sure $data['mtime'] is always a timestamp
2016-06-09 14:00:02 +02:00
Robin Appelman
7970ff2099
don't update storage mtime if we can't get the modified date
2016-06-09 14:00:01 +02:00
Robin Appelman
ea6921da3b
Ignore forbidden files while scanning
2016-06-09 14:00:01 +02:00
Robin Appelman
bee918693a
dissalow symlinks in local storages that point outside the datadir
2016-06-09 14:00:01 +02:00
Joas Schilling
4f27c2c433
Allow to decrypt user '0' files only
2016-06-09 14:00:00 +02:00
Christoph Wurst
60e15e934c
do not generate device token if 2FA is enable for user
2016-06-09 14:00:00 +02:00
Joas Schilling
0041d89dc2
Do not allow to store boolean configs, they behave unexpected on postgres
2016-06-09 13:59:58 +02:00
Robin Appelman
18f7cede51
Fix warnings when trying to get mtime of non existing files
2016-06-09 13:59:58 +02:00
Robin Appelman
f4831f4074
return success when deleting ghost files
2016-06-09 13:59:58 +02:00
Robin Appelman
67c2c85b05
allow deleting "ghost files" trough the View and Node api
2016-06-09 13:59:58 +02:00
Thomas Müller
f20c617154
Allow login by email address via webdav as well - fixes #24791
2016-06-09 12:08:49 +02:00
Vincent Petry
90c1ec1c49
Merge pull request #25014 from owncloud/admin-datadircheck-fix
...
Use temporary htaccesstest.txt for data dir security check
2016-06-09 11:58:28 +02:00
Vincent Petry
826e276a79
Merge pull request #24973 from owncloud/token-password-session-token
...
When creating a session token, make sure it's the login password and …
2016-06-09 11:58:04 +02:00
Thomas Müller
369c3b5d7e
Implement classification migration as repair step
2016-06-09 11:09:14 +02:00
Vincent Petry
aca4ea12c1
Merge pull request #24826 from owncloud/cors-client-login
...
use client login method on CORS routes
2016-06-09 10:31:14 +02:00
Vincent Petry
0e3737ffe1
Merge pull request #25028 from owncloud/scanner-user-not-setup
...
skip scanning for a user when the user is not setup yet
2016-06-09 10:29:46 +02:00
Jan-Christoph Borchardt
81145ee57c
THIS IS NEXTCLOUD! adjusting the design
2016-06-08 17:02:18 +02:00
Joas Schilling
e49307014c
Do not log token or challenge with exception stacktrace ( #25026 )
...
* Make the filtering better readable
* Add some more methods to the sensitive list
2016-06-08 16:32:58 +02:00
Christoph Wurst
9997c431c3
use client login method on CORS routes
2016-06-08 15:18:53 +02:00
Christoph Wurst
46e26f6b49
catch sessionnotavailable exception if memory session is used
2016-06-08 15:03:15 +02:00
Robin Appelman
808438efc0
skip scanning for a user when the user is not setup yet
2016-06-08 14:19:42 +02:00
Christoph Wurst
ec929f07f2
When creating a session token, make sure it's the login password and not a device token
2016-06-08 13:31:55 +02:00
Arthur Schiwon
39aeebfac5
Print error message again, when 3rdparty submodule is not initialized
...
- old code used Response which attempted to use OC::$server which is not
and cannot be intialised at this part of the code.
2016-06-08 10:34:32 +02:00
Vincent Petry
8d0948977e
Merge pull request #24899 from owncloud/local-storage-symlinks
...
dissalow symlinks in local storages that point outside the datadir
2016-06-08 10:19:24 +02:00
Vincent Petry
ed92f4c427
Merge pull request #24983 from owncloud/issue-23776-do-not-allow-boolean-user-config
...
Do not allow to store boolean configs, they behave unexpected on postgres
2016-06-08 10:14:08 +02:00
Vincent Petry
12683b786d
Merge pull request #24991 from owncloud/2fa-do-not-generate-token
...
do not generate device token if 2FA is enable for user
2016-06-08 10:13:04 +02:00
Vincent Petry
b7935dcebd
Merge pull request #24998 from owncloud/issue-24994-allow-decrypting-user-0-only
...
Allow to decrypt user '0' files only
2016-06-08 10:12:28 +02:00
Vincent Petry
87c150e2fb
Merge pull request #25005 from owncloud/parent-storage-time-cast
...
don't update storage mtime if we can't get the modified date
2016-06-08 09:57:17 +02:00
Jenkins for ownCloud
bbd61cd98a
[tx-robot] updated from transifex
2016-06-08 01:54:57 -04:00
Vincent Petry
fb087a0261
Use temporary htaccesstest.txt for data dir security check
2016-06-07 18:36:13 +02:00
Robin Appelman
2cf7ad8c55
make sure $data['mtime'] is always a timestamp
2016-06-07 17:09:24 +02:00
Robin Appelman
6822689e38
don't update storage mtime if we can't get the modified date
2016-06-07 15:04:24 +02:00
Robin Appelman
73547f29be
Ignore forbidden files while scanning
2016-06-07 14:01:55 +02:00
Robin Appelman
7b1b723e5b
dissalow symlinks in local storages that point outside the datadir
2016-06-07 14:01:53 +02:00
Vincent Petry
bf917d7063
Merge pull request #24813 from owncloud/delete-ghost-files
...
allow deleting "ghost files" trough the View and Node api
2016-06-07 09:34:16 +02:00
Joas Schilling
d4ba982131
Allow to decrypt user '0' files only
2016-06-07 09:13:11 +02:00
Christoph Wurst
8f7a4aaa4d
do not generate device token if 2FA is enable for user
2016-06-07 09:09:51 +02:00
Lukas Reschke
deef15a3c7
Remove "Help" link from personal sidebar
...
At the moment we want to hide the help link from the personal sidebar as it contains the original ownCloud documentation.
Once we have our own documentation with our proper branding and so on we can reenable this.
2016-06-06 18:40:15 +02:00
Joas Schilling
7d31ae9909
Fix second check for quota size ( #24989 )
2016-06-06 13:47:53 +02:00
Joas Schilling
911fd3ead4
Do not allow to store boolean configs, they behave unexpected on postgres
2016-06-06 12:38:20 +02:00
Jenkins for ownCloud
4234892a60
[tx-robot] updated from transifex
2016-06-04 02:01:18 -04:00
Robin Appelman
6bc8305edd
Fix warnings when trying to get mtime of non existing files
2016-06-03 13:35:27 +02:00
Robin Appelman
14f96f86e7
return success when deleting ghost files
2016-06-03 13:34:54 +02:00
Robin Appelman
63408fa6ef
allow deleting "ghost files" trough the View and Node api
2016-06-03 13:30:59 +02:00
Vincent Petry
eb6ae84cee
Merge pull request #24564 from owncloud/fix_21173_take_2
...
normalize path in getInternalPath
2016-06-03 10:50:18 +02:00
Jenkins for ownCloud
63132483ca
[tx-robot] updated from transifex
2016-06-03 02:19:30 -04:00
Georg Ehrke
89a10fdb2d
normalize path in getInternalPath
2016-06-02 19:11:35 +02:00
Robin Appelman
fce19d22d9
fix mtime propagation on sqlite
2016-06-02 15:43:43 +02:00
Vincent Petry
1ab7ee5e23
Merge pull request #24940 from owncloud/fix-normalizedcachekey-keepunicode
...
Add keepUnicode value in the cache key of normalizedPathCache
2016-06-02 15:18:13 +02:00
Robin Appelman
cc67ad4dda
use propagator batching in the scanner
2016-06-02 15:07:50 +02:00
Robin Appelman
9fb44e34af
add propagator batching
2016-06-02 15:07:47 +02:00