Andreas Fischer
8ede209ea3
Merge pull request #8493 from owncloud/we-certainly-don't-want-type-juggling-on-that
...
Use strict type comparison
* owncloud/we-certainly-don't-want-type-juggling-on-that:
Use strict type comparison
2014-05-08 13:02:48 +02:00
Vincent Petry
af2b7634ee
Merge pull request #8293 from owncloud/files_external_fix_readData
...
Fix issue with personal mount points and sharing
2014-05-08 11:01:54 +02:00
Vincent Petry
390549c286
Merge pull request #8221 from owncloud/type-hinting-sharing
...
Type hinting fixes for sharing
2014-05-08 09:30:50 +02:00
Jenkins for ownCloud
4da6645a94
[tx-robot] updated from transifex
2014-05-08 01:55:39 -04:00
Bart Visscher
9f88141bcd
Use 'boolean' as type instead of 'bool'
2014-05-07 20:46:08 +02:00
Björn Schießle
a2848ee11c
Merge pull request #8497 from owncloud/sharing_cleanup
...
[sharing] some small clean ups and bug fixes
2014-05-07 14:18:41 -04:00
Bjoern Schiessle
f85e968883
Merge branch 'sharing_cleanup' of github.com:owncloud/core into sharing_cleanup
2014-05-07 17:57:32 +02:00
Bjoern Schiessle
d3f957c21e
remove error_log output
2014-05-07 17:56:52 +02:00
Joas Schilling
dbb93074b3
Fix endless loop on windows servers
...
Directory seperator is \ on windows
However we can just check for path != dirname(path) because that is
the same for '' (empty string), '.' and DIRECTORY_SEPARATOR on all OS
2014-05-07 17:38:29 +02:00
Bjoern Schiessle
31bf2d4b33
we can take the permission directly from the share, no need to call the share api first
2014-05-07 16:49:07 +02:00
Lukas Reschke
c4109d9aef
Use strict type comparison
...
We certainly don't want to have type juggling on that.
2014-05-07 15:11:42 +02:00
Lukas Reschke
254fa5eb22
Merge pull request #8488 from owncloud/sabre-notfoundloglevel
...
Some expected Sabre exceptions are now logged with DEBUG level
2014-05-07 15:05:17 +02:00
Vincent Petry
75d81eefc1
Merge pull request #8223 from owncloud/fix_linkToPublic
...
Fix linkToPublic and linkToAbsolute.
2014-05-07 14:40:59 +02:00
Vincent Petry
a8c83f79ef
Merge pull request #8489 from owncloud/share_updater_ignore_part_files
...
[sharing] share updater ignore part files
2014-05-07 14:31:28 +02:00
Bjoern Schiessle
799d8ca381
check if we have a fileinfo
2014-05-07 11:47:52 +02:00
Bjoern Schiessle
bee48f851e
ignore part files
2014-05-07 11:47:27 +02:00
Vincent Petry
4a493c8835
Some expected Sabre exceptions are now logged with DEBUG level
2014-05-07 11:43:50 +02:00
Jenkins for ownCloud
283b483100
[tx-robot] updated from transifex
2014-05-07 01:55:48 -04:00
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
Bart Visscher
72864d1c53
Typo
2014-05-06 18:05:06 +02:00
Morris Jobke
b9f059bd3e
Merge pull request #8466 from owncloud/fix-installation-caret
...
fix enlarged caret on installation page
2014-05-06 14:55:16 +02:00
Jan-Christoph Borchardt
c1dfdbbbb4
fix enlarged caret on installation page
2014-05-06 12:17:13 +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
Thomas Müller
45f8d2d3ff
Merge pull request #8456 from owncloud/extstorage-unittestssuite
...
Added ext storage app in autotest unit test run
2014-05-05 19:48:35 +02:00
Vincent Petry
75a77afe6d
Merge pull request #8458 from snai/master
...
Updated Owncloud Mailinglist URL
2014-05-05 19:45:30 +02:00
icewind1991
bd92b94c6a
Merge pull request #8455 from owncloud/preview-scaleup
...
Dont create borders around previews when scaling up is disabled
2014-05-05 18:24:20 +02:00
Morris Jobke
91a5e728c0
fix getUserFolder() of server container
2014-05-05 18:15:48 +02:00
Martin Grohmann
b731dd3a64
Updated Owncloud Mailinglist URL
2014-05-05 17:03:09 +02:00
Vincent Petry
0c8ae6eb66
Added ext storage app in autotest unit test run
...
To make sure that the dynamic mount config and config classes from
external storages are tested, these are now added into the autotest.sh
test run by enabling the app.
2014-05-05 15:03:10 +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
Jenkins for ownCloud
9385b97b5f
[tx-robot] updated from transifex
2014-05-04 01:56:15 -04:00
Andreas Fischer
e381d7d180
Merge pull request #8440 from wakeup/master
...
Minor changes in config.sample
* wakeup/master:
Update config.sample.php
Minor changes in config.sample
2014-05-03 23:39:10 +02:00
Volkan Gezer
1a0fc49018
Update config.sample.php
2014-05-03 15:38:44 +02:00
Volkan Gezer
6dfc63a240
Minor changes in config.sample
...
* appcodechecker accepts boolean.
* using different ports in trusted domains
Partially fixes #330
2014-05-03 14:41:36 +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
Jenkins for ownCloud
cf20de185c
[tx-robot] updated from transifex
2014-05-03 01:56:11 -04: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
d163441f3e
load image via javascript and use $(document).width() to determine the proper side of the image to be returned
2014-05-02 18:36:58 +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
Thomas Müller
49d9631eee
Merge pull request #8400 from owncloud/download-button-public-folder
...
reintroduce download button on public shares
2014-05-02 16:59:09 +02:00
Thomas Müller
6e75b37d04
disable download button if zip download is disabled
2014-05-02 15:53:46 +02:00
Jan-Christoph Borchardt
899c7c0443
fix position and look of public download button
2014-05-02 15:26:21 +02:00