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

17650 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bernhard Posselt
a252f59cd4 Merge pull request #8504 from owncloud/cors-middleware 
Add cors middleware
 2014-05-11 16:54:34 +02:00
Bernhard Posselt
e05192a23d Fix method signature 2014-05-11 14:03:58 +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
Lukas Reschke
1083085e6e Merge pull request #7546 from owncloud/no_freaking_tag_dupes 
Tags cleanup
 2014-05-09 22:10:45 +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
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
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
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