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

322 commits

Author SHA1 Message Date
Frank Karlitschek
9ee5069f2a Merge pull request #1856 from owncloud/fix_error_handling_stream_copy 
don't use the number of written bytes as indicator if streamCopy() was successful
 2013-02-25 02:04:12 -08:00
Bart Visscher
bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Björn Schießle
d8137fdf66 return both, count and result if the operation succeeded or failed. Maybe in some cases it is useful to know how much bytes where copied 2013-02-22 16:43:11 +01:00
Bart Visscher
ffae6f4b84 Style-fix: Breakup long lines 2013-02-14 08:38:37 +01:00
Bart Visscher
2d6d0a4ad4 Whitespace indent fixes 2013-02-14 08:36:26 +01:00
Bart Visscher
cd35d257bb Fix NoSpaceAfterComma and SpaceBeforeComma 2013-02-14 08:36:26 +01:00
Bart Visscher
d3ef967993 Fix indentation style 2013-02-14 08:36:26 +01:00
Bart Visscher
ed1dc3e064 Fix files router download links 2013-02-08 22:05:13 +01:00
Thomas Müller
1158447499 missing comma in sql statement 2013-02-08 13:49:26 +01:00
Frank Karlitschek
223f538bb8 Merge pull request #1500 from chriskoch/patch-1 
Update lib/public/util.php
 2013-02-06 13:00:10 -08:00
Bart Visscher
a4d3cc798f Correct lib/public/contacts.php tests 2013-02-06 17:37:47 +01:00
Christian Koch
a4f909cefd Update lib/public/util.php 
The call of \OC_MAIL::send() overrides all optional parameters. This is not necessary. But if you want to have html mail templates (what I'm thinking about) it is a real problem
 2013-02-06 17:22:07 +01:00
Björn Schießle
9e08f85c5e port already approved bugfix to master, https://github.com/owncloud/core/pull/1479 2013-02-06 14:19:32 +01:00
Thomas Müller
74157902d7 Merge pull request #1476 from owncloud/disable-error-handler-while-running-phpunit 
disable error handler while running phpunit
 2013-02-05 14:35:11 -08:00
Thomas Mueller
10ea45c916 fix failing test cases due to wrong typing 2013-02-05 20:19:54 +01:00
Sam Tuke
fd90b82acd Merge github.com:owncloud/core 2013-02-05 13:44:45 +00:00
Thomas Müller
3b8c071df4 Merge pull request #1234 from owncloud/fix-issue-192 
Fix sharing issue with collection and children mismatches
 2013-02-04 11:52:20 -08:00
Stefan Herbrechtsmeier
ab2b79cda6 add multiple domains reverse proxy support 
Add support for a reverse proxy that handles multiple domains via different
web roots (http[s]://proxy.tld/domain.tld/owncloud).

As the reverse proxy web root is transparent for the web server the
REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace
the direct use of this _SERVER variables with function calls and extend
this functions to overwrite the web root. Additionally it adds a Sabre
request backend that extends the Sabre_HTTP_Request to use the same
functions.
 2013-01-31 18:42:31 +01:00
Sam Tuke
31e723a907 Merge github.com:owncloud/core 
Conflicts:
	lib/public/share.php
 2013-01-31 16:30:37 +00:00
Robin Appelman
207aa22d12 merge master into filesystem 2013-01-30 19:24:24 +01:00
Björn Schießle
022a7b13b8 prepare user table to show and edit display names 2013-01-28 13:12:44 +01:00
Björn Schießle
a606e8d944 use display name to show share_width and owner information 2013-01-25 17:40:23 +01:00
Björn Schießle
b4291f1e8e allow to get the display name from an abitrary user 2013-01-25 13:00:17 +01:00
Björn Schießle
4271430e60 get all display names from users in a given group 2013-01-25 11:48:03 +01:00
Björn Schießle
9bb8e05839 get all display names 2013-01-25 11:05:00 +01:00
Björn Schießle
d16574f070 new branch which introduces display names 
first commit with some infrastructure code
 2013-01-24 13:07:59 +01:00
Sam Tuke
14d0903a28 Merge branch 'master' of github.com:owncloud/core 2013-01-23 12:52:53 +00:00
Robin Appelman
83d6221322 merge master into filesytem 2013-01-20 03:11:04 +01:00
Michael Gapczynski
316eef3ded Fix sharing issue with collection and children mismatches 2013-01-19 01:50:02 -05:00
Michael Gapczynski
cd8d8360b0 Disable fancy folder sharing for now 2013-01-18 23:57:13 -05:00
Michael Gapczynski
5df6f9d14d Fix merge 2013-01-18 23:56:47 -05:00
Thomas Müller
31cc9aa80d Merge pull request #986 from owncloud/fixing-784-master 
the maximum upload size is now part of the response of the upload and de...
 2013-01-18 14:06:00 -08:00
Thomas Mueller
5ff29b4348 fixing indent 2013-01-18 20:09:03 +01:00
Robin Appelman
5445b94416 merge master into filesystem 2013-01-16 19:04:50 +01:00
Bart Visscher
5bfe4adbaa Whitespace cleanup 2013-01-16 18:09:16 +01:00
Bart Visscher
a8f963d9cf Spaces to tabs 2013-01-16 18:09:16 +01:00
Thomas Müller
4668f8c86e Merge pull request #1178 from owncloud/return_true_because_of_ponies 
Remove uneeded return
 2013-01-15 14:01:48 -08:00
Thomas Mueller
388bb6a5e1 Merge branch 'master' into fixing-unused-and-undefined-in-master 2013-01-14 23:41:34 +01:00
Lukas Reschke
cc00c54f6a Remove uneeded returns 2013-01-14 20:18:08 +01:00
Sam Tuke
de0ed634f2 Added two hooks: pre_unshare and pre_unshareAll, useful for files_encryption 2013-01-14 17:05:47 +00:00
Thomas Mueller
23896a7290 Merge branch 'master' into fixing-784-master 
Conflicts:
	apps/files/js/files.js
 2013-01-11 09:53:12 +01:00
Jörn Friedrich Dreyer
42e3eaf45a add more linebreaks, replace SQL LIMIT with param 2013-01-09 13:57:51 +01:00
Michael Gapczynski
e8b195bf10 Almost fix Shared scanner... 2013-01-07 20:52:51 -05:00
Robin Appelman
e8d08d4930 merge master into filesystem 2013-01-07 00:16:10 +01:00
Thomas Mueller
a21da9f9fd fixing returns 2013-01-06 23:59:02 +01:00
Thomas Mueller
1093cdd823 fixing returns 2013-01-06 23:57:27 +01:00
Thomas Mueller
19edb29cc3 add missing return 2013-01-06 23:54:18 +01:00
Thomas Mueller
cdd28fcc46 fixing undefined variable $where 2013-01-06 23:48:04 +01:00
Thomas Mueller
bae1755184 Merge branch 'master' into fixing-784-master 
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js
	lib/helper.php
 2013-01-06 22:40:35 +01:00
Michael Gapczynski
0b13b41189 Merge pull request #1053 from owncloud/ocs_api 
External API for ownCloud based on OCS
 2013-01-04 17:18:58 -08:00