Arthur Schiwon
499da044b6
don't pass User object when uid string is expected
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-27 17:51:22 +02:00
Morris Jobke
f6ccc1e0a1
Merge pull request #6554 from nextcloud/stable12-contacts_menu_privacy
...
[Stable12] contacts menu privacy
2017-09-27 15:32:29 +02:00
John Molakvoæ (skjnldsv)
892a427807
Do not stop on scss compilation failure
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-27 08:35:02 +02:00
Lukas Reschke
44ae66e7d2
Add filter for `shareapi_allow_share_dialog_user_enumeration`
...
This adjusts the contacts menu to also support searching by email address which is relevant in scenarios where no UID is known such as LDAP, etc.
Furthermore, if `shareapi_allow_share_dialog_user_enumeration` is disabled only results are shown that match the full user ID or email address.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-09-18 17:28:07 +02:00
Tobia De Koninck
005cd8ae42
Fix issue when disabling the shareapi_only_share_with_group_members option + fix findOne
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-18 17:27:51 +02:00
Tobia De Koninck
21e903cb31
Improve code style
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-18 17:27:47 +02:00
Tobia De Koninck
3409c364fe
Some code improvements
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-18 17:27:41 +02:00
Tobia De Koninck
d2d6ed5c97
Add tests
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-18 17:27:33 +02:00
Tobia De Koninck
88ccbef546
Fix tests
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-18 17:27:28 +02:00
Tobia De Koninck
6f4976fd4d
Privacy enhancements for contacts menu
...
- Groups, which are excluded from sharing should not see local users at all
- If sharing is restricted to users own groups, he should only see contacts from his groups:
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-18 17:27:24 +02:00
Roeland Jago Douma
71fdc43125
Pass new value to triggerChange
...
it is not used. but pass in the empty string (on delete) and the new
file (on create)
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-15 20:23:45 +02:00
Roeland Jago Douma
ab50f0b1de
Fix AppPassword 2FA auth
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-12 22:35:16 +02:00
Morris Jobke
cb6178b828
Merge pull request #6443 from nextcloud/backport-6064-absolute-path-must-be-relative-to-files-on-theming-update
...
[stable12] Still throw a locked exception when the path is not relative to $user/files/
2017-09-12 10:03:29 +02:00
Morris Jobke
3aae3a54e5
Merge pull request #6446 from nextcloud/backport-6414-share-notification-wrong-language
...
[stable12] Use the language of the recipient for the share notification
2017-09-12 09:40:19 +02:00
Morris Jobke
0c43183ac9
Merge pull request #6442 from nextcloud/backport-6416-make-sure-sqlite-works-without-content
...
[stable12] Ask the schema whether the table and column exist
2017-09-11 23:20:58 +02:00
Joas Schilling
2a6855a76d
Use the language of the recipient for the share notification
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-11 11:28:20 +02:00
Joas Schilling
d25ea6ae1c
Don't lock in the appdata_ directory
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-11 11:18:56 +02:00
Joas Schilling
9cae892974
Still throw a locked exception when the path is not relative to $user/files/
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-11 11:18:47 +02:00
Joas Schilling
e88a4a0b3d
Fix Nextcloud 12 compatibility
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-11 11:14:33 +02:00
Joas Schilling
6fd01c3993
Ask the schema whether the table and column exist
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-11 11:08:58 +02:00
Christoph Wurst
55c7aa674c
Fix failing csp/nonce check due to timed out session
...
The CSP nonce is based on the CSRF token. This token does not change,
unless you log in (or out). In case of the session data being lost,
e.g. because php gets rid of old sessions, a new CSRF token is gen-
erated. While this is fine in theory, it actually caused some annoying
problems where the browser restored a tab and Nextcloud js was blocked
due to an outdated nonce.
The main problem here is that, while processing the request, we write
out security headers relatively early. At that point the CSRF token
is known/generated and transformed into a CSP nonce. During this request,
however, we also log the user in because the session information was
lost. At that point we also refresh the CSRF token, which eventually
causes the browser to block any scripts as the nonce in the header
does not match the one which is used to include scripts.
This patch adds a flag to indicate whether the CSRF token should be
refreshed or not. It is assumed that refreshing is only necessary
if we want to re-generate the session id too. To my knowledge, this
case only happens on fresh logins, not when we recover from a deleted
session file.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-09-11 10:08:06 +02:00
Joas Schilling
287ebb52d5
Don't log LDAP password when server is not available
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-07 09:26:40 +02:00
Roeland Jago Douma
ef1c81188b
Merge pull request #6319 from nextcloud/improve_2fa-12
...
[stable12] Improve 2FA
2017-09-06 20:07:46 +02:00
Lukas Reschke
ad96c58e8b
Merge pull request #6368 from nextcloud/backport-5436-fix-group-check
...
[stable12] Fix group check on share provider
2017-09-06 17:19:15 +02:00
Roeland Jago Douma
dbcd549e35
Fix login with basic auth
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-06 17:07:11 +02:00
Jan-Philipp Litza
b35c039b77
Fix 500 Internal Server Error on writing
...
In some not yet completely determined configurations, the following error could occur while writing a file:
Error: Call to a member function getUsers() on null
/var/www/nextcloud/lib/private/Share20/Manager.php - line 1277: OC\Share20\DefaultShareProvider->getAccessList(Array, true)
/var/www/nextcloud/lib/private/Share20/ShareHelper.php - line 51: OC\Share20\Manager->getAccessList(Object(OC\Files\Node\Folder), true, true)
/var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 616: OC\Share20\ShareHelper->getPathsForAccessList(Object(OC\Files\Node\File))
/var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 196: OCA\Activity\FilesHooks->getUserPathsFromPath('/path/to/file', 'user')
/var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 157: OCA\Activity\FilesHooks->addNotificationsForFileAction('/path/to/file', 'file_changed', 'changed_self', 'changed_by')
/var/www/nextcloud/apps/activity/lib/FilesHooksStatic.php - line 55: OCA\Activity\FilesHooks->fileUpdate('/path/to/file')
/var/www/nextcloud/lib/private/legacy/hook.php - line 106: OCA\Activity\FilesHooksStatic fileUpdate(Array)
/var/www/nextcloud/lib/private/Files/View.php - line 1245: OC_Hook emit('OC_Filesystem', 'post_update', Array)
/var/www/nextcloud/lib/private/Files/View.php - line 1173: OC\Files\View->runHooks(Array, '/path/to/file', true)
/var/www/nextcloud/lib/private/Files/View.php - line 679: OC\Files\View->basicOperation('file_put_conten...', '/path/to/file', Array, '<?xml version="...')
/var/www/nextcloud/lib/private/Files/Node/File.php - line 64: OC\Files\View->file_put_contents('/path/to/file', '<?xml version="...')
[...]
Signed-off-by: Jan-Philipp Litza <janphilipp@litza.de>
2017-09-05 17:31:39 +02:00
Joas Schilling
6e7c37cbd3
Merge setMetaData into constructor
...
This ensures that the meta data is set in the beginning
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-05 16:04:09 +02:00
Roeland Jago Douma
faffebc718
Improve 2FA
...
* Store the auth state in the session so we don't have to query it every
time.
* Added some tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-31 10:54:10 +02:00
Bjoern Schiessle
181c77ca87
move repair step to stable12
...
because we decided to backport it the repair step needs to be executed
already on stable12
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-30 20:36:47 +02:00
Bjoern Schiessle
3e6833f5a6
add prefix to user and system keys to avoid name collisions
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-30 20:36:10 +02:00
Bjoern Schiessle
5f49398e13
extend the identity proof manager to allow system wide key pairs
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-30 20:36:10 +02:00
Lukas Reschke
5755897712
Inject \OCP\IURLGenerator to make tests work
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-30 14:42:50 +02:00
Lukas Reschke
245080e647
Properly allow \OCP\Authentication\IApacheBackend to specify logout URL
...
Any `\OCP\Authentication\IApacheBackend` previously had to implement `getLogoutAttribute` which returns a string.
This string is directly injected into the logout `<a>` tag, so returning something like `href="foo"` would result
in `<a href="foo">`.
This is rather error prone and also in Nextcloud 12 broken as the logout entry has been moved with
054e161eb5
inside the navigation manager where one cannot simply inject attributes.
Thus this feature is broken in Nextcloud 12 which effectively leads to the bug described at nextcloud/user_saml#112 ,
people cannot logout anymore when using SAML using SLO. Basically in case of SAML you have a SLO url which redirects
you to the IdP and properly logs you out there as well.
Instead of monkey patching the Navigation manager I decided to instead change `\OCP\Authentication\IApacheBackend` to
use `\OCP\Authentication\IApacheBackend::getLogoutUrl` instead where it can return a string with the appropriate logout
URL. Since this functionality is only prominently used in the SAML plugin. Any custom app would need a small change but
I'm not aware of any and there's simply no way to fix this properly otherwise.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-30 14:42:46 +02:00
Morris Jobke
7fd3068184
Add shareWith to email template metadata
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-29 16:05:12 +02:00
Morris Jobke
6f9c3ab8a6
Allow the expiration date to be set to null
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-28 17:47:51 +02:00
Joas Schilling
7df1ddcf2c
Add meta information to emails for better customisation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-28 17:33:35 +02:00
Maxence Lange
0d4803e6dc
using CircleProvider on token
...
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2017-08-23 16:58:32 +02:00
Roeland Jago Douma
a62620feeb
Merge pull request #6148 from nextcloud/backport-6047-select-indexed-columns
...
[stable12] Use indexed column path_hash to find the parent
2017-08-23 15:58:59 +02:00
Lukas Reschke
179b850e4d
Ensure log message is UTF-8 encoded
...
PHP's json_encode only accept proper UTF-8 strings, loop over all
elements to ensure that they are properly UTF-8 compliant or convert
them manually.
Without this somebody passing an invalid User Agent may make json_encode
return false which will get logged as empty newline.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-21 10:21:54 +02:00
Joas Schilling
ccb758ade3
Use indexed column path_hash to find the parent
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-16 10:49:30 +02:00
Roeland Jago Douma
745ad2f323
Fix copy from jailed storage
...
If we have a jailed storage we must also fix the internal path on copy.
Else we pass in the wrong path.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-10 08:07:00 +02:00
Morris Jobke
3f8e3fbb6b
Merge pull request #5946 from nextcloud/12-5897
...
[stable12] Send an email once a file/folder is shared with a user
2017-08-08 16:36:46 +02:00
Morris Jobke
e11dcfcf9e
Merge pull request #5966 from nextcloud/backport-oracle
...
[stable12] Fix oracle db
2017-08-08 16:34:25 +02:00
Morris Jobke
bf4283bce8
Merge pull request #5945 from nextcloud/stable12_5836
...
[stable12] Empty search no longer works
2017-08-08 10:41:05 +02:00
Morris Jobke
3313c682bf
Merge pull request #5925 from derkostka/patch-1
...
[stable12] Removed cast to integer in getSize
2017-08-08 10:40:09 +02:00
Joas Schilling
0476de0674
Don't throw an error when the table doesn't exist
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-07 09:43:45 +02:00
Joas Schilling
3a111adc33
Add a method to compare empty strings with an expression
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:41:03 +02:00
Joas Schilling
4f31860fd6
Fix repair step for oracle...
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:54 +02:00
Joas Schilling
d6e902fd03
Fix last failures with oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:46 +02:00
Joas Schilling
bb30b876ae
Fix ILIKE regex for oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:26 +02:00
Joas Schilling
c9430fbb77
Fix auth provider
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:17 +02:00
Joas Schilling
54a4aa9315
Use selectAlias()
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:10 +02:00
Joas Schilling
d6b888461d
Can not insert auto increment on oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:00 +02:00
Joas Schilling
5d7cab245f
Fix clob comparison
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:39:41 +02:00
Joas Schilling
5eef54c636
Quote aliases as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:39:21 +02:00
Joas Schilling
daa3cfcb70
Oracle does not support PDO::FETCH_KEY_PAIR
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:37:06 +02:00
Morris Jobke
cf16087585
Disable default activity email for incoming shares
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 20:57:12 +02:00
Morris Jobke
1ef19bb0ec
Send an email once a file/folder is shared with a user
...
* only if user has set an email address
* only for user shares (no group shares for now)
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-01 15:17:32 +02:00
Roeland Jago Douma
e73f46e344
Empty search no longer works
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 13:29:17 +02:00
Sebastian Kostka
09b120c6da
[Stable 12] Removed cast to integer in getSize
...
Fixes - Wrong or no sizes of files/folders #5031 for 32-bit systems a direct cast to integer causes problems.
Backport from #5744
Signed-off-by: Sebastian Kostka <sebastian.kostka@gmail.com>
2017-07-29 07:40:13 +02:00
Lukas Reschke
7425316b29
Merge pull request #5919 from nextcloud/add-brackets-on-concat-method
...
Add brackets around concat statements so comparing the result works a…
2017-07-28 15:35:49 +02:00
Joas Schilling
b8bd5808e8
Add brackets around concat statements so comparing the result works as intended
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-28 11:34:35 +02:00
Joas Schilling
690efbd4eb
Use the existing array of OC versions
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-27 12:30:24 +02:00
Joas Schilling
d06d86a719
Add a repair step to drop the account_terms table on oc migration
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-27 11:38:55 +02:00
Lukas Reschke
7568b04705
Add new bundle
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-26 11:47:15 +02:00
Morris Jobke
f45e4471f0
Remove unneeded styles
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-24 13:46:17 +02:00
Lukas Reschke
3353dbfab4
Adjust to height=120
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-24 13:46:09 +02:00
Artem Kochnev
3d54cef078
Fix for mb strlen
...
Error with moving files with long names in UTF-8
2017-07-22 11:10:25 +02:00
Morris Jobke
2663aa253e
Merge pull request #5826 from nextcloud/12-backport-5821
...
[stable12] Fix error message on untrusted domain error page
2017-07-21 23:35:46 +02:00
Morris Jobke
816f1e63e9
Merge pull request #5757 from nextcloud/mount-rename-12
...
[12] Fix renaming of non-renamble mounts
2017-07-21 23:30:42 +02:00
Morris Jobke
111844e7b1
Fix error message on untrusted domain error page
...
Fixes #5347
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-21 16:16:48 +02:00
Morris Jobke
c6e3368af7
Merge pull request #5786 from nextcloud/path-repair-steps-storage-12
...
[12] Also repair storage id's when repairing invalid entries
2017-07-21 14:03:38 +02:00
Joas Schilling
c6f57fe22d
Allow to overwrite the email template again
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-19 17:59:12 +02:00
Robin Appelman
9c2dce34e9
Also repair storage id's when repairing invalid entries
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-19 12:34:00 +02:00
Pauli Järvinen
22b29943ed
Fix emitting of legacy hook post_unshare
...
- When a file was unshared, the legacy hook pre_unshare fired twice and the hook post_unshare did not fire at all. This was obviously a copy-paste error.
Signed-off-by: Pauli Järvinen <pauli.jarvinen@gmail.com>
2017-07-19 11:42:23 +02:00
Robin Appelman
c17b07667e
Fix invalid path repair step not getting all invalid entries
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-18 14:03:41 +02:00
Robin Appelman
d7620e3970
non movable mounts can not be moved
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-17 15:40:45 +02:00
blizzz
b9d7c48acf
Merge pull request #5711 from nextcloud/null-user-exist-12
...
[12] null users dont exist
2017-07-14 12:38:27 +02:00
Morris Jobke
9a07f78480
Merge pull request #5710 from nextcloud/nested-permissions-mask-12
...
[12] Fix scan permissions with nested permissions masks
2017-07-13 23:42:15 +02:00
Morris Jobke
90972044b1
Merge pull request #5655 from nextcloud/moveFromCache-from-shared-12
...
[12] fix moving folders out of a cache jail
2017-07-13 16:35:57 +02:00
Robin Appelman
ce45f87699
null users dont exist
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 15:54:16 +02:00
Morris Jobke
61bac5637f
Merge pull request #5697 from nextcloud/stable12-4984
...
Write cert bundle to tmp file first
2017-07-13 15:08:37 +02:00
Robin Appelman
5804dfc078
Fix scan permissions with nested permissions masks
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 14:37:09 +02:00
Robin Appelman
069df4c8cb
chunk getting invalid paths and reuse queries
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 13:08:24 +02:00
Robin Appelman
95e17a8245
use a generator instead of fetching all rows at once
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 13:08:24 +02:00
Robin Appelman
64d0a0ffc9
adjust to moved repair step
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 13:08:23 +02:00
Morris Jobke
d422875ae4
Run repair step only once
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-13 13:08:23 +02:00
Robin Appelman
92b14fa8c0
Add repair step for invalid paths
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 13:08:23 +02:00
Robin Appelman
996269cfdd
fix moving folders out of a cache jail
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 13:08:23 +02:00
Roeland Jago Douma
fe7c907e8c
Write cert bundle to tmp file first
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-12 20:21:27 +02:00
Roeland Jago Douma
38ee24d56b
Merge pull request #5687 from nextcloud/jail-propagator-12
...
[12] Fix propagating changes within jail wrapper
2017-07-12 11:50:10 +02:00
Maxence Lange
7464996c56
verify that circles is installed
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 20:21:06 +02:00
Robin Appelman
2f7d0bbb18
Fix propagating changes within jail wrapper
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-11 19:20:51 +02:00
Joas Schilling
43964d99ee
Add a flag to allow checking if SVGs are okay
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-07 11:16:37 +02:00
Morris Jobke
36e3f3cc2a
Merge pull request #5617 from nextcloud/backport-5615-fix-navigation-entries-for-group-restricted-apps
...
[stable12] Don't load navigation entries of restricted apps
2017-07-07 10:46:11 +02:00
Joas Schilling
79f6773ef9
Don't log passwords on dav exceptions
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 15:10:38 +02:00
Joas Schilling
20091a21c9
Don't load navigation entries of restricted apps
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 15:07:56 +02:00
Joas Schilling
8b2d9251fd
Merge pull request #5584 from nextcloud/stable12-5429
...
[stable12] Use base url for cache prefix and SCSS caching
2017-07-05 11:30:08 +02:00
Robin Appelman
a277101133
improved logging of objectore errors
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-04 11:14:41 +02:00
Julius Härtl
0c6e4edc19
Fix theming app to also use the prefix
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-07-02 14:03:35 +02:00
Julius Härtl
d9f83bac0f
Add tests and inject IRequest
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-07-02 14:03:35 +02:00
Julius Härtl
4c3b27da5c
Do not open version file again
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-07-02 14:03:35 +02:00
Julius Härtl
3801c3aa3f
Make cache and scss caching depend on the baseUrl
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-07-02 14:03:35 +02:00
Morris Jobke
8550fdf757
Merge pull request #5507 from derkostka/stable12
...
[stable12] Use realpath to obtain the webroot
2017-06-23 15:43:15 -05:00
blizzz
0f7cb1fd65
Merge pull request #5509 from nextcloud/backport-5498-allow-to-force-a-language
...
[stable12] Allow to force a language and set it via the ocs api
2017-06-23 14:24:05 +02:00
Joas Schilling
7257206bcf
Create users in non default backends first
...
Most of the time, when people have multiple backends or add a
custom backend, they want to create the users there and not in
the default backend. But since that is registered first, users
were always created there.
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-22 13:02:53 +02:00
Joas Schilling
4d18757a85
Allow to force a language and set it via the ocs api
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-22 09:54:39 +02:00
Sebastian Kostka
f0753cb56d
[stable12] Use realpath to obtain the webroot
...
Use realpath to obtain the webroot - backport
Signed-off-by: Sebastian Kostka sebastian.kostka@gmail.com
2017-06-22 08:37:11 +02:00
Arthur Schiwon
2ffdfeec28
Forward port of #5190 to stable12
...
Treat PHP Errors on User session regenerate
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
remove unnecessary lines…
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
change PHP errors to ErrorException in the session (PHP >=7)
Otherwise it might be that authentication apps are being disabled on
during operation while in fact the session handler has hiccup.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-15 11:18:22 +02:00
Morris Jobke
11d9722474
Merge pull request #5397 from nextcloud/stable12-5072
...
[stable12] Fixed a crash caused by Local::copyFromStorage() not conforming to Co…
2017-06-14 11:30:38 -05:00
Lukas Reschke
fbeb6659f8
Merge pull request #5362 from nextcloud/exclude-files-external-dir-from-encryption-stable12
...
[stable12] don't try to encrypt/decrypt the certificate bundle
2017-06-14 09:50:28 +02:00
Michael Munger
513401bdb6
Fixed a crash caused by Local::copyFromStorage() not conforming to Common::copyFromStorage. Issue# 5071
2017-06-13 18:05:16 -05:00
Joas Schilling
49c71bdbcb
Fix unknown share token
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 18:53:52 +02:00
Robin Appelman
86c749349e
filter missing groups in share provider
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-13 10:54:02 +02:00
Bjoern Schiessle
4d84249ab7
don't try to encrypt/decrypt the certificate bundle
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-13 10:07:55 +02:00
rakekniven
e7e0d1b8a1
Update setupchecks.js
...
Fixed typo and removed doclink symbol.
Reported at transifex
Update util.php
Another l10n improvement from transifex.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-12 17:18:20 -05:00
Lukas Reschke
26fe83aad8
Theme image for favicon-fb.png
...
Fixes https://github.com/nextcloud/server/issues/5322
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-06-09 21:13:56 +02:00
Björn Schießle
52f6c22954
Merge pull request #5224 from nextcloud/useful-gs-settings-stable12
...
[stable12] add new config switched for the global scale architecture
2017-06-02 20:18:45 +02:00
blizzz
2d15803a82
Merge pull request #5216 from nextcloud/5213-stable12
...
[stable12] Trigger changeUser hook only on real changes
2017-06-02 13:16:16 +02:00
Bjoern Schiessle
6e7ff24474
add new config switched for the global scale architecture
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-02 11:00:08 +02:00
Arthur Schiwon
0d893f09c4
fix install on mb4 enabled mariadb/mysql
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-01 13:12:30 +02:00
Arthur Schiwon
c1f4191a77
emit changeUser only if there really was a change (quota, displayname)
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-01 13:08:23 +02:00
Joas Schilling
628a98ed62
Register the autoloading earlier so we can load the background jobs
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-26 12:53:33 +02:00
Roeland Jago Douma
cf1f77537d
Set SCSS dependencies to memcache on compile
...
Else when an upgrade happens we will recompile all the SCSS files all
the time (until the cache expires).
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-21 22:12:47 +02:00
Joas Schilling
fa95fb6862
Fix missing argument 2 for Settings classes
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-19 22:30:55 +02:00
Lukas Reschke
cc2d06606d
Merge pull request #4957 from nextcloud/backport-4956-resource-loading-for-ever
...
[stable12] Stop infinit loop on invalid settings css/js file
2017-05-19 16:59:55 +02:00
Joas Schilling
aa83127686
Allow automatic DI for apps that don't register the container in app.php
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-19 13:49:36 +02:00
Joas Schilling
8a570aebf6
Stop infinit loop on invalid settings css/js file
...
Don't try to find dirname of false...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-19 11:40:10 +02:00
Lukas Reschke
7976927628
Merge pull request #4894 from nextcloud/generic-security-activities
...
Change 2FA activities to more generic security activities
2017-05-19 00:50:44 +02:00
Lukas Reschke
8c624bdef9
Merge pull request #4792 from nextcloud/fix-storage-wrappers-on-scanner
...
Make sure we use the passed-in storage when there is one
2017-05-19 00:49:58 +02:00
Lukas Reschke
0eb4970ec8
Merge pull request #4704 from nextcloud/add-oauth-code-flow-support
...
Add oauth code flow support
2017-05-18 23:30:44 +02:00
Christoph Wurst
0928b5f621
Change 2FA activities to more generic security activities
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-18 22:10:57 +02:00
Lukas Reschke
77827ebf11
Rename table back to lowercase
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:09 +02:00
Bjoern Schiessle
1eb7f4956b
delete auth token when client gets deleted
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-18 20:49:07 +02:00
Lukas Reschke
5f71805c35
Add basic implementation for OAuth 2.0 Authorization Code Flow
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:03 +02:00
Robin Appelman
1f1e1b0d00
use unmasked permissions during scanning
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-18 16:38:54 +02:00
Joas Schilling
682a57d50e
Copy avatars to the new location
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-18 10:49:04 +02:00
Joas Schilling
c90d56748f
We want to see 1 in 100 messages, not all but the 100th
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-18 10:49:04 +02:00
Joas Schilling
e1b5d20b3b
Fix updating from some 11 versions when people didn't update
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-18 10:49:04 +02:00
Joas Schilling
dd6c9cb03d
Allow migrating from ownCloud 10.0.0
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-18 10:49:04 +02:00
Joas Schilling
2259140e3b
Add some more casting
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-18 10:49:04 +02:00
Joas Schilling
0e325756c3
Avoid problems for some DBs by removing the table completly
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-18 10:49:03 +02:00
Joas Schilling
c6a5a25b48
Add a migration step to save the data from the accounts table before migrating
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-18 10:48:54 +02:00
Lukas Reschke
fb45767524
Merge pull request #4892 from nextcloud/fix/encryption-remembered-login-hook
...
Fix encryption + remembered login due to missing login hook
2017-05-17 22:21:09 +02:00
Julius Härtl
d3865b6096
Use appdata logo when generating icons
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 10:14:37 +02:00
Morris Jobke
3a70ebfe02
Merge pull request #4767 from nextcloud/app-code-checker
...
Check language files and database schema with app code checker
2017-05-16 16:20:27 -05:00
Morris Jobke
aa077d737f
Merge pull request #4893 from nextcloud/fix_4886
...
Cache deps list to memcache on write not on first read
2017-05-16 10:30:59 -05:00
Morris Jobke
78e6c2dea4
Merge pull request #4666 from nextcloud/enable-redis-cluster
...
Add redis cluster tests to our CI jobs
2017-05-16 10:10:25 -05:00
Joas Schilling
1951c88bdc
We don't use the prefix on index names
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-16 16:16:12 +02:00
Joas Schilling
8e757b343d
Fix apps without translations
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-16 16:16:11 +02:00