Vincent Petry
d16bb09aed
Merge pull request #8045 from josh4trunks/nginx_x-accel_send_uri
...
Send URI instead of filepath to NGINX for X-Accel
2014-05-06 18:41:06 +02:00
Morris Jobke
9411ba2acd
Merge pull request #8459 from owncloud/fix-getUserFolder
...
fix getUserFolder() of server container
2014-05-05 23:08:42 +02:00
Morris Jobke
91a5e728c0
fix getUserFolder() of server container
2014-05-05 18:15:48 +02:00
Robin Appelman
578eb33c20
Dont create borders around previews when scaling up is disabled
2014-05-05 14:54:34 +02:00
Vincent Petry
1a454f61ed
Merge pull request #8386 from owncloud/fix_6946_master
...
Fix 6946 master
2014-05-05 14:08:45 +02:00
Thomas Müller
341fcdc37a
Merge pull request #8407 from owncloud/scale-pics-on-public-sharing-master
...
Images on public sharing get downscaled to increase use experience - thi...
2014-05-05 10:12:40 +02:00
Thomas Müller
d2754af7c3
Merge pull request #8442 from owncloud/fix-typo
...
Fix typo and PHPDoc
2014-05-05 10:03:47 +02:00
Jenkins for ownCloud
51d1e6c8b1
[tx-robot] updated from transifex
2014-05-05 01:55:47 -04:00
Lukas Reschke
5cfc9d973d
Fix PHP Doc and use readable variable name
2014-05-04 13:02:58 +02:00
Lukas Reschke
6f57911b44
Does also take int or string
2014-05-04 13:01:57 +02:00
Lukas Reschke
d091cca636
Fix typo
2014-05-04 12:53:06 +02:00
Morris Jobke
623161b9a9
Merge pull request #8023 from flyser/master
...
Fix setting the max-upload-size for really large values.
2014-05-03 11:49:38 +02:00
Bernhard Posselt
906061a07b
Merge pull request #8171 from owncloud/fix-import
...
be nice and use a relative import so people can use the class without fi...
2014-05-02 22:43:19 +02:00
Vincent Petry
9e18be6422
Merge pull request #8377 from youngguns-nl/issue_8376
...
RecursiveDirectoryIterator does not work on NFS
2014-05-02 18:45:09 +02:00
Thomas Müller
20893cc3b3
Images on public sharing get downscaled to increase use experience - this will speed up loading time
...
- adding keep aspect to core/ajax/preview.php
- remove duplicate method Preview::show()
- no more hard coded mimetype of preview
- remove .png from the preview urls
- keep old route preview.png for backwards compatibility
- aspect preserving previews are now cached
2014-05-02 17:02:57 +02:00
Jenkins for ownCloud
6519b9672a
[tx-robot] updated from transifex
2014-05-02 01:55:53 -04:00
Jenkins for ownCloud
17f5a18922
[tx-robot] updated from transifex
2014-05-01 01:56:01 -04:00
Thomas Müller
11404b2b12
Merge pull request #8391 from owncloud/router-parameter-sorting
...
Preserve keys when sorting parameters when generatings urls
2014-04-30 15:10:36 +02:00
Thomas Müller
4481a8412c
Merge pull request #8132 from owncloud/issue/8131
...
Issue/8131 Fix emitting of filesystem related hooks
2014-04-30 13:57:44 +02:00
Jenkins for ownCloud
654a6e6c6a
[tx-robot] updated from transifex
2014-04-30 01:57:53 -04:00
Robin Appelman
77e6278d09
Preserve keys when sorting parameters when generatings urls
2014-04-29 11:55:19 +02:00
icewind1991
b95aa43a5d
Merge pull request #8285 from owncloud/better_getmountby_handling
...
Handle return values better from Filesystem::getMountBy*
2014-04-29 11:22:11 +02:00
Joas Schilling
c060f6ec7b
Deduplicate code
2014-04-29 10:34:28 +02:00
Joas Schilling
c1caaa6241
Correctly emit create/update hooks when a large file is being created/update
...
after being uploaded in .part files
Fix #8131
2014-04-29 10:34:27 +02:00
Joas Schilling
4fa9e46d2b
Emit a new hook, when a file is being updated only
...
The write-hook also is triggered for created files
Fix #8131
2014-04-29 10:34:26 +02:00
Jenkins for ownCloud
b4a5093da8
[tx-robot] updated from transifex
2014-04-29 01:56:49 -04:00
Thomas Müller
7c0340c63c
Merge pull request #7852 from josh4trunks/basic_auth_fix
...
Fixes login / logout when HTTP Basic Headers are avilable.
2014-04-28 21:46:52 +02:00
Thomas Müller
6935364b33
add class Pimple to autloader
2014-04-28 20:57:44 +02:00
Volkan Gezer
e7c6111ae3
Update outdated comment
2014-04-28 20:23:18 +02:00
Sjors van der Pluijm
e8a287f5bb
refs #8376 ; spaces=>tabs
2014-04-28 19:52:06 +02:00
Sjors van der Pluijm
54f482ff9c
refs #8376 ; added comment and applied patch on other files
2014-04-28 19:32:25 +02:00
Arthur Schiwon
45e42c25de
Group Database backend must not gather user details itself but ask user
...
backends. This is a port to master from PR #7745
remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends
Conflicts:
lib/private/group/backend.php
LDAP: getDisplayNamesInGroup is not an option for group backends anymore
Conflicts:
apps/user_ldap/group_ldap.php
apps/user_ldap/group_proxy.php
clean up group backends
Conflicts:
lib/private/group/database.php
remove now unnecessary test
implement getDisplayNames in group manager
adjust user manager tests
test for group manager's displayNamesInGroup
trim must not be used in empty in PHP < 5.5
keep the constant to not provoke PHP warnings
Conflicts:
lib/private/group/backend.php
2014-04-28 13:49:56 +02:00
Sjors van der Pluijm
d7ec1fe447
rewind iterator before iteration starts
2014-04-28 13:05:20 +02:00
Georg Ehrke
b68098ebba
remove preview office fallback as it makes too much trouble and generates inacceptable results
2014-04-28 12:05:10 +02:00
Sjors van der Pluijm
d8be9d96ed
fixes #8376
2014-04-28 10:20:24 +02:00
Thomas Müller
5fd776debf
Merge pull request #7473 from owncloud/append-error-document
...
Remove .htaccess creation code
2014-04-28 08:50:42 +02:00
Jenkins for ownCloud
642f57c1d5
[tx-robot] updated from transifex
2014-04-28 01:56:24 -04:00
Lukas Reschke
e910e63140
Merge pull request #8372 from owncloud/give-admins-a-hint
...
Clarify the trusted_domain error page
2014-04-27 18:28:18 +02:00
Lukas Reschke
1d9ac38da6
Remove an added t by the github webeditor
...
Notice to myself: Stick to my IDE.
2014-04-27 16:41:09 +02:00
Lukas Reschke
7a8bfeae6e
Grammatical fixes
2014-04-27 16:31:04 +02:00
Jenkins for ownCloud
8e5c9eea3a
[tx-robot] updated from transifex
2014-04-27 01:54:54 -04:00
Lukas Reschke
b6612ef04a
Clarify the trusted_domain error page
2014-04-26 23:11:29 +02:00
Jenkins for ownCloud
c591cf0836
[tx-robot] updated from transifex
2014-04-26 01:55:32 -04:00
icewind1991
7599fa94ce
Merge pull request #8350 from owncloud/share-search-mime
...
fix search by mime for shared single files
2014-04-25 15:54:36 +02:00
icewind1991
5194f014c9
Merge pull request #7504 from owncloud/webdav-injection
...
Proper injection of filesystem view into the webdav connector
2014-04-25 14:42:43 +02:00
Robin Appelman
194ea66cb5
Merge branch 'master' into share-search-mime
2014-04-25 14:04:41 +02:00
Robin Appelman
672a8248ce
Correct the path returned by getFolderContent for substorages
2014-04-25 13:56:45 +02:00
Robin Appelman
456ca0cf7d
fix paths of searchByMime results on substorages
2014-04-25 12:31:44 +02:00
Robin Appelman
6c20a014ea
merge master into webdav-injection
2014-04-25 11:47:06 +02:00
Robin McCorkell
77e3d067f0
Better handle return values from Filesystem::getMountBy*
...
getMountByStorageId and getMountByNumericId return an empty array on error,
which should be detected to avoid possible errors. This commit also adds in
some new logging points and throws to aid debugging
2014-04-25 09:50:34 +01:00