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

29007 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
c92b49c82a Merge pull request #21184 from owncloud/cli-logger-embedded-webserver 
Let's print error messages to the builtin webserver console ... makes…
 2015-12-16 20:26:29 +01:00
Thomas Müller
9a4ab698b7 Merge pull request #21232 from owncloud/fix-21230 
Use name of ICollection for exception message
 2015-12-16 16:04:04 +01:00
Morris Jobke
89233cab83 add unit test for #21230 2015-12-16 15:03:50 +01:00
Morris Jobke
66c0f4eb59 Use name of ICollection for exception message 
* fixes #21230
 2015-12-16 14:44:28 +01:00
Thomas Müller
aa6230e389 Merge pull request #21229 from owncloud/contrib-linktomaintainerspageforapps 
Replace list of apps with a link
 2015-12-16 14:19:23 +01:00
Vincent Petry
2daf9fcbcb Replace list of apps with a link 
The link points to the maintainers page that already contains a more up to date list of apps and repo links.
No need to have this information in two places.
 2015-12-16 13:58:18 +01:00
Jenkins for ownCloud
1d932e4c98 [tx-robot] updated from transifex 2015-12-16 01:55:55 -05:00
C. Montero Luque
a376fec984 Merge pull request #21133 from owncloud/fix-shared-files-of-deleted-users 
Fix shared files of deleted users, detect DN change when checking for existence on LDAP
 2015-12-15 12:14:58 -05:00
Thomas Müller
1ecda59c24 Merge pull request #21189 from owncloud/fix_21187 
File shares can't have create permissions
 2015-12-15 13:18:22 +01:00
Thomas Müller
67263ef8b4 Merge pull request #21067 from owncloud/fix_20296 
don't allow to create a federated share if source and target are the same
 2015-12-15 13:18:04 +01:00
Thomas Müller
de813c1025 Merge pull request #21209 from owncloud/remove-unneeded-ldap-code 
Remove unneeded upgrade code
 2015-12-15 13:17:22 +01:00
Morris Jobke
7608af6f7d Remove unneeded upgrade code 
stable8.2 has version 0.7.0 of the user_ldap app
 2015-12-15 09:38:29 +01:00
Arthur Schiwon
e39415c946 fix find DN by UUID for AD 2015-12-14 22:42:27 +01:00
Vincent Petry
1d37e7abfc Fixed JS unit tests for fed owner display name 2015-12-14 18:00:35 +01:00
Björn Schießle
c4b65170f2 show display name but internally use the user name 2015-12-14 17:25:10 +01:00
Björn Schießle
efc030aa25 don't allow to create a federated share if source and target server are the same 2015-12-14 17:16:14 +01:00
Roeland Jago Douma
843cf906b1 File shares can't have create permissions 
fixes #21187
 2015-12-14 14:03:14 +01:00
Thomas Müller
db41c4f4b5 Merge pull request #21181 from owncloud/files-fixsharedrootdetection 
Fix mount type root detection in web UI
 2015-12-14 13:50:35 +01:00
Thomas Müller
a7ecb6e984 Let's print error messages to the builtin webserver console ... makes development a bit easier 2015-12-14 12:16:41 +01:00
Thomas Müller
96b28382d9 Merge pull request #21148 from owncloud/resetpassword-user-issert 
Check if user isset in $_REQUEST first
 2015-12-14 11:27:46 +01:00
Vincent Petry
4d9e12b8bc Fix mount type root detection 
Since Webdav doesn't contain that information, we need to rely on the
parent folder's mount type to find out whether a child item is a
shared/external root or not.

Fixed the mount type detection logic and added unit test.

Also added a fix that ignores detection if no parent folder exists (ex:
shared file list, favorites, etc)
 2015-12-14 10:44:47 +01:00
Thomas Müller
583e696c9e Merge pull request #21163 from owncloud/fix_20839 
Files can't have create permissions
 2015-12-14 10:25:27 +01:00
Robin Appelman
9d732e35e1 Check if user isset in $_REQUEST first 2015-12-14 09:56:52 +01:00
Jenkins for ownCloud
74de12c698 [tx-robot] updated from transifex 2015-12-13 01:54:51 -05:00
Jenkins for ownCloud
f2ac1a80d8 [tx-robot] updated from transifex 2015-12-12 01:55:39 -05:00
Roeland Jago Douma
e8d5eb65c6 Files can't have create permissions 
Fixes #20839
 2015-12-11 22:28:26 +01:00
Arthur Schiwon
35a2639701 unit test on getHome in combination with OfflineUser 2015-12-11 17:25:57 +01:00
Thomas Müller
aee4887224 Merge pull request #21153 from owncloud/files-deleteactiontext 
Bring back file delete action text to be based on context
 2015-12-11 16:04:06 +01:00
Morris Jobke
2fa97f69cb Merge pull request #20081 from owncloud/trashbin-loggedout 
Fix trashbin wrapper when no user is loggedin
 2015-12-11 15:55:50 +01:00
Vincent Petry
baa5a69c55 Bring back file delete action text to be based on context 
For received shares, the delete action becomes "Unshare" and for
personal mounts it becomes "Disconnect storage".

This also makes it possible from now on to pass a function to a file
action's "displayName" attribute.
 2015-12-11 15:14:30 +01:00
Robin Appelman
5b2957bad1 skip test if we cant use the filesystem when not logged in 2015-12-11 14:29:38 +01:00
Robin Appelman
415cf92784 Fix thrashbin wrapper when no user is loggedin 2015-12-11 14:27:37 +01:00
Arthur Schiwon
aedbc0c626 adjust unit test 2015-12-11 12:52:12 +01:00
Thomas Müller
4f860b7e0a Merge pull request #20978 from owncloud/fix-dont-show-unsaved-values-in-usermgmt 
reset mailadress/displayname on blur
 2015-12-11 12:15:01 +01:00
Thomas Müller
f831d93f3f Merge pull request #20878 from owncloud/proper-htaccess-support-in-code-signing-checker 
Also run .htaccess routine when installing on another system than Apache
 2015-12-11 11:46:37 +01:00
Thomas Müller
f799b27f0e Merge pull request #21144 from owncloud/dav-auth-checkduplicateheader 
Properly check X-Requested-With header in case of multiple values
 2015-12-11 11:44:43 +01:00
Thomas Müller
6317ba8cb4 Merge pull request #21135 from owncloud/add-polyfill 
Add polyfills for PHP55, PHP56 and PHP70 functionalities
 2015-12-11 11:40:51 +01:00
Thomas Müller
86bd95ea1b Merge pull request #21020 from owncloud/add-directory-slash-to-setup-code 
Add DirectorySlash to dynamic .htaccess write
 2015-12-11 11:40:32 +01:00
Thomas Müller
c14f4e8506 Merge pull request #21045 from owncloud/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2015-12-11 11:39:25 +01:00
Vincent Petry
13ec2bda2d Properly check X-Requested-With header in case of multiple values 
Saw this happening in IE8...
 2015-12-11 11:22:38 +01:00
Thomas Müller
6a179c42ba Merge pull request #21087 from owncloud/catchexceptionindirectdownloadurl 
Catch exception when querying direct download link
 2015-12-11 10:48:54 +01:00
Thomas Müller
ecc3c174a0 Merge pull request #21128 from owncloud/dav-fopen-non-existing 
Dont do a seperate request to check if a file exists when downloading a file from dav external storage
 2015-12-11 10:48:22 +01:00
Thomas Müller
c022128630 Merge pull request #21131 from owncloud/update-public-api 
IMemcacheTTL was backported to 8.2.2
 2015-12-11 10:46:46 +01:00
Thomas Müller
aa476d6d2a Merge pull request #21137 from owncloud/update-issue-template.md 
Update issue template.md
 2015-12-11 10:46:03 +01:00
Lukas Reschke
2f3b10f980 Adjust third-party reference 2015-12-11 10:20:09 +01:00
Joas Schilling
0f122dcefe Remove steps for ownCloud 6 2015-12-11 09:59:38 +01:00
Joas Schilling
60071ef040 Fix the sample occ config call 2015-12-11 09:56:24 +01:00
Lukas Reschke
f3360d51c6 Use PHP polyfills 2015-12-11 08:47:36 +01:00
Jenkins for ownCloud
acce1638e5 [tx-robot] updated from transifex 2015-12-11 01:55:44 -05:00
Arthur Schiwon
4020d5b77a look for DN changes before marking a user as deleted 2015-12-11 01:56:53 +01:00