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

29591 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
3143555256 Merge pull request #21613 from owncloud/dav-fix-constructor 
fix principal constructor for dav
 2016-01-11 14:21:31 +01:00
Robin Appelman
af1e810607 implement isLocal for shared storage 2016-01-11 13:58:22 +01:00
Thomas Müller
c1d8a03662 Merge pull request #21517 from owncloud/ext-oauth-fix 
Fix OAuth external storage auth for step 2
 2016-01-11 13:36:58 +01:00
Robin Appelman
56c3686ad6 fix principal constructor for dav 2016-01-11 13:36:26 +01:00
Thomas Müller
16097037af Merge pull request #21608 from owncloud/better-setting-templates 
improve personal page template
 2016-01-11 13:36:21 +01:00
Björn Schießle
46f6c289ca only use master key ID if a user is logged in. Otherwise keep the public link share key 2016-01-11 13:09:06 +01:00
Morris Jobke
43f5d8ab70 Handle return code of streamCopy in WebDAV put 
* throw a different exception if streamCopy failed
 2016-01-11 12:13:01 +01:00
Robin Appelman
50857e6d7b Add import command for files external 2016-01-11 11:55:00 +01:00
Thomas Müller
df2abda814 Merge pull request #21438 from owncloud/settings-anchors 
remove unneeded 'goto' prefix from settings anchors
 2016-01-11 11:53:40 +01:00
Lars
3a5087ccdf tempnam accepts a directory as its first parameter, not a full path and filename. 
tempnam falls back to creating a file in the system's temp directory. On systems with open_basedir restrictions, this may trigger an error message. By moving this below the checkTemporaryDirectory-loop, tempnam will only be tested if all alternatives fail and the error message is most likely avoided.
 2016-01-11 11:50:31 +01:00
Joas Schilling
866b4b3053 Fix types 2016-01-11 11:43:58 +01:00
Robin Appelman
94200b682c removed unused imports 2016-01-11 11:40:58 +01:00
Robin Appelman
282f67dad1 improve handling of non existing files in the trashbin 2016-01-11 11:40:58 +01:00
Robin Appelman
8890c88c11 handle not found in trash hook 2016-01-11 11:40:58 +01:00
Lukas Reschke
3e8a5f8a53 Typo in error message 2016-01-11 11:40:58 +01:00
Robin Appelman
300eb54c87 de-deplicate getUidAndFilename 2016-01-11 11:40:58 +01:00
Robin Appelman
fd2e1086c6 dont return an owner for files that don't exist 2016-01-11 11:40:58 +01:00
Joas Schilling
25a4878886 Fix table markup 2016-01-11 11:38:26 +01:00
Thomas Müller
05f9b40419 Merge pull request #21589 from owncloud/mobile-webDAV-select 
webDAV select bug fixed
 2016-01-11 11:31:33 +01:00
Thomas Müller
94cf9e56b6 Merge pull request #21593 from owncloud/strict_autoloader 
Stricter autoloader
 2016-01-11 11:24:11 +01:00
Thomas Müller
939cd43b58 Merge pull request #21586 from owncloud/fix-no-minimum-version 
Assume apps from the appstore are compatible with the current version
 2016-01-11 11:23:36 +01:00
Thomas Müller
2ee39cf4cf Merge pull request #21573 from owncloud/fix_21535_21534 
Do not increase filecount in web on file update
 2016-01-11 11:22:09 +01:00
Thomas Müller
171b279753 Merge pull request #21594 from owncloud/cleanup_util 
Remove generateRandomBytes from OC_Util
 2016-01-11 09:55:35 +01:00
Julian Müller
0249911536 webDAV select bug fixed 2016-01-11 08:41:16 +01:00
Jenkins for ownCloud
77a8085f84 [tx-robot] updated from transifex 2016-01-11 01:55:34 -05:00
Morris Jobke
a1444da364 Merge pull request #21596 from owncloud/settings-footer 
remove extra slogan footer from Personal and Admin pages
 2016-01-11 07:17:49 +01:00
Jan-Christoph Borchardt
d05e0c81d4 remove extra slogan footer from Personal and Admin pages 2016-01-11 03:18:06 +01:00
Roeland Jago Douma
e01a488b31 Remove generateRandomBytes from OC_Util 2016-01-10 22:07:33 +01:00
Roeland Jago Douma
1a592e5745 Only '/tests' to be autoloaded when running unit tests 2016-01-10 21:36:14 +01:00
Roeland Jago Douma
fce8c42240 OC autoloader is not allowed to load 3rdparty 2016-01-10 21:32:52 +01:00
Lukas Reschke
c009d5dcc1 Verify signature of apps with level "Official" coming from the appstore 
This change will verify the signature of all apps with the level "Official" coming from the appstore or if they have been signed before.
 2016-01-10 19:40:28 +01:00
Lukas Reschke
e43bf54503 Assume apps from the appstore are compatible with the current version 
Filtering is done server-side already so only compatible apps are delivered. Otherwise this leads to a ton of error messages as the info.xml cannot be read at that state.

Fixes https://github.com/owncloud/core/issues/21556
 2016-01-10 17:02:50 +01:00
Thomas Müller
656b541899 Merge pull request #21572 from owncloud/fix-setup-warnings 
Concat also the other results
 2016-01-10 15:20:38 +01:00
Lukas Reschke
f4c04c5f28 Concat also the other results 
Otherwise this will ignore the two last checks 🙊
 2016-01-10 11:39:44 +01:00
Morris Jobke
53c4a55275 Merge pull request #21577 from owncloud/make-code-cleaner-by-removing-unrequired-security-features 
Remove code related to session regeneration after some time
 2016-01-10 11:38:35 +01:00
Lukas Reschke
74876fa6e7 Remove code related to session regeneration after some time 
I do not really consider this necessary or a real security addition. Let's get rid of it thus, cleans up the code and makes the logic easier.
 2016-01-10 11:01:30 +01:00
Morris Jobke
21a700bcf7 Merge pull request #21575 from owncloud/use-session-clear 
Use ISession::clear
 2016-01-10 11:00:47 +01:00
Lukas Reschke
a58ca89e7f Use ISession::clear 
The native approach using the PHP calls will not work properly with the cryptowrapper and thus this code is effectively doing nothing at the moment.
 2016-01-10 10:39:22 +01:00
Jenkins for ownCloud
580deb09f8 [tx-robot] updated from transifex 2016-01-10 01:55:57 -05:00
Lukas Reschke
d04aadde8a Merge pull request #21576 from owncloud/use-proper-class-name 
Use proper class name
 2016-01-10 00:22:17 +01:00
Lukas Reschke
3d4cf2e598 Use proper class name 
This has never worked before. Introduced with https://github.com/owncloud/core/pull/18658
 2016-01-09 23:43:12 +01:00
Roeland Jago Douma
665d7b25b0 Add unit test for file update 2016-01-09 22:47:26 +01:00
Roeland Jago Douma
86735c6b5a Updating a file should not update the summary 2016-01-09 22:07:34 +01:00
Roeland Douma
b1698e42d6 Merge pull request #21571 from owncloud/query_secure_random 
Just query the securerandom from the container
 2016-01-09 20:56:37 +01:00
Roeland Jago Douma
77c611d339 Just query the securerandom from the container 2016-01-09 19:57:03 +01:00
Thomas Müller
c5b2b3a124 Merge pull request #21562 from owncloud/properly-check-for-well-known-redirect 
Add check for .well-known URL in the root of the webservers URL
 2016-01-09 17:42:11 +01:00
Jenkins for ownCloud
72b34575df [tx-robot] updated from transifex 2016-01-09 01:55:50 -05:00
Morris Jobke
0161928fc3 Add check for .well-known URL in the root of the webservers URL 
* fixes #20012
 2016-01-08 23:27:29 +01:00
Morris Jobke
a259effc7d Merge pull request #19676 from owncloud/fix_15253 
Make sure that permissions stay in sync for share_type 2
 2016-01-08 21:37:12 +01:00
Roeland Jago Douma
17a066c18e Properly close db cursors 2016-01-08 20:27:01 +01:00