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

7494 commits

Author SHA1 Message Date
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