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
Nextcloud bot
00256ee18e
[tx-robot] updated from transifex
2017-06-22 00:08:46 +00:00
Nextcloud bot
99d04b1917
[tx-robot] updated from transifex
2017-06-21 00:08:24 +00:00
Nextcloud bot
0277400618
[tx-robot] updated from transifex
2017-06-20 00:08:51 +00:00
Nextcloud bot
deaa8b6885
[tx-robot] updated from transifex
2017-06-19 00:08:29 +00:00
Nextcloud bot
0e608188d2
[tx-robot] updated from transifex
2017-06-17 00:08:36 +00:00
Nextcloud bot
3cb59ac602
[tx-robot] updated from transifex
2017-06-16 00:08:53 +00: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
Nextcloud bot
1965889fc8
[tx-robot] updated from transifex
2017-06-15 00:08:52 +00:00
Morris Jobke
ec89aaa67a
Merge pull request #5416 from nextcloud/stable12-5392
...
[stable12] Use the guest.css for the maintenance page as well
2017-06-14 18:04:06 -05: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
Morris Jobke
c603f54a1b
Use the guest.css for the maintenance page as well
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-14 11:10:20 -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
Nextcloud bot
426a4c11d6
[tx-robot] updated from transifex
2017-06-14 00:08:49 +00: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
Joas Schilling
eb22d392d8
Merge pull request #5355 from nextcloud/stable12-5167
...
[stable12] l10n improvements from transifex
2017-06-13 10:20:26 +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
Nextcloud bot
e0d8b17b20
[tx-robot] updated from transifex
2017-06-13 00:08:32 +00: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
Morris Jobke
0b5efcfaca
Merge pull request #5324 from nextcloud/stable12-use-touch-icon-for-favicon-fb.png
...
[stable12] Theme image for favicon-fb.png
2017-06-12 15:28:42 -05:00
Nextcloud bot
acda3a2403
[tx-robot] updated from transifex
2017-06-12 00:08:21 +00:00
Nextcloud bot
ea39d4feec
[tx-robot] updated from transifex
2017-06-11 00:08:31 +00:00
Nextcloud bot
b11d197d52
[tx-robot] updated from transifex
2017-06-10 00:08:47 +00: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
Nextcloud bot
6434305333
[tx-robot] updated from transifex
2017-06-09 00:08:34 +00:00
Nextcloud bot
d00c5886aa
[tx-robot] updated from transifex
2017-06-08 00:08:37 +00:00
Nextcloud bot
85418640b3
[tx-robot] updated from transifex
2017-06-07 00:09:14 +00:00
Morris Jobke
3cae858852
Update autoloader
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-06 08:01:52 -05:00
Nextcloud bot
7ff205cf94
[tx-robot] updated from transifex
2017-06-06 00:08:55 +00:00
Nextcloud bot
cf3988e248
[tx-robot] updated from transifex
2017-06-04 00:08:39 +00:00
Nextcloud bot
5d6345ea4b
[tx-robot] updated from transifex
2017-06-03 00:09:12 +00: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
blizzz
d2734c6dbe
Merge pull request #5217 from nextcloud/5209-stable12
...
[stable12] fix install on mb4 enabled mariadb/mysql
2017-06-02 13:11:33 +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
Nextcloud bot
577ea59968
[tx-robot] updated from transifex
2017-06-02 00:08:40 +00: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
Nextcloud bot
db22c42e78
[tx-robot] updated from transifex
2017-06-01 00:08:48 +00:00
Joas Schilling
bb583580d7
Merge pull request #5127 from nextcloud/backport-5090-fixing-missing-background-jobs-on-app-update
...
[stable12] Register the autoloading earlier so we can load the background jobs
2017-05-31 11:19:21 +02:00
Nextcloud bot
6ae58b6dcb
[tx-robot] updated from transifex
2017-05-30 00:08:54 +00:00
Nextcloud bot
2e223cd1dc
[tx-robot] updated from transifex
2017-05-27 00:08:42 +00: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
Nextcloud bot
0ed02da5dd
[tx-robot] updated from transifex
2017-05-26 00:08:26 +00:00
Nextcloud bot
13d1c95db1
[tx-robot] updated from transifex
2017-05-25 00:08:13 +00:00
Nextcloud bot
9055109243
[tx-robot] updated from transifex
2017-05-24 00:08:31 +00:00
Roeland Jago Douma
446559979c
Merge pull request #5017 from nextcloud/stable12-5016
...
[stable12] Reset opcache if update is detected
2017-05-23 11:36:57 +02:00
Nextcloud bot
6e005e0ffa
[tx-robot] updated from transifex
2017-05-23 00:08:39 +00:00
Nextcloud bot
9325003a72
[tx-robot] updated from transifex
2017-05-22 00:08:32 +00:00
Morris Jobke
3c832f201f
Reset opcache if update is detected
...
This even works if opcache_reset is in the disabled_functions php.ini setting.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-21 18:40:53 -05: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
Nextcloud bot
df61c9e283
[tx-robot] updated from transifex
2017-05-20 00:08:37 +00: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
Nextcloud bot
e14bd212f7
[tx-robot] updated from transifex
2017-05-19 00:08:36 +00: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
Roeland Jago Douma
19a1e01d6c
Update autoloader
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-18 22:11:29 +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
Nextcloud bot
d41fd7471c
[tx-robot] updated from transifex
2017-05-18 00:07:48 +00: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
Lukas Reschke
6e6327ec74
Merge pull request #4923 from nextcloud/backgroundjobs-wording
...
Change cron wording to background jobs
2017-05-17 20:38:03 +02:00
Nextcloud bot
11e04e394d
[tx-robot] updated from transifex
2017-05-17 15:56:32 +00: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
Jan-Christoph Borchardt
43cfad705c
Change cron wording to background jobs
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-05-16 21:12:28 +02: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
Nextcloud bot
7d1f362aa0
[tx-robot] updated from transifex
2017-05-16 00:08:08 +00: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
Morris Jobke
d8f13dfe74
Merge pull request #4847 from nextcloud/throw-exception-if-password-not-avail
...
Throws exception if password not available
2017-05-15 09:50:28 -05:00
Morris Jobke
8c5062794f
Merge pull request #4873 from nextcloud/check-whether-REQUEST-exists
...
Check whether the $_SERVER['REQUEST_*'] vars exist before using them
2017-05-15 09:49:11 -05:00
Lukas Reschke
6ff40e64fb
Remove OC_Group call
...
OC_Group has been removed in March with https://github.com/nextcloud/server/pull/4867 , the check in question is also performed two lines below already.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-15 14:52:40 +02:00
Joas Schilling
72c1b24844
Check whether the $_SERVER['REQUEST_*'] vars exist before using them
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-15 14:33:27 +02:00
Lukas Reschke
8e7cff2eac
Merge pull request #4805 from nextcloud/enforce-upgrade-for-big-instances
...
Allow to enforce update via web UI
2017-05-15 14:28:28 +02:00
Lukas Reschke
9d920ef9b2
Update autoloader map
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-15 14:24:44 +02:00
Joas Schilling
975e572a3d
Remove account data on user deletion
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-15 13:31:31 +02:00
Joas Schilling
c56c98183d
Merge pull request #4862 from coderkun/issue-440-localhost-regex
...
Add IPv6 to “localhost” regex (#440 )
2017-05-15 12:45:39 +02:00
Joas Schilling
00ebd5c184
Fix variable names
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-15 12:38:30 +02:00
Morris Jobke
be33234266
Remove OC_App:installApp
...
* uses Installer->installApp now
* removes unused code
* fixes #4453
* added some additional checks
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-15 00:03:35 -05:00
Nextcloud bot
9ad57cabc8
[tx-robot] updated from transifex
2017-05-15 00:08:14 +00:00
coderkun
bdc7bb1f26
Add IPv6 to “localhost” regex ( #440 )
...
Signed-off-by: Oliver Hanraths <olli@coderkun.de>
2017-05-14 21:29:03 +02:00
Nextcloud bot
b1bd9ff0b9
[tx-robot] updated from transifex
2017-05-14 00:07:54 +00:00
Morris Jobke
6bc2be991e
Thows exception if password not available
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-12 12:53:29 -05:00
Morris Jobke
3bf9503070
Merge pull request #4816 from nextcloud/Ardinis-quota-files_external
...
Correctly calculate used space for quota with external storage
2017-05-12 11:33:54 -05:00
Ardinis
40560ca98d
Correctly calculate used space for quota with external storage
...
issue #4348
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-12 11:32:12 -05:00
Lukas Reschke
48a9a4bd81
Merge pull request #4825 from nextcloud/add-timeout-appstore
...
Add timeout for requests to appstore
2017-05-12 12:37:18 +02:00
Lukas Reschke
22dff1974f
Merge pull request #4824 from nextcloud/log-connection-problems-appfetcher
...
Log connectiong problems while fetching data from appstore
2017-05-12 12:30:17 +02:00
Joas Schilling
fd75c08238
Fix order of parameter and escaping
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 09:33:51 +02:00
Nextcloud bot
645f0aa96f
[tx-robot] updated from transifex
2017-05-12 00:07:46 +00:00
Morris Jobke
72943c99a4
Add timeout for requests to appstore
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-11 17:49:03 -05:00
Morris Jobke
c90d832ce4
Log connectiong problems while fetching data from appstore
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-11 17:46:41 -05:00
Morris Jobke
caa0ae94e8
Proper logging for appstore updates
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-11 13:35:17 -05:00
Morris Jobke
3fa604cc5e
Allow to enforce update via web UI
...
* adds a disclaimer that an update via web UI is on own risk
* allows to skip the warning
* fixes #4353
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-11 10:22:44 -05:00
Lukas Reschke
23b6f0e4d7
Merge pull request #4804 from nextcloud/proper-upgrade-size
...
Properly decide on actual users if instance is too big
2017-05-11 17:10:45 +02:00
Joas Schilling
65efb388e6
Actually we want to update the mimetype of all files ending with the suffix
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-11 10:58:21 +02:00
Rello
f1ef5fc537
don´t change folders with --repair-filecache
...
check if folder is "httpd/unix-directory" and don´t perform here #27585
2017-05-11 10:40:48 +02:00
Morris Jobke
abe4a19cbc
Properly decide on actual users if instance is too big
...
* state the reason why NC thinks it is a big instance
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-10 22:32:42 -05:00
Nextcloud bot
241226c23c
[tx-robot] updated from transifex
2017-05-11 00:08:08 +00:00
Morris Jobke
167013dbf9
Merge pull request #4783 from nextcloud/lite-application-classes
...
Use automatic injection for appdata folders
2017-05-10 17:31:05 -05:00
Morris Jobke
d73c8d0981
Use distributed cache for SCSS dependencies as well
...
* followup to #3978 because with the proper setup of
appdata we now are using the same data on all nodes
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-10 13:31:45 -05:00
Morris Jobke
74d742ba6d
Setup root FS for multibucket object storage
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-10 13:21:35 -05:00
Joas Schilling
cd2b567c21
Make sure we use the passed-in storage when there is one
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 15:45:18 +02:00
Joas Schilling
253057355c
Fix missing placeholder for doc link
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 11:45:08 +02:00
Joas Schilling
538d32fe87
Automatic injection into the Fetchers
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 09:56:38 +02:00
Joas Schilling
ca39940614
Automatic creation of Identity manager
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 09:45:11 +02:00
Nextcloud bot
fb78774eb8
[tx-robot] updated from transifex
2017-05-10 00:08:31 +00:00
Roeland Jago Douma
5a61a794d4
Do not write and read rootcerts.crt at the same time
...
(Possibly) fixes #3470
When updating the main file /files_external/rootcerts.crt we should not
read from /files_external/rootcerts.crt at the same time.
For 2 reasons: writing to a file and reading from it at the same time
can have non deterministic results
And we don't want all the certificates to appear 2 times in there.
This isn't caught by our standard file locking (that does not allow this
actually) because it is in a non locked path....
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-09 13:00:07 +02:00
Lukas Reschke
62f2610129
Merge pull request #4736 from nextcloud/richdef-opengraph
...
open-graph
2017-05-09 11:15:55 +02:00
Joas Schilling
a089e08411
Add circle as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-09 10:45:10 +02:00
Roeland Jago Douma
07fe15eea5
Merge pull request #4705 from nextcloud/htaccess-upload
...
Proper exception for upload of .htaccess file via WebDAV
2017-05-09 10:35:38 +02:00
Maxence Lange
90b1c73e81
my name as author
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-05-09 07:14:52 -01:00
Maxence Lange
93e4bd3495
using title as name
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-05-09 07:10:16 -01:00
Roeland Jago Douma
dfa3aaa0c6
Merge pull request #4753 from nextcloud/fix-links-on-error-page
...
Fix escaped HTML on error pages
2017-05-09 08:45:11 +02:00
Roeland Jago Douma
888e719671
Merge pull request #4750 from nextcloud/allow-requests-to-manifest-json
...
Don't redirect requests to /core/img/manifest.json
2017-05-09 08:43:35 +02:00
Morris Jobke
9309217ecb
Fix escaped HTML on error pages
...
* fixes #4655
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-08 21:16:08 -05:00
Morris Jobke
f8044cbbce
Proper exception for upload of .htaccess file via WebDAV
...
* fixes #2860
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-08 20:03:41 -05:00
Nextcloud bot
f6a4028fad
[tx-robot] updated from transifex
2017-05-09 00:07:51 +00:00
Lukas Reschke
ccd0ded812
Don't redirect requests to /core/img/manifest.json
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-09 00:02:37 +02:00
Nextcloud bot
9d8e9b1efb
[tx-robot] updated from transifex
2017-05-08 20:49:06 +00:00
Lukas Reschke
c28fe270b6
Merge pull request #4727 from stffabi/IncreaseDeviceEntropy
...
Increase device password entropy.
2017-05-08 17:49:52 +02:00
Maxence Lange
ce2afca0e4
open-graph
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-05-08 11:57:41 -01:00
Lukas Reschke
099234cf12
Add function to request SVG or regular fallback image
...
Fixes https://github.com/nextcloud/server/issues/4647
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-08 14:51:55 +02:00
Fabrizio Steiner
f2a2b34e46
Increase device password entropy. Use lower- and upper-case characters and digits, but exclude ambiguous characters. The number of digits has also been increased to 25.
...
Signed-off-by: Fabrizio Steiner <fabrizio.steiner@gmail.com>
2017-05-08 14:04:40 +02:00
Lukas Reschke
4d101ca2be
Merge pull request #4514 from nextcloud/automatic-mysql-4byte-detection
...
Automatic mysql 4byte detection
2017-05-08 12:18:40 +02:00
Lukas Reschke
69c5bcd804
Merge pull request #4719 from nextcloud/error-page-theming
...
ensure theming app is loaded when showing an error page
2017-05-08 11:51:34 +02:00
Nextcloud bot
6109afc14d
[tx-robot] updated from transifex
2017-05-08 00:07:37 +00:00
Nextcloud bot
56bb8745df
[tx-robot] updated from transifex
2017-05-07 00:07:31 +00:00
Robin Appelman
f12cd19c34
ensure theming app is loaded when showing an error page
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-06 17:50:48 +02:00
Nextcloud bot
59ee22101f
[tx-robot] updated from transifex
2017-05-06 00:07:33 +00:00
Robin Appelman
2b0da0f218
handle permissions errors when copying the skeleton for a read only user
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-05 14:44:51 +02:00
Nextcloud bot
619d09529c
[tx-robot] updated from transifex
2017-05-05 00:07:28 +00:00
Morris Jobke
7f46898dad
Compatibility with Redis and RedisCluster
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-04 12:42:58 -03:00
Julius Härtl
d72706861d
IGroup::getDisplayName is available version 12, not 11 (9.2)
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-04 12:06:03 +02:00
Roeland Jago Douma
e5960fe260
Revert "Revert "fix permissions of mountpoints""
...
This reverts commit 70a0e9c2d3
.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-04 08:41:54 +02:00
Morris Jobke
70a0e9c2d3
Revert "fix permissions of mountpoints"
2017-05-04 00:09:09 -03:00
Nextcloud bot
806aeae71d
[tx-robot] updated from transifex
2017-05-04 00:07:29 +00:00
Nextcloud bot
3dbf30c220
[tx-robot] updated from transifex
2017-05-03 00:07:31 +00:00
Morris Jobke
aa39f9b8fc
Merge pull request #4623 from nextcloud/fileinfo-mount-permissions
...
fix permissions of mountpoints
2017-05-02 17:28:33 -03:00
Roeland Jago Douma
24ff230f93
Merge pull request #4620 from nextcloud/preview-error-handling
...
better handling of preview generation errors
2017-05-02 21:49:14 +02:00
Lukas Reschke
121cb4bcfc
Merge pull request #4659 from nextcloud/fix/ignore-empty-email-contacts-menu
...
Do not show an email action for contacts with emtpy email addresses
2017-05-02 17:02:16 +02:00
Morris Jobke
705483e712
Merge pull request #4651 from nextcloud/fix_appfetcher_update
...
Make sure the AppFetcher fetches the new applist from the appstore
2017-05-02 10:45:04 -03:00
Christoph Wurst
b13c741cb3
Do not show an email action for contacts with emtpy email addresses
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-02 14:12:04 +02:00
Morris Jobke
6aac094091
Add PHPDoc
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-02 13:43:47 +02:00
Robin Appelman
4dfd90abc4
better handling of preview generation errors
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-02 13:43:47 +02:00
Roeland Jago Douma
e79424932a
Make sure the AppFetcher fetches the new applist from the appstore
...
When in the upgrade process the version in the config is still the old
version. (Since we only upgrade it after the upgrade is complete).
However the app list fetched from the appstore must be the new list.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-02 10:24:10 +02:00
Lukas Reschke
d4217830c6
Merge pull request #4649 from nextcloud/update-links-to-12
...
Update documentation go.php URL to 12
2017-05-02 10:09:57 +02:00
Roeland Jago Douma
095463d568
Do not do ETag caching when the version is updated
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-02 08:44:20 +02:00
Lukas Reschke
6458875dc1
Update documentation go.php URL to 12
...
Fixes https://github.com/nextcloud/server/issues/4646
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-02 08:17:59 +02:00
Nextcloud bot
f27d382c47
[tx-robot] updated from transifex
2017-05-02 00:07:20 +00:00
Lukas Reschke
a5ccb31e85
Mark IP as whitelisted if brute force protection is disabled
...
Currently, when disabling the brute force protection no new brute force attempts are logged. However, the ones logged within the last 24 hours will still be used for throttling.
This is quite an unexpected behaviour and caused some support issues. With this change when the brute force protection is disabled also the existing attempts within the last 24 hours will be disregarded.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-01 18:31:45 +02:00
Robin Appelman
75b3b72d89
fix permissions of mountpoints
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-01 15:37:02 +02:00
Nextcloud bot
2152d5f1f6
[tx-robot] updated from transifex
2017-05-01 00:07:32 +00:00
Nextcloud bot
4518f6dc64
[tx-robot] updated from transifex
2017-04-30 00:07:21 +00:00
Marius Blüm
f26764c790
Rename “Server settings” to “Basic settings”
...
* fixes #4587
Signed-off-by: Marius Blüm <marius@lineone.io>
2017-04-29 17:13:21 +02:00
Jan-Christoph Borchardt
fabaf09d4f
Merge pull request #4583 from nextcloud/theming-fixes-admin
...
Theming admin section fixes
2017-04-29 17:05:11 +02:00
Arthur Schiwon
668fe7df51
UserManager can now count disabled users
...
Users page takes advantage of that
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-29 00:59:09 -03:00
Julius Härtl
b436e43d68
Make sure that ThemingDefaults uses the correct default values from \OC_Defaults
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-29 00:40:15 -03:00
Roeland Jago Douma
e3b10f3e6f
Updated autoloader
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-28 23:41:38 -03:00
Bjoern Schiessle
5fa0e6df39
fix email verification status
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:37 -03:00
Bjoern Schiessle
9a366dbe2e
add missing translation and other small fixes
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle
06265fe770
make use of verification buttons
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle
391a989a91
make sure that every data set has a 'verified' status
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle
7c309c253b
ask lookup server if email address was verified by the user
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle
86701dce7b
make sure that we don't lose previous verification status
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle
6f41a3edc0
store verification status in accounts table and update lookup server
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Morris Jobke
424d62d630
Merge pull request #4566 from nextcloud/cache-gc-no-fs
...
dont spam log when request can't access filesystem
2017-04-28 23:11:08 -03:00
Nextcloud bot
c4673224d1
[tx-robot] updated from transifex
2017-04-29 00:07:17 +00:00
Robin Appelman
d925856787
dont spam log when request can't access filesystem
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-28 17:01:31 -03:00
Roeland Jago Douma
3e8c5441f7
Merge pull request #4521 from nextcloud/custom-mount-types
...
allow apps to set custom mount types
2017-04-28 12:50:38 +02:00
Lukas Reschke
9e7f7ba7f6
Add sharing types for guests
...
Fixes https://github.com/nextcloud/guests/issues/4
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-28 09:56:57 +02:00
Robin Appelman
ab9a36e872
allow apps to set custom mount types
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-28 09:38:21 +02:00
Roeland Jago Douma
9da697b11a
Merge pull request #4524 from nextcloud/downstream-27508
...
Keep file id on move
2017-04-28 09:37:40 +02:00
Joas Schilling
0aa5ddff13
Fix autoloading
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-28 09:35:36 +02:00
Thomas Müller
86ccc8949f
MySQL 4 byte is now detected during setup in any case.
...
config.sample.php was updated to explicitly state that there detection in place to set mysql.utf8mb4
2017-04-28 09:35:36 +02:00
Thomas Müller
43427e26d7
Add console command to migrate the charset
2017-04-28 09:35:36 +02:00
Thomas Müller
aa22f93018
During setup of a mysql database we try to detect if charset 'utf8mb4' can be used
2017-04-28 09:35:35 +02:00
Nextcloud bot
6908818999
[tx-robot] updated from transifex
2017-04-28 00:07:41 +00:00
Morris Jobke
f000e22a97
Merge pull request #4522 from nextcloud/downstream-27596
...
Allow to create a user for a specific backend
2017-04-27 16:41:08 -03:00
Joas Schilling
9212089151
Use the new method in the old one to remove duplicate code
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-27 08:56:51 +02:00
Morris Jobke
4dab01d9ed
Merge pull request #4501 from nextcloud/downstream-27144
...
Add duration of last job execution to the table
2017-04-26 23:16:21 -03:00
Morris Jobke
01705b1b6a
Merge pull request #4515 from nextcloud/downstream-27643
...
Adjust query/event logging code in favour of more complex owncloud/di…
2017-04-26 22:58:01 -03:00
Nextcloud bot
c1c5f51fd8
[tx-robot] updated from transifex
2017-04-27 00:07:40 +00:00
Morris Jobke
4a9cb81486
Merge pull request #4526 from nextcloud/downstream-27269
...
Don`t allow upload of files with extension .part
2017-04-26 18:21:13 -03:00
Roeland Jago Douma
d0bbae7425
Update autoloader
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-26 22:25:41 +02:00
Lukas Reschke
d17a901f8a
Update autoload map
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:54 +02:00
Lukas Reschke
3df99d8fd6
Add SocialSharingBundle
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:53 +02:00
Lukas Reschke
0c5a48c4a4
Add tests for repairstep
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:52 +02:00
Lukas Reschke
a05295fca3
Add spreed to Groupware bundle
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:52 +02:00
Lukas Reschke
78d0bb99f7
Remove unrequired getDescription() method
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:51 +02:00
Lukas Reschke
d4ba8198fe
Make the emergency disable also accept arrays
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:51 +02:00
Lukas Reschke
47cd976035
Add app bundles
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:49 +02:00
Lukas Reschke
d89c76049f
Merge pull request #4374 from nextcloud/contactsmenu_popover
...
add contacts popover
2017-04-26 18:31:17 +02:00
Joas Schilling
c0a8942764
Fix missing conflict resolutions
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-26 17:05:59 +02:00
Vincent Petry
1c771c097a
Use regex to detect part files
2017-04-26 16:12:48 +02:00
Ilja Neumann
327094d557
#7496 Don`t allow upload of files with extension .part
2017-04-26 16:09:08 +02:00
Vincent Petry
642b4331a6
Moved unit tests from ObjectTree::move to Directory
2017-04-26 15:42:29 +02:00
Joas Schilling
9e6ac3de70
Allow to create a user for a specific backend
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-26 15:07:11 +02:00
Vincent Petry
0721a7d5cc
Fix scanner after review
2017-04-26 13:26:47 +02:00
Vincent Petry
e3218ddffd
OCC scanner commit in batches
2017-04-26 13:26:27 +02:00
Piotr Mrówczyński
9fec4031b3
Adjust query/event logging code in favour of more complex owncloud/diagnostics ( #27643 )
...
* Adjust query/event logging code in favour of more complex owncloud/diagnostics
* Add descriptions to IQueryLogger and IEventLogger interfaces
2017-04-26 13:19:43 +02:00
Roeland Jago Douma
5b5c3a1773
Merge pull request #4430 from nextcloud/refactor-auth
...
Improve readability of login logic
2017-04-26 10:41:53 +02:00
Georg Ehrke
60f9ed6241
add contactsmenu popover
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:26:53 +02:00
Roeland Jago Douma
7386bea23f
Merge pull request #4467 from nextcloud/lists-for-html-mails
...
Add lists to HTML emails
2017-04-26 08:30:30 +02:00
Roeland Jago Douma
752b219970
Merge pull request #4061 from nextcloud/downstream-26407
...
Redis cluster support
2017-04-26 08:27:30 +02:00
Morris Jobke
d4329f3355
Merge pull request #4449 from stweil/mimetypes
...
Add mimetypes for jp2 and webp
2017-04-26 01:22:49 -03:00
Jörn Friedrich Dreyer
fff6d6e3e8
Refactor auth methods
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-26 01:08:53 -03:00
Nextcloud bot
e5fe41e16b
[tx-robot] updated from transifex
2017-04-26 00:07:43 +00:00
Jan-Christoph Borchardt
241e397326
Merge branch 'master' into contactsmenu
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-26 00:50:38 +02:00
Morris Jobke
255c7df3bd
Merge pull request #4499 from nextcloud/downstream-26984
...
Trigger change when a user is enabled/disabled
2017-04-25 18:27:38 -03:00
Morris Jobke
859bc245b1
Merge pull request #4479 from nextcloud/auth-flow
...
Add new auth flow basics
2017-04-25 18:26:15 -03:00
Roeland Jago Douma
c59652dbc3
Merge pull request #4495 from nextcloud/downstream-27638
...
Catch session already closed exception in destructor
2017-04-25 22:24:50 +02:00
Christoph Wurst
5c29fb16c0
Update composer autoloader
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:18 +02:00
Christoph Wurst
2c2e1f7988
Use absolute URI for action icons
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
Christoph Wurst
b8c2a8ae36
Don't show contacts an entry for themselves
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
Christoph Wurst
36cee1f386
Let apps register contact menu provider via info.xml
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
Christoph Wurst
e3efc4979b
Show mail address in popover menu
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
Christoph Wurst
d091793ceb
Contacts menu
...
* load list of contacts from the server
* show last message of each contact
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
Lukas Reschke
6a16df7288
Add new auth flow
...
This implements the basics for the new app-password based authentication flow for our clients.
The current implementation tries to keep it as simple as possible and works the following way:
1. Unauthenticated client opens `/index.php/login/flow`
2. User will be asked whether they want to grant access to the client
3. If accepted the user has the chance to do so using existing App Token or automatically generate an app password.
If the user chooses to use an existing app token then that one will simply be redirected to the `nc://` protocol handler.
While we can improve on that in the future, I think keeping this smaller at the moment has its advantages. Also, in the
near future we have to think about an automatic migration endpoint so there's that anyways :-)
If the user chooses to use the regular login the following happens:
1. A session state token is written to the session
2. User is redirected to the login page
3. If successfully authenticated they will be redirected to a page redirecting to the POST controller
4. The POST controller will check if the CSRF token as well as the state token is correct, if yes the user will be redirected to the `nc://` protocol handler.
This approach is quite simple but also allows to be extended in the future. One could for example allow external websites to consume this authentication endpoint as well.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-25 20:18:49 +02:00
Stefan Weil
c9e08a6445
Add repair steps for new image mime types
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-25 18:56:23 +02:00
Noveen Sachdeva
1b1f403a5d
Add duration of last job execution to the table
2017-04-25 17:39:58 +02:00
Julius Härtl
7548825743
Responsive app menu
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 17:31:24 +02:00
Joas Schilling
ac0c21f4a7
Trigger change when a user is enabled/disabled
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 17:20:35 +02:00
Victor Dubiniuk
131df248ef
Catch session already closed exception in destructor
2017-04-25 16:28:52 +02:00
Morris Jobke
5a9224fb4c
Merge pull request #3531 from nextcloud/theming-scss
...
Theming using SCSS variables
2017-04-25 10:56:13 -03:00
Joas Schilling
f1ffb728b9
Allow meta info and icons
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 14:31:21 +02:00
Roeland Jago Douma
82c9eb1c56
Merge pull request #4462 from danxuliu/fix-sharing-password-protected-link
...
Fix sharing a password protected link
2017-04-25 14:12:44 +02:00
Julius Härtl
1c54463853
Use theming cachebuster for server resources
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 11:39:49 +02:00
Julius Haertl
68a63ad3f3
Implement scss variable injection by OC_Defaults
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
Add Scss variables to example theme and theming app
Signed-off-by: Julius Haertl <jus@bitgrid.net>
Use SCSSCacher to build theming css
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Update theming.scss
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Code cleanup
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Fix tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Inject SCSSCacher for easier testing
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Fix typehint
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Generate absolute URLs
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Fix tests to always use absolute urls for theming images
Signed-off-by: Julius Härtl <jus@bitgrid.net>
MailheaderColor -> ColorPrimary
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-25 11:39:45 +02:00
Joas Schilling
35414884d3
Add lists to HTML emails
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-24 13:48:27 +02:00
Daniel Calviño Sánchez
faea890b87
Extract updateSharePasswordIfNeeded function
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 13:38:36 +02:00
Daniel Calviño Sánchez
51e658da2a
Join if block to preceding if chain
...
If getShareType() returns "email" it can not also return "user", "group"
nor "link", so the if block can be added to the preceding if chain.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 13:17:46 +02:00
Joas Schilling
3d671cc536
Merge pull request #4443 from nextcloud/cleanup-unused-imports
...
Remove unused use statements
2017-04-24 11:47:37 +02:00
Daniel Calviño Sánchez
dcc8cce28b
Fix double hashing of shared link passwords
...
The plain text password for a shared links was hashed and, then, the
hashed password was hashed again and set as the final password. Due to
this the password introduced in the "Authenticate" page for the shared
link was always a wrong password, and thus the file could not be
accessed.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 11:33:07 +02:00
Roeland Jago Douma
1c2cdc9d3a
Merge pull request #4444 from nextcloud/remove-unused-variables
...
Remove unused variables
2017-04-24 08:09:01 +02:00
Nextcloud bot
a01f946c56
[tx-robot] updated from transifex
2017-04-24 00:07:28 +00:00
Morris Jobke
c54a59d51e
Remove unused use statements
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-22 19:23:31 -05:00
Nextcloud bot
11c7953888
[tx-robot] updated from transifex
2017-04-23 00:07:31 +00:00
Morris Jobke
2b6f6dac00
Remove unused variables
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-22 18:20:51 -05:00
Nextcloud bot
363d1c69dd
[tx-robot] updated from transifex
2017-04-22 00:07:36 +00:00
Roeland Jago Douma
867b3ee234
Merge pull request #4396 from nextcloud/scan-non-existing
...
show error when trying to scan non existing path
2017-04-21 19:47:33 +02:00
Roeland Jago Douma
d46b155916
Merge pull request #4428 from nextcloud/file-by-id-limit-user
...
limit the user when searching for a file by id if we know the user already
2017-04-21 19:43:53 +02:00
Robin Appelman
6fbe991afb
limit the user when searching for a file by id if we know the user already
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-21 17:11:26 +02:00
Roeland Jago Douma
e9b00f84b8
Merge pull request #4406 from nextcloud/fix-unit-test-problems
...
Fix unit test problems
2017-04-21 09:35:01 +02:00
Nextcloud bot
fb7663cefe
[tx-robot] updated from transifex
2017-04-21 00:07:37 +00:00
Bjoern Schiessle
972b4c04e2
respect password policy for auto generated passwords
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Bjoern Schiessle
d8dcd72118
allow admin to enforce password on mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Robin Appelman
a0e5107c0b
check for existence before we start the db transaction
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-20 13:25:49 +02:00
Joas Schilling
8c703c954d
Fix theming tests
...
Trying to configure method "shouldReplaceIcons" which cannot be configured
because it does not exist, has not been specified, is final, or is static
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 13:10:34 +02:00
Joas Schilling
9871e4eaee
Kill dead code
...
> No tests found in class "Test\Share\MailNotificationsTest".
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:43:19 +02:00
Joas Schilling
140580f9d8
Merge pull request #4398 from nextcloud/fix_accesslistcode
...
Get proper accesslist for userFolder
2017-04-20 11:03:22 +02:00
Roeland Jago Douma
ae2db5e60d
Get proper accesslist for userFolder
...
If the accesslist is requested for a users root folder we should
properly construct the path
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-20 10:28:32 +02:00
Joas Schilling
799b229a68
Merge pull request #4381 from nextcloud/2954_take_2
...
Fix group settings routes and fix route regression
2017-04-20 10:25:16 +02:00
Nextcloud bot
adf316c3af
[tx-robot] updated from transifex
2017-04-20 00:07:36 +00:00
Morris Jobke
fbedea0807
Add PHPDoc and handle exception in ScanAppData as well
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 17:04:16 -05:00
Morris Jobke
16c4755e03
Rename renderHTML to renderHtml
...
* fixes #4383
* improves consistency
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 15:46:41 -05:00
Robin Appelman
ce2dba0796
show error when trying to scan non existing path
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-19 14:36:38 +02:00
Lukas Reschke
a3569a1452
Merge pull request #4382 from nextcloud/use-proper-reply-to
...
Add "Reply-To" on ShareByMailProvider mails
2017-04-19 12:04:18 +02:00
Morris Jobke
f1ddb939a0
Merge pull request #4371 from nextcloud/dont-allow-dot-usernames
...
Better validation of allowed user names
2017-04-18 20:04:32 -05:00
Nextcloud bot
febe01f571
[tx-robot] updated from transifex
2017-04-19 00:07:40 +00:00
Nextcloud bot
6b490f45fd
[tx-robot] updated from transifex
2017-04-18 23:08:43 +00:00
Morris Jobke
269600a04f
Merge pull request #4369 from nextcloud/fix-translations
...
Fix translations
2017-04-18 18:01:50 -05:00
Joas Schilling
1c0bffe87f
Fix translations
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 16:40:53 -05:00
Morris Jobke
47fe5e8f41
Merge pull request #4380 from nextcloud/show-instance-name-in-from
...
Add instance name to default sender
2017-04-18 16:22:56 -05:00
Lukas Reschke
203ef88509
Add "Reply-To" on ShareByMailProvider mails
...
Fixes https://github.com/nextcloud/server/issues/4209
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-18 22:23:07 +02:00
Roeland Jago Douma
d12ec7cff1
Revert "Match slashes in ../{id} resource routes"
...
This reverts commit 31f9be7a75
.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-18 21:50:36 +02:00
Lukas Reschke
bae64e810e
Add instance name to default sender
...
Otherwise your mail program shows "foo@mail.com" instead of "Nextcloud" or whatever your instance name is.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-18 21:44:37 +02:00
Joas Schilling
a5b4308a51
Don't put the SMTP password into the HTML code
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 15:44:20 +02:00
Joas Schilling
a3922bbcdc
Better validation of allowed user names
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 14:29:34 +02:00
Nextcloud bot
b072d2c49d
[tx-robot] updated from transifex
2017-04-18 00:07:25 +00:00
Nextcloud bot
df2235c71f
[tx-robot] updated from transifex
2017-04-17 00:07:33 +00:00
Nextcloud bot
69e0e2420c
[tx-robot] updated from transifex
2017-04-16 00:07:23 +00:00
Morris Jobke
10290eb006
Merge pull request #2834 from nextcloud/accesListToShareManager
...
Access list to share manager
2017-04-15 13:06:24 -05:00
Nextcloud bot
dafa9c740a
[tx-robot] updated from transifex
2017-04-15 00:07:36 +00:00
Roeland Jago Douma
f40b9fa9bd
Merge pull request #4330 from nextcloud/activities-for-password-mail-change
...
Add activities when email or password is changed
2017-04-14 08:16:43 +02:00
Roeland Jago Douma
6b79bf0960
Merge pull request #4346 from nextcloud/properly-do-bruteforce-protection-via-annotation
...
Make BruteForceProtection annotation more clever
2017-04-14 08:15:55 +02:00
Nextcloud bot
0f96d5a641
[tx-robot] updated from transifex
2017-04-14 00:07:36 +00:00
Morris Jobke
8e8b345fbd
Fix autoloader
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-13 16:28:07 -05:00
Lukas Reschke
8149945a91
Make BruteForceProtection annotation more clever
...
This makes the new `@BruteForceProtection` annotation more clever and moves the relevant code into it's own middleware.
Basically you can now set `@BruteForceProtection(action=$key)` as annotation and that will make the controller bruteforce protected. However, the difference to before is that you need to call `$responmse->throttle()` to increase the counter. Before the counter was increased every time which leads to all kind of unexpected problems.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 23:05:33 +02:00
Morris Jobke
d0c0f6cfc1
Merge pull request #4326 from nextcloud/downstream-27562
...
Reorder the entries of the log for easier reading
2017-04-13 13:11:47 -05:00
Lukas Reschke
81d3732bf5
Merge pull request #4308 from nextcloud/lost-password-email
...
Update email template for lost password email
2017-04-13 20:02:15 +02:00
Morris Jobke
d36751ee38
Merge pull request #2424 from nextcloud/fix-login-controller-test-consolidate-login
...
Fix login controller test and consolidate login
2017-04-13 12:16:38 -05:00
Morris Jobke
ac05d6dd67
Improve PHPDoc
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-13 12:16:12 -05:00
Joas Schilling
695696a4a6
Use constants
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:04:32 -05:00
Roeland Jago Douma
6a519abde8
Update autoloader
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 14:56:05 +02:00
Roeland Jago Douma
0f5682321e
Fix server container registration
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 14:52:09 +02:00
Roeland Jago Douma
aef95b9b7d
Not needed in the DIContainer anymore
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 13:37:39 +02:00
Roeland Jago Douma
b96297e9cc
Do not set full path if not currentAccess
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:53 +02:00
Joas Schilling
f57ef55249
Add samples to the docs
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:53 +02:00
Joas Schilling
29f2088a7b
Catch exceptions and use as many results as possible
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:53 +02:00
Joas Schilling
629b7c0fc3
Adjust docs and make !$currentAccess simpler
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:52 +02:00
Joas Schilling
5b57bb955b
Fix default share provider
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:52 +02:00
Joas Schilling
2fcf334c6a
Fix tests for ShareHelper
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:52 +02:00
Joas Schilling
3c1365c0d1
Fix returned paths for remote shares
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:51 +02:00
Joas Schilling
4bcb7d88b5
Return the token as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:51 +02:00
Joas Schilling
cf7c320949
Also return the token
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:51 +02:00
Joas Schilling
91e650791d
Return the paths for the users without setting them all up
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:50 +02:00
Roeland Jago Douma
0c2dc3bc8c
Fix comments
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:50 +02:00
Roeland Jago Douma
12afd7d1d5
Add mail element to access list
...
* Each provider just returns what they have so adding an element won't
require changing everything
* Added tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:50 +02:00
Roeland Jago Douma
2cbac3357b
Offload acceslist creation to providers
...
* This allows for effective queries.
* Introduce currentAccess parameter to speciy if the users needs to have
currently acces (deleted incomming group share). (For notifications)
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:50 +02:00
Roeland Jago Douma
97f8ca6595
Added ShareHelper
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:49 +02:00
Roeland Jago Douma
a1edcc8ecf
Port Encryption/file to new getAccessList
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:49 +02:00
Roeland Jago Douma
88299ec27c
Added to public interface
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:49 +02:00
Roeland Jago Douma
7dcc98eb20
Add owner to access list
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:49 +02:00
Roeland Jago Douma
d84df15590
Add getAccessList to ShareManager
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:48 +02:00
Joas Schilling
1110b51aa3
Allow to read the old email on the hook as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:34:02 +02:00
Lukas Reschke
e39e6d0605
Remove expired attempts
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:18 +02:00
Lukas Reschke
54930ac926
Update static autoloadermap
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:17 +02:00
Lukas Reschke
a1ae5275f9
Move to dedicated MiddleWare
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:17 +02:00
Lukas Reschke
511524c668
Add isset() as it can be an empty result
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:17 +02:00
Lukas Reschke
d729bde98c
Register in ServerContainer
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:16 +02:00
Lukas Reschke
66835476b5
Add support for ratelimiting via annotations
...
This allows adding rate limiting via annotations to controllers, as one example:
```
@UserRateThrottle(limit=5, period=100)
@AnonRateThrottle(limit=1, period=100)
```
Would mean that logged-in users can access the page 5 times within 100 seconds, and anonymous users 1 time within 100 seconds. If only an AnonRateThrottle is specified that one will also be applied to logged-in users.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:16 +02:00
Joas Schilling
f23a36b0a6
Add activities when email or password is changed
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 11:13:19 +02:00
Lukas Reschke
01f3698175
Merge pull request #3966 from nextcloud/downstream-26570
...
Override config.php values through environment variables
2017-04-13 10:51:09 +02:00
Morris Jobke
7cb6038fca
Merge pull request #3043 from nextcloud/issue-3038-no-logentry-on-email-login
...
Dont create a log entry on email login
2017-04-13 01:04:11 -05:00
Nextcloud bot
396618fd19
[tx-robot] updated from transifex
2017-04-13 00:08:02 +00:00
Morris Jobke
1f962f9115
Update email template for lost password email
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 15:19:53 -05:00
Roeland Jago Douma
b3b24172e4
Merge pull request #4307 from nextcloud/sharing-emails
...
New emails for sharebymail
2017-04-12 21:23:11 +02:00
Morris Jobke
a7da2ef977
Merge pull request #4282 from nextcloud/oci-connect-string
...
use the same oci connectstring in all code paths
2017-04-12 13:11:00 -05:00
Morris Jobke
124fdf8062
Merge pull request #4331 from nextcloud/query-builder-sum
...
Add sum() to the query function builder
2017-04-12 12:55:09 -05:00
Morris Jobke
31024b7700
Merge pull request #4329 from nextcloud/move-out-shared-folder
...
Fix moving files out of a shared folder
2017-04-12 11:44:26 -05:00
Joas Schilling
4b639e2763
No newlines when heading is empty
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:27 +02:00
Bjoern Schiessle
0a464dfb61
make the plain text footer standard compliant and add a space after '--'. It also adds a line break in front so that there is some spacing between the mail body and the footer
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-12 17:16:27 +02:00
Joas Schilling
1c8c62272c
Use instance name as alt-text
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:26 +02:00
Joas Schilling
506c7731a6
Don't duplicate the sentence with the header
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:26 +02:00
Morris Jobke
33e077c1c1
Properly escape heading, body and button text
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 17:16:26 +02:00
Morris Jobke
050ce1d40b
Add addBodyButton to add a single button to email templates
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 17:16:26 +02:00
Robin Appelman
ac45af68cd
Add sub() to the query function builder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-12 16:09:35 +02:00
Roeland Jago Douma
dccb8928a1
Merge pull request #4325 from nextcloud/downstream-27522
...
Optimize put - Dont try to fetch filecache for not existing filecache…
2017-04-12 16:04:03 +02:00
Björn Schießle
b90e91144b
Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints
...
Discover federatedsharing endpoints
2017-04-12 16:01:07 +02:00
Robin Appelman
8500debe79
use unjailed path when moving files out of a shared storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-12 14:56:51 +02:00
Robin Appelman
2f949f4515
rename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::getSourcePath
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-12 14:55:47 +02:00
Juan Pablo Villafáñez
38e5135cb9
Reorder the entries of the log for easier reading
2017-04-12 13:03:19 +02:00
Piotr M
dc78f1251e
Optimize put - Dont try to fetch filecache for not existing filecache in encription
2017-04-12 12:54:20 +02:00
Joas Schilling
bd37021587
Fix casing of same origin frame option
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 12:37:32 +02:00
Lukas Reschke
b5d31e4e65
Merge pull request #4309 from nextcloud/remove-unused-code
...
Removes unused code for link share emails
2017-04-12 10:15:59 +02:00
Lukas Reschke
d127f47801
Merge pull request #4310 from nextcloud/allow-plain-text-email
...
Allow to set text versions for the plain text email
2017-04-12 10:15:06 +02:00
Nextcloud bot
633b952358
[tx-robot] updated from transifex
2017-04-12 00:07:44 +00:00
Morris Jobke
be9a514dff
Allow to set text versions for the plain text email
...
* allows different texts for HTML and text version of the email
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 17:50:06 -05:00
Morris Jobke
8fa5141aaa
Removes unused code for link share emails
...
* now handled by sharebymail app
* see https://github.com/nextcloud/server/pull/657
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 17:32:48 -05:00
Lukas Reschke
f3a78ee39d
Remove constructor from interface
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 21:22:39 +02:00
Lukas Reschke
3600dd4f52
Add IEMailTemplate to public OCP API
...
Also adds `\OCP\Mail\IMailer::createEMailTemplate` as helper so the functionality can easily be used within apps.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 16:35:46 +02:00
Roeland Jago Douma
42f40659f6
Update autoloader
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 15:04:15 +02:00
Roeland Jago Douma
53bca14a27
Do proper DI
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle
449011dae7
remove discovery manager in favour of the OCSDiscoveryService
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle
0dea31d48b
add tests for discovery service
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle
45aee2e479
provide public discovery service to discover OCS end-points on another server
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:03:59 +02:00
Lukas Reschke
afb5d45705
Merge pull request #4256 from nextcloud/theming
...
Move OC_Defaults to OCP\Defaults
2017-04-11 14:39:46 +02:00
Morris Jobke
11d6fe1023
Merge pull request #4283 from nextcloud/shares-by-folder-quote
...
properly quota table names in getSharesInFolder
2017-04-10 19:39:19 -05:00
Nextcloud bot
4d90b0520e
[tx-robot] updated from transifex
2017-04-11 00:07:29 +00:00
Morris Jobke
a045f3c4d7
Merge pull request #4146 from nextcloud/unread-comments-folder
...
Allow getting the unread comment count for an entire folder at once
2017-04-10 13:21:39 -05:00
Robin Appelman
a555672f21
properly quota table names in getSharesInFolder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-10 17:59:40 +02:00
Robin Appelman
421ca6439f
use the same oci connectstring in all code paths
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-10 17:58:52 +02:00
Björn Schießle
18580395d4
Merge pull request #4277 from nextcloud/permissions-mask-scanner
...
Dont use the permissions mask while scanning
2017-04-10 16:04:12 +02:00
Roeland Jago Douma
e9c6fe2fd8
Merge pull request #4222 from nextcloud/dav-search-fileid
...
Allow searching file by fileid
2017-04-10 15:57:56 +02:00
Robin Appelman
a7c611039d
Dont use the permissions mask while scanning
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-10 15:19:21 +02:00
Roeland Jago Douma
afea05d296
Merge pull request #4210 from nextcloud/downstream-26643
...
Removed path to datadir in exception
2017-04-10 12:43:46 +02:00
Joas Schilling
9e3a3eebf9
Lowercase "data" correctly
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-10 11:13:46 +02:00
Joas Schilling
bc217cdf87
Also send the new account data with the event
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-10 10:22:57 +02:00
Morris Jobke
5b4adf66e5
Move OC_Defaults to OCP\Defaults
...
* currently there are two ways to access default values:
OCP\Defaults or OC_Defaults (which is extended by
OCA\Theming\ThemingDefaults)
* our code used a mixture of both of them, which made
it hard to work on theme values
* this extended the public interface with the missing
methods and uses them everywhere to only rely on the
public interface
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-09 21:43:01 -05:00
Nextcloud bot
d25a96d921
[tx-robot] updated from transifex
2017-04-10 00:08:50 +00:00
Nextcloud bot
16091f4424
[tx-robot] updated from transifex
2017-04-09 00:07:40 +00:00
Nextcloud bot
4b0f50c456
[tx-robot] updated from transifex
2017-04-08 00:07:45 +00:00
Morris Jobke
ca9d25169d
Merge pull request #4136 from nextcloud/expire-date-for-all-shares
...
Unified sharing options
2017-04-07 17:14:05 -05:00
Roeland Jago Douma
6c0cafb10f
Merge pull request #4253 from nextcloud/downstream-27599
...
make JobList::next() lock free
2017-04-07 22:18:40 +02:00
Jörn Friedrich Dreyer
c993c363e0
make JobList::next() lock free
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-07 13:07:09 -05:00
Lukas Reschke
8daf3d4a70
Update autoloader
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-07 12:03:47 -05:00
Lukas Reschke
281ad406e8
Add support for theming
...
Add support for theming in generated emails and simplify API
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-07 12:03:47 -05:00
Morris Jobke
0560e69913
New layout for welcome email
...
* thanks to @espina2 for make this nice design
* the button says "Set password" if the admin didn't specified a password
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-07 12:03:32 -05:00
Bjoern Schiessle
3323d01db1
update unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:43:59 +02:00
Joas Schilling
9f3d9b5b23
Don't force the use of Accept-Language anymore
...
This is not intended anymore, since it falls back to force english
when the header is not set. Also 0228bc6e66
makes clear that the order should be:
1. User setting
2. Accept language
3. Admin default
This is the case since the commit from above, unless via OCS and DAV.
Both forced to accept-language falling back to english.
By removing the force, it now also matches the w3 priority list:
https://www.w3.org/International/questions/qa-lang-priorities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-07 11:10:04 +02:00
Joas Schilling
7ad791efb4
Dont create a log entry on email login
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-07 10:15:20 +02:00
Nextcloud bot
536650c02f
[tx-robot] updated from transifex
2017-04-07 00:09:11 +00:00
Arthur Schiwon
fbadb37b9b
use known LockdownManager
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:27:30 +02:00
Arthur Schiwon
0a463e55ae
Save correct login name
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:22:43 +02:00
Morris Jobke
4eddb95fc4
Add method to $methodsWithSensitiveParameters
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-06 15:22:43 +02:00
Arthur Schiwon
daf9d23547
don't regenerate Session ID twice, also fixes tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:22:43 +02:00
Arthur Schiwon
50844e8c47
regenerate session id on successful login, fixes integration test
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:22:43 +02:00
Arthur Schiwon
7b3fdfeeaa
do login routine only once when done via LoginController
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:22:42 +02:00
Nextcloud bot
7d9688c89e
[tx-robot] updated from transifex
2017-04-06 00:07:50 +00:00
Robin Appelman
baec42e80a
Save the scope of an auth token in the session
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-05 17:58:33 +02:00
Robin Appelman
bb7e236e74
Allow searching file by fileid
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-05 15:22:53 +02:00
Nextcloud bot
84035862f7
[tx-robot] updated from transifex
2017-04-05 00:08:20 +00:00
Kawohl
bee0a3699e
removed path to datadir
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-04 19:07:59 -05:00
Morris Jobke
95a21e2f2a
Check for boolean false and add tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-04 15:56:50 -05:00
Morris Jobke
0fcb37adcb
OC_ -> NC_
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-04 15:56:50 -05:00
Philipp Schaffrath
695a17804e
Override config.php values through ENV variables ( #26570 )
...
* added functionality to override config.php values with 'OC_' prefixed environment variables
* use getenv to read environment variables since apache does not set $_ENV variables, fixed test
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-04 15:56:50 -05:00
Morris Jobke
fa4107893d
Merge pull request #4138 from nextcloud/resources_match_fullid
...
Match slashes in ../{id} resource routes
2017-04-04 15:52:53 -05:00
Morris Jobke
b78876236d
Merge pull request #4192 from nextcloud/fix/custom-default-app-redirect-2fa-selection
...
Redirect to 2FA selection screen
2017-04-04 15:47:35 -05:00
Morris Jobke
52eaf6cfbb
Merge pull request #3310 from duritong/patch-1
...
only chmod logfile if necessary
2017-04-04 11:42:26 -05:00
Lukas Reschke
e0227cb458
Merge pull request #2095 from nextcloud/bruteforcesetttings
...
Introduce bruteforce settings
2017-04-04 11:57:43 +02:00
Roeland Jago Douma
efb21a948e
Merge pull request #4093 from nextcloud/endorse-password-protection
...
Endorse password protection
2017-04-04 11:04:21 +02:00
Roeland Jago Douma
0d69b52fde
Merge pull request #4147 from nextcloud/fix_3890
...
Don't try to parse empty body if there is no body
2017-04-04 10:25:13 +02:00
Roeland Jago Douma
31f9be7a75
Match slashes in ../{id} resource routes
...
Fixes #2954
Before we could match on <prefix>/{id} however if the id contains a /
this would not match properly. But since we define the resource routes
internally we now make sure that we match all chars (up until the ?).
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-04 08:37:11 +02:00
Roeland Jago Douma
2a9192334e
Don't try to parse empty body if there is no body
...
Fixes #3890
If we do a put request without a body the current code still tries to
read the body. This patch makes sure that we do not try to read the body
if the content length is 0.
See RFC 2616 Section 4.3
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-04 08:22:33 +02:00
Nextcloud bot
ec5377306d
[tx-robot] updated from transifex
2017-04-04 00:07:46 +00:00
Christoph Wurst
a7cc8c86ab
Redirect to 2FA selection screen
...
Apps like 'rainloop' use \OCP\Util::isLoggedIn() to check whether the
current request is authenticated. Since we redirected to the index
page before, it resulted in an infinite redirection loop. This change
sets the redirection URL to the 2FA selection page, which is the only
allowed page in that authentication state.
Fixes https://github.com/nextcloud/server/issues/3702
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-03 14:31:57 +02:00
Christoph Wurst
cbe44043be
Merge pull request #4131 from nextcloud/fix-jscombiner
...
Fix check for cache value in JSCombiner
2017-04-03 11:27:39 +02:00
Bjoern Schiessle
b85b6f2439
feature endorse password for share links
...
works like "enforce password protection", but let the
user optionally remove the password protection after the
password is set. by Timo Benk
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:57:52 +02:00
Bjoern Schiessle
dac6826ad7
setting to disable sending password by mail
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:33 +02:00
Bjoern Schiessle
b84fd7c361
set expire date for all share types
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle
3cc0d15f92
add secure drop functionallity to mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle
c191173d59
allow password protected mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle
0d5147bd49
add new password column to the share table in order to set passwords for share by mails
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:20:49 +02:00
Nextcloud bot
d56f6399eb
[tx-robot] updated from transifex
2017-04-03 00:08:20 +00:00
Morris Jobke
ed00bab80b
Fixed layout of bruteforcesettings
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-02 21:19:30 +02:00
Roeland Jago Douma
be674c19a5
Respect bruteforce settings in the Throttler
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-02 21:13:50 +02:00
Roeland Jago Douma
dca555b7f3
Adds security section to the admin page
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-02 21:13:09 +02:00
Björn Schießle
85da9378c0
Merge pull request #4140 from nextcloud/no_encryption_no_wrapper
...
Don't add the Encryption Storage Wrapper if there are no encryption modules
2017-03-31 14:49:38 +02:00
Nextcloud bot
6a6300b1f2
[tx-robot] updated from transifex
2017-03-31 00:08:35 +00:00
Roeland Jago Douma
548871a9f3
Merge pull request #3832 from nextcloud/fix_1303
...
Do not clear CSRF token on logout (fix for #1303 )
2017-03-30 18:25:50 +02:00
Joas Schilling
a51e4dd259
Merge pull request #4150 from nextcloud/capped-memcache-push
...
support pushing to CappedMemoryCache
2017-03-30 15:16:33 +02:00
Robin Appelman
11c1e5dd86
fix whitespace in cleantags
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:49:09 +02:00
Robin Appelman
40154dd6a3
use castColumn
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:48:30 +02:00
Robin Appelman
212d9fd277
Add test for getting unread comment count by folder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:48:27 +02:00
Robin Appelman
429f8ae011
Allow getting the unread comment count for an entire folder at once
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:48:24 +02:00
Robin Appelman
0aeb595784
user ids are strings
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:24:46 +02:00
Robin Appelman
dc4b983639
support pushing to CappedMemoryCache
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:21:32 +02:00
Robin Appelman
d4a7cfec7c
rename fun to func
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:15:06 +02:00
Robin Appelman
fee818f493
Add tests for query builder (i)like
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:15:03 +02:00
Robin Appelman
3355fd549f
dont double escape
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:14:59 +02:00