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

3044 commits

Author SHA1 Message Date
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
Sam Tuke
31e723a907 Merge github.com:owncloud/core 
Conflicts:
	lib/public/share.php
 2013-01-31 16:30:37 +00: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
Björn Schießle
6659798197 only change display name if the display name from the current user was changed; add correct display name to new user 2013-01-29 22:33:46 +01:00
Björn Schießle
007bddceba version dump to trigger db update 2013-01-29 21:04:28 +01:00
Björn Schießle
ebc3d1b2d7 remove dubug value 2013-01-29 21:01:59 +01:00
Arthur Schiwon
79c309da83 Typo 2013-01-29 20:42:21 +01:00
Arthur Schiwon
59bb9931df Adjust user interface to additions around displayName Handling 2013-01-29 20:09:41 +01:00
Thomas Mueller
825cdf8560 add support for apps to register alternative login methods 
below the standard login a list of icons/button will be displayed
 2013-01-29 17:28:08 +01:00
Michael Gapczynski
ca4c006d5a Make zip downloads use actual folder names, fix spelling mistakes 2013-01-28 23:51:35 -05:00
Jenkins for ownCloud
8c4931a645 [tx-robot] updated from transifex 2013-01-29 00:06:20 +01:00
Robin Appelman
74f6f85628 merge master into filesystem 2013-01-28 19:37:58 +01:00
Robin Appelman
06c1c35ac9 Fix phpdoc 2013-01-28 19:08:30 +01:00
Björn Schießle
590c4aa710 search display name instead of uid; fix key/value order for array access 2013-01-28 15:58:40 +01:00
Björn Schießle
c00b66fe5b implement DisplayNamesInGroup for database back-end 2013-01-28 15:47:57 +01:00
Robin Appelman
232cc3211b add oc:// streamwrapper to provide access to ownCloud's virtual filesystem 2013-01-28 15:35:30 +01:00
Robin Appelman
c9c919da57 Move streamwrappers to seperate files and put them in a namespace 2013-01-28 15:34:15 +01:00
Björn Schießle
e6cc0cd08a implement display names for the database back-end 2013-01-28 15:07:31 +01:00
Lukas Reschke
99ec26578a Merge pull request #1313 from owncloud/updater-CSP 
Make update page with CSP compatible
 2013-01-28 05:43:47 -08:00
Björn Schießle
70c3ab3c53 update the display name for the database back-end 2013-01-28 14:23:15 +01:00
Björn Schießle
e0f2ed2757 interface and API to change display names 2013-01-28 14:09:11 +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
996b5cf368 change order, key -> uid and value -> display name, this way it is also possible to have non-unique display names 2013-01-28 13:10:54 +01:00
Thomas Müller
857b15db37 Merge pull request #1318 from j-ed/master 
added parameter mail_smtpauthtype to set SMTP authentication type.
 2013-01-28 01:42:46 -08:00
Thomas Mueller
1d44a99ebb Merge branch 'master' into updater-CSP 
Conflicts:
	core/templates/update.php
 2013-01-28 09:57:24 +01:00
Thomas Müller
31d83fddc4 Merge pull request #1321 from owncloud/csp-fixes 
Files: CSP fixes
 2013-01-28 00:29:46 -08:00
Robin Appelman
bca5ce724e Merge branch 'master' into filesystem 2013-01-28 02:35:51 +01:00
Robin Appelman
3e59a87153 Filesystem: use the updated Mount::findById in getPath to ensure we get the correct path if the storage is also mounted outside the view 2013-01-28 01:02:04 +01:00
Robin Appelman
577e3b11d7 Filesystem: return all matching mounts in Mount::findById 2013-01-28 00:59:43 +01:00
Robin Appelman
4cae141673 Filesystem: also add getPath to \OC\Filesystem 2013-01-27 00:18:15 +01:00
Robin Appelman
17bcea1585 Filesystem: add View->getPath to the cache api 2013-01-27 00:13:50 +01:00
Robin Appelman
9e2a066c7b Cache: add function to get storage id and internal path of a file by id 2013-01-27 00:13:50 +01:00
Robin Appelman
69f11151e9 Filesystem: add Mount::findById 2013-01-27 00:13:49 +01:00
Jenkins for ownCloud
00a28062e1 [tx-robot] updated from transifex 2013-01-27 00:06:21 +01:00
TheSFReader
9c7a18044d Merge remote-tracking branch 'refs/remotes/upstream/master' 2013-01-26 23:19:40 +01:00
Michael Gapczynski
03b947e3ec Don't check for updates for sub storages, these scans should be done in the background 2013-01-26 16:11:35 -05:00
Robin Appelman
f25db779d9 Filesystem: move mount management to it's own class 2013-01-26 21:44:33 +01:00
Michael Gapczynski
7237ebf08b Fix OC_Helper and change deprecated methods 2013-01-26 15:16:53 -05:00
Robin Appelman
930b9b9cd0 merge master into filesystem 2013-01-26 18:49:45 +01:00
Lukas Reschke
c9e25d3fab Merge pull request #1320 from owncloud/implements-1316-master 
lookup for OCA classes in all apps folders
 2013-01-26 05:20:15 -08:00
Lukas Reschke
7f0a3018b6 Fix undefined variable 2013-01-26 13:46:00 +01:00
Thomas Müller
276d98b9dd Merge pull request #1059 from owncloud/fixing-998-master 
Fixing 998 master
 2013-01-26 04:15:40 -08:00
Thomas Mueller
2cc77759aa lookup for OCA classes in all apps folders 2013-01-26 12:45:50 +01:00
j-ed
93834b78a1 Update lib/mail.php 
added parameter mail_smtpauthtype to set SMTP authentication type.
 2013-01-26 12:09:54 +01:00
Jenkins for ownCloud
af4411e33d [tx-robot] updated from transifex 2013-01-26 00:10:07 +01:00
Lukas Reschke
a65410f23c Remove the CSP header for Firefox 
https://bugzilla.mozilla.org/show_bug.cgi?id=737064 *gnarf*
 2013-01-25 21:57:51 +01:00
Lukas Reschke
dbc13cf6ee Move update inline JS 2013-01-25 19:18:16 +01:00
Lukas Reschke
7f49d35930 Move checkMaintenance and checkUpgrade 
This is needed to ensure that the routing and linkTo() function for CSP
are available.
 2013-01-25 19:15:02 +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
TheSFReader
2aead5727e Merge remote-tracking branch 'refs/remotes/upstream/master' 2013-01-25 17:15:02 +01:00
TheSFReader
9f5847b739 Simplify the code and remove a first unnecessary (and non conform) '&' character when there are pending arguments 2013-01-25 17:02:44 +01:00
Lukas Reschke
047f1988c3 Merge branch 'master' into no-inline-js 2013-01-25 16:11:07 +01:00
Lukas Reschke
0d2a58bc5d Initialize router also if ownCloud isn't installed 2013-01-25 14:57:52 +01:00
Lukas Reschke
e5cc5a0a2d Allow the loading of external images 2013-01-25 14:26:14 +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
Jenkins for ownCloud
6832dddf39 [tx-robot] updated from transifex 2013-01-25 00:05:56 +01:00
Björn Schießle
2fee1208ef add display name to title instead if login-ID 2013-01-24 15:49:23 +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
Tom Needham
b26279546c Simpler method for getting the first char 2013-01-24 10:49:48 +00:00
Tom Needham
d89be72972 Remove some whitespace 2013-01-24 10:40:47 +00:00
Tom Needham
02f8c941f4 API: If key begins with '@' treat it as an xml attribute 2013-01-24 10:39:33 +00:00
Thomas Müller
1dac2ba496 Merge pull request #1286 from owncloud/ocs_api 
Check that external api methods return instances of OC_OCS_Result
 2013-01-24 02:37:40 -08:00
Lukas Reschke
f9a9fc5670 Merge pull request #1265 from j-ed/master 
add additional mail_smtp.. parameters to fix possible SMTP connection problems.
 2013-01-24 00:11:03 -08:00