Bernhard Posselt
e05192a23d
Fix method signature
2014-05-11 14:03:58 +02:00
Bernhard Posselt
3af30625ab
Make db connection protected
2014-05-11 12:54:44 +02:00
Lukas Reschke
62364269c5
Fix Typo, define $ as global
2014-05-11 10:55:00 +02:00
Jenkins for ownCloud
b6d76e9985
[tx-robot] updated from transifex
2014-05-11 01:57:00 -04:00
Lukas Reschke
0cc7d84e16
Merge pull request #8520 from owncloud/jslint_polishing_in_file_upload
...
polish jslint for files-upload.js
2014-05-10 22:43:50 +02:00
Jenkins for ownCloud
05ea8c8a10
[tx-robot] updated from transifex
2014-05-10 01:55:50 -04:00
Bernhard Posselt
9a4d204b55
add cors middleware
...
remove methodannotationreader namespace
fix namespace for server container
fix tests
fail if with cors credentials header is set to true, implement a reusable preflighted cors method in the controller baseclass, make corsmiddleware private and register it for every request
remove uneeded local in cors middleware registratio
dont uppercase cors to easily use it from routes
fix indention
comment fixes
explicitely set allow credentials header to false
dont depend on better controllers PR, fix that stuff later
split cors methods to be in a seperate controller for exposing apis
remove protected definitions from apicontroller since controller has it
2014-05-09 23:34:41 +02:00
Bernhard Posselt
b4298c68ca
- make logger available in the container
...
- inject logger class into log
- adding PHPDoc comments and fixing typos
2014-05-09 23:26:20 +02:00
Thomas Müller
78c0cc6089
escape display name and email
2014-05-09 23:12:26 +02:00
Lukas Reschke
1083085e6e
Merge pull request #7546 from owncloud/no_freaking_tag_dupes
...
Tags cleanup
2014-05-09 22:10:45 +02:00
Thomas Müller
e5ee84ca9b
- update permissions
...
- change xml tag to perm
2014-05-09 17:18:43 +02:00
Robin Appelman
163a7a47f9
Add prompt dialog to OC.dialogs
2014-05-09 17:09:06 +02:00
Jörn Friedrich Dreyer
f0f059576e
polish jslint for files-upload.js
2014-05-09 15:22:11 +02:00
Jan-Christoph Borchardt
bba2d60d36
Merge pull request #8496 from owncloud/fix-folder-icon
...
fix folder icon (file had a big background rectangle before)
2014-05-09 14:19:26 +02:00
Andreas Fischer
bd4d315d78
Merge pull request #8512 from owncloud/fix-memcached-hasKey
...
Be more strict in checking the resultCode of memcached hasKey function
* owncloud/fix-memcached-hasKey:
Memcached hasKey should test for success, the get can fail for other reasons.
2014-05-09 12:41:46 +02:00
Andreas Fischer
603ce95211
Add message about unsupported Microsoft SQL Server.
2014-05-09 12:31:29 +02:00
Andreas Fischer
de78be3891
Store normalised DBMS type in $type.
2014-05-09 12:31:08 +02:00
Jan-Christoph Borchardt
4d595f49a0
reduce multiselect max-width from 400 to 200px to not take too much space
2014-05-09 11:09:31 +02:00
Jenkins for ownCloud
9919ec48df
[tx-robot] updated from transifex
2014-05-09 01:55:42 -04:00
Vincent Petry
6e7c274d2e
Merge pull request #8499 from owncloud/shareextstoragemountpointfix
...
Fix sharing of ext storage mount points
2014-05-08 22:35:01 +02:00
Bart Visscher
88225db4af
Memcached hasKey should test for success, the get can fail for other reasons.
...
One of the other failures is no running server.
2014-05-08 18:11:29 +02:00
Vincent Petry
05dc694c5c
Fix getPathById for Oracle
...
Added extra code to handle the case of Oracle which saves empty strings
as null values.
2014-05-08 13:33:55 +02:00
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
f73a168694
Added unit test for sharing ext storage mount points
2014-05-08 11:00:19 +02:00
Vincent Petry
28f0e6307f
Fix sharing of ext storage mount points
...
When sharing an ext storage mount point, it will now use the name of the
mount point instead of an empty string for the target path.
2014-05-08 10:03:07 +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
Bart Visscher
f569c721a6
Merge branch 'master' into optimize-startup-queries
...
Conflicts:
apps/files_sharing/lib/sharedstorage.php
tests/lib/group/manager.php
removed hasFilesSharedWith from lib/public/share.php and
sharedstorage.php to fix merge
2014-05-07 17:54:38 +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
Jan-Christoph Borchardt
04ea938331
fix folder icon (file had a big background rectangle before)
2014-05-07 11:13:52 +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