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

3005 commits

Author SHA1 Message Date
Tom Needham
ab8777a623 Merge branch 'ocs_capabilities' into ocs_multiple_methods 2013-02-09 11:56:30 +00:00
Tom Needham
742cafb03a Change strucutre of cloud/capabilities response 2013-02-09 11:22:29 +00:00
Tom Needham
406922fc6a Merge master 2013-02-04 18:36:39 +00:00
Tom Needham
aec5ab3ad2 Remove app related values and change structure of /cloud/capabilties call 2013-02-04 18:34:28 +00:00
Thomas Müller
301afac291 Merge pull request #1427 from TheSFReader/master 
The mimetype/mimepart need to be readable, even from searchByMime
 2013-02-04 06:44:40 -08:00
Thomas Müller
814369e0cd Merge pull request #1436 from owncloud/cache_check_path 
Cache: check for invalid paths in getFileInfo/getDirectoryContent
 2013-02-04 05:51:34 -08:00
Robin Appelman
7c33d0a5a7 Cache: fix copy-paste errors 2013-02-04 13:28:31 +01:00
Thomas Müller
f7258cc5e8 Merge pull request #1423 from owncloud/getowner 
Add getOwner to Filesystem and View classes
 2013-02-04 03:08:13 -08:00
Robin Appelman
80dd8d7802 Cache: check for invalid paths in getFileInfo/getDirectoryContent 2013-02-03 23:34:27 +01:00
Lukas Reschke
3def7f8187 Make fileblacklist configurable 2013-02-03 23:03:06 +01:00
TheSFReader
d03155a8d5 translate the mimtype/mimepart to readable in the searchByMime function 2013-02-03 11:06:26 +01:00
Thomas Müller
a3b922763e Merge pull request #1416 from herbrechtsmeier/set_include_path_early 
initPaths: set include path before any owncloud function is called
 2013-02-03 00:25:21 -08:00
Thomas Müller
743c330f03 Merge pull request #1422 from TheSFReader/master 
Correct the Cache Scanner so that it doesn't try and scan subdirs of a non-dir path when renaming
 2013-02-03 00:24:49 -08:00
Michael Gapczynski
6093d961a0 Add getOwner to Filesystem and View classes 2013-02-02 18:50:40 -05:00
Jenkins for ownCloud
2936140838 [tx-robot] updated from transifex 2013-02-03 00:06:15 +01:00
TheSFReader
42d59d5a16 Remove a warning by making sure the renamed file is a dir before trying and opening it 2013-02-02 23:18:29 +01:00
Robin Appelman
ed4130474a Dav: update etag in filecache when doing a PROPSET 2013-02-02 18:26:27 +01:00
Robin Appelman
c61c98cbef Dav: don't overwrite etag from filecache with old etag from properties table 2013-02-02 15:44:05 +01:00
herbrechtsmeier
37e6ac9a2a initPaths: set include path before any owncloud function is called 
Ensure we can find basic owncloud classes while detecting the owncloud
paths in function initPaths by add OC::$SERVERROOT . '/lib' to include
path before any owncloud function is called.

This fix a bug with XAMPP that cannot find the class OC_Config in
function OC_Request::scriptName when called from function
OC_Base::initPaths.
 2013-02-02 12:07:18 +01:00
Jenkins for ownCloud
b29b55a332 [tx-robot] updated from transifex 2013-02-02 00:08:15 +01:00
Frank Karlitschek
03c18a6186 Merge pull request #1413 from owncloud/enable_removing_search_providers 
add function to remove a search provider
 2013-02-01 10:34:39 -08:00
Jörn Friedrich Dreyer
0c85250380 add function to remove a search provider 2013-02-01 19:21:54 +01:00
Bart Visscher
2488a495c6 Merge pull request #1384 from owncloud/upgrade_fix 
Check for upgrade/maintance mode before trying to load an app
 2013-02-01 07:12:06 -08:00
Thomas Müller
b20529ee44 Merge pull request #1171 from owncloud/move-datadirectory-checks 
Move data directory permission checks after data directory existence checks
 2013-01-31 14:54:46 -08:00
Thomas Müller
caec0c476d Merge pull request #1287 from owncloud/ocs_xml_attributes 
API: Treat array keys starting with '@' as XML attributes
 2013-01-31 14:39:31 -08:00
Thomas Müller
317261d6df Merge pull request #1099 from herbrechtsmeier/ssl-proxy 
add multiple domains reverse SSL proxy support
 2013-01-31 14:01:32 -08:00
Brice Maron
17f94de19b Case insensitive Lang Detection fix #1328 2013-01-31 22:37:46 +01:00
herbrechtsmeier
7747f49263 add SSL proxy support 
Add support for a reverse proxy that only forwards SSL connections
unencrypted to the web server.

This patch allows to detect the reverse proxy via regular expression for
the remote IP address and conditional overwrite the host name, protocol
and web root.
 2013-01-31 18:43:30 +01: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
Lukas Reschke
b471177439 Merge pull request #1379 from owncloud/improved_appsmanagement 
Improved appsmanagement
 2013-01-31 08:30:55 -08:00
Jenkins for ownCloud
209d599ec5 [tx-robot] updated from transifex 2013-01-31 17:05:21 +01:00
Frank Karlitschek
f7d281af67 just return "true" for now 2013-01-31 12:24:10 +01:00
Björn Schießle
77765bd967 remove some left over comments 2013-01-31 12:17:23 +01:00
Björn Schießle
ab255e8bb6 add missing brackets 2013-01-31 12:12:39 +01:00
Björn Schießle
9a19c0af4b search for display name and uid (with no display name) since it is possible that not all users have a seperate display name 2013-01-31 12:09:42 +01:00
Thomas Mueller
e8b423f666 style fixes 2013-01-31 10:30:13 +01:00
Thomas Mueller
665bb41c1f style fixes 2013-01-31 10:27:02 +01:00
Frank Karlitschek
5112dac102 remove spaces 2013-01-31 10:00:42 +01:00
Robin Appelman
057920b165 Still load js files in maintance mode 2013-01-30 23:05:44 +01:00
Robin Appelman
f452d2d0c4 Check for upgrade/maintance mode before trying to load an app 2013-01-30 22:55:33 +01:00
Robin Appelman
6043789394 Bumb version number for displayname db upgrade 2013-01-30 19:37:02 +01:00
Robin Appelman
207aa22d12 merge master into filesystem 2013-01-30 19:24:24 +01:00
Robin Appelman
af3b0e30ed Cache: don't insert duplicated during upgrade 2013-01-30 19:19:19 +01:00
Frank Karlitschek
66cab77b6d merge master 
Merge branch 'master' into improved_appsmanagement

Conflicts:
	settings/apps.php
	settings/templates/apps.php
 2013-01-30 14:36:17 +01:00
irgsmirx
0bce22966c Update lib/base.php 
Correction of typo "locate" -> "locale".
 2013-01-30 14:27:08 +01:00
Frank Karlitschek
389c4e8415 mark recommended apps. server part not yet fully implemented 2013-01-30 13:39:53 +01:00
root
3fa4b3abff apps updater is now working 2013-01-30 12:08:14 +01:00
Jörn Friedrich Dreyer
a6040d0cc7 Merge pull request #1308 from TheSFReader/master 
Changed the linkTo function (from Helper class) to get rid of an unnecessary (and potentially non conform) leading '&' character when adding arguments
 2013-01-30 02:37:11 -08:00
Jenkins for ownCloud
68266e70f2 [tx-robot] updated from transifex 2013-01-30 00:25:41 +01:00
Lukas Reschke
250c565d2b Merge pull request #1360 from owncloud/display_name 
introduction of display names
 2013-01-29 14:05:54 -08:00