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

7599 commits

Author SHA1 Message Date
Morris Jobke
8eb955d5c6 Merge pull request #4993 from michaelletzgus/emit_css-tags 
Emit css tags
 2017-06-14 11:29:25 -05:00
Arthur Schiwon
ed49d9b9ed
a parameter too much 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-14 14:41:30 +02:00
Arthur Schiwon
c1d9565131
added kml, kmz, tcx types as well while at it 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-14 11:02:05 +02:00
Arthur Schiwon
addcda9325
add geospatial mime types repair step 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-14 10:48:56 +02:00
Lukas Reschke
b76e43e0a3 Merge pull request #5361 from nextcloud/exclude-files-external-dir-from-encryption 
don't try to encrypt/decrypt the certificate bundle
 2017-06-14 09:50:45 +02:00
Morris Jobke
0b92700b52 Merge pull request #5072 from mjmunger/master 
Fixed a crash caused by Local::copyFromStorage() not conforming to Co…
 2017-06-13 17:51:16 -05:00
Joas Schilling
0f8c1b13a3
Fix unknown share token 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 18:44:50 +02:00
Lukas Reschke
c46422b780 Merge pull request #5343 from nextcloud/share-filter-missing-groups 
filter missing groups in share provider
 2017-06-13 10:53:26 +02:00
Bjoern Schiessle
86eb23b91e
don't try to encrypt/decrypt the certificate bundle 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-06-13 09:50:45 +02:00
Morris Jobke
6a06df824e Merge pull request #5027 from nextcloud/require-nextcloud-version-as-per-docs 
Version and dependency are now required
 2017-06-12 22:33:16 -05:00
Morris Jobke
69b6504285 Merge pull request #5167 from nextcloud/rakekniven-patch-2 
l10n improvements from transifex
 2017-06-12 16:18:54 -05:00
Robin Appelman
f707a40f19
filter missing groups in share provider 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-06-12 15:46:19 +02:00
Lukas Reschke
ae6e1fe1df
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:12:37 +02:00
Joas Schilling
7d806bdfbd Revert "Always enable Zip64 extension for zipstreamer" 2017-06-09 10:21:26 +02:00
Joas Schilling
3af8abb098
Allow to overwrite the email template again 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-06 14:23:03 +02:00
blizzz
2e2d406bf5 Merge pull request #5213 from nextcloud/fix-change-hook 
Trigger changeUser hook only on real changes
 2017-06-02 13:14:33 +02:00
blizzz
45305c762d Merge pull request #5209 from nextcloud/fix-install-mysql-mb4 
fix install on mb4 enabled mariadb/mysql
 2017-06-02 13:10:28 +02:00
Björn Schießle
74fccf20c8 Merge pull request #5084 from nextcloud/useful-gs-settings 
add new config switched for the global scale architecture
 2017-06-02 10:58:43 +02:00
Arthur Schiwon
18a8f3654b
fix install on mb4 enabled mariadb/mysql 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-01 13:44:18 +02:00
Arthur Schiwon
999455c1aa
emit changeUser only if there really was a change (quota, displayname) 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-01 11:34:17 +02:00
rakekniven
f2d999aa70 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-05-31 13:41:45 +02:00
Joas Schilling
1d227d83c0 Merge pull request #5116 from McNetic/zipstreamer 
Always enable Zip64 extension for zipstreamer
 2017-05-30 12:37:01 +02:00
Bjoern Schiessle
7c2d473d76
add new config switched for the global scale architecture 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-05-29 18:19:28 +02:00
Nicolai Ehemann
619afd499e Always enable Zip64 extension for zipstreamer 
Signed-off-by: Nicolai Ehemann <en@enlightened.de>
 2017-05-25 22:30:03 +02:00
Michael Letzgus
0d320fba4b Streamline templates, more DRY 
Use Unified function to emit <link> tags for css loading, obey "Don't Repeat Yourself" ;-)

(Next step might by to combine this with the emit <script> function (even more DRY?) AND move all this to a better place?)

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
 2017-05-25 11:13:43 +02:00
Joas Schilling
3f29c55914
Register the autoloading earlier so we can load the background jobs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-24 12:58:10 +02:00
Michael Munger
b8f2418248 Fixed a crash caused by Local::copyFromStorage() not conforming to Common::copyFromStorage. Issue# 5071 2017-05-23 10:29:30 -04:00
Joas Schilling
eebd2811dc
Version and dependency are now required 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-22 09:54:44 +02:00
Roeland Jago Douma
32f5c028a0
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:10:00 +02:00
Morris Jobke
0dae4946cf Merge pull request #4854 from michaelletzgus/deferred-script-loading-v2 
Make page loading faster, deferred script loading, now switchable:
 2017-05-20 16:53:30 -05:00
Michael Letzgus
fb9f13d4c1 Make page loading faster by deferred script loading: 
* Create generalized function for emmitting <script defer src=""> tags to templates
* Remove type attribute from inline_js
* Add defer attribute to external <script> tags

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
 2017-05-20 13:44:04 +02:00
Morris Jobke
fe8c67ad23 Merge pull request #4981 from nextcloud/fix-missing-argument-2-getAppContainer-master 
Fix missing argument 2 for Settings classes
 2017-05-19 17:05:49 -05:00
Joas Schilling
a411adee6c
Fix missing argument 2 for Settings classes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-19 22:32:50 +02:00
Roeland Jago Douma
7eb8b3cec1 Merge pull request #4956 from nextcloud/endless-loop-on-invalid-asset 
Stop infinit loop on invalid settings css/js file
 2017-05-19 16:51:49 +02:00
Miha Frangez
0d6493a0c7 Fixed typo 2017-05-19 15:58:13 +02:00
Joas Schilling
bcddca9a64 Merge pull request #4905 from nextcloud/auto-di-for-apps-without-app.php 
Allow automatic DI for apps that don't register the container in app.php
 2017-05-19 13:48:01 +02:00
Joas Schilling
4792867357
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:41:08 +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
Joas Schilling
c1cc8193a7
Allow automatic DI for apps that don't register the container in app.php 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-16 17:37:41 +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
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
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
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
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
coderkun
bdc7bb1f26 Add IPv6 to “localhost” regex (#440) 
Signed-off-by: Oliver Hanraths <olli@coderkun.de>
 2017-05-14 21:29:03 +02: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
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
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
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
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
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
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
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
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
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
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
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
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
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
Morris Jobke
7f46898dad Compatibility with Redis and RedisCluster 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-04 12:42:58 -03: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Morris Jobke
c54a59d51e
Remove unused use statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-22 19:23:31 -05:00
Morris Jobke
2b6f6dac00
Remove unused variables 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-22 18:20:51 -05: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
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
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
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