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
Joas Schilling
31bb65fa36
Check the name length of database items
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-16 16:16:11 +02:00
Joas Schilling
93fc7fcdbe
Check the syntax of the language file
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-16 16:16:07 +02:00
Roeland Jago Douma
0e66c2a38a
Do not scan for keys just get all the keys (with prefix)
...
Apparently scan leads to some issues sometimes on cluster. So just use
the get function to fetch the keys.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-16 09:52:05 +02:00
Roeland Jago Douma
6afd098a94
Cache deps list to memcache on write not on first read
...
Fixes #4886
Caching on first read leads to the bug that if the files are updated we
will never cache again. Since we will always fetch from the memcache
(which works) and then see that the files are newer.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-16 09:01:20 +02:00
Christoph Wurst
0a43c259c4
Fix encryption + remembered login due to missing login hook
...
The encryption app relies on the post_login hook to initialize its keys.
Since we do not emit it on a remembered login, the keys were always un-
initialized and the user was asked to log out and in again.
This patch *translates* the postRememberedLogin hook to a post_login
hook.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-16 08:41:11 +02:00
Morris Jobke
91dfff5db4
Revert "fix permissions of mountpoints - take 2"
2017-05-15 12:43:25 -05:00
Morris Jobke
ad0d0b0916
Merge pull request #4685 from nextcloud/fix_4683
...
fix permissions of mountpoints - take 2
2017-05-15 11:53:59 -05:00
Morris Jobke
3f201ec7f3
Merge pull request #4871 from nextcloud/remove-more-personal-info-on-user-deletion
...
Remove more personal info on user deletion
2017-05-15 11:03:33 -05:00
Lukas Reschke
79af585ecd
Merge pull request #4867 from nextcloud/kill-install-app
...
Remove OC_App:installApp
2017-05-15 18:01:12 +02:00
Morris Jobke
007748fb1e
Merge pull request #4810 from nextcloud/downstream-27668
...
Fix mimetype update query
2017-05-15 10:56:18 -05:00
Morris Jobke
c995bcd557
Merge pull request #4877 from nextcloud/oc-group-is-gone
...
Remove OC_Group call
2017-05-15 09:51:42 -05:00