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

205 commits

Author SHA1 Message Date
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
Thomas Mueller
665bb41c1f style fixes 2013-01-31 10:27:02 +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
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
Robin Appelman
930b9b9cd0 merge master into filesystem 2013-01-26 18:49:45 +01:00
Lukas Reschke
30274ee33e Move to OC_App 2013-01-21 22:18:11 +01:00
Lukas Reschke
a29f9f90ab Indentation 2013-01-21 22:17:48 +01:00
Frank Karlitschek
a27f92a17a we are getting closer. updating is not working yet. 2013-01-21 20:40:23 +01:00
Robin Appelman
83d6221322 merge master into filesytem 2013-01-20 03:11:04 +01:00
Björn Schießle
d2c5f9bec7 fix error message, add "appid" to the output to know which app caused the error if OC_App::getStorage() fails. 
Port of approved patch for stable45: https://github.com/owncloud/core/pull/1222
 2013-01-18 15:14:42 +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
Robin Appelman
9bf367e7f8 merge master into filesystem 2013-01-15 14:57:23 +01:00
Lukas Reschke
31b1a73e1f Check if user is admin - bool 
There was no "isAdminUser()" function which returned bool. This is
irritiating as there were a loooooooot of places in the code which
checked this itself with `OC_Group::inGroup($uid, 'admin)` - why not
use a function for this?
(Especially if you consider that we might change the group name in the
future, which would lead to problems then)

Additionally, @Raydiation needed such a method for his AppFramework :)
 2013-01-14 19:45:17 +01:00
Robin Appelman
e8d08d4930 merge master into filesystem 2013-01-07 00:16:10 +01:00
Michael Gapczynski
035d0aa9d5 Merge branch 'master' into update-progress 2013-01-05 12:24:21 -05:00
Michael Gapczynski
f6426cee04 Tweak failure message and throw exceptions from updateDbFromStructure() 2013-01-05 12:13:36 -05:00
Michael Gapczynski
89823ef4f9 Modify and include additional update messages from updating apps 2013-01-05 11:28:01 -05:00
Michael Gapczynski
e7eea3dd2e Use hooks to send updates from apps 2013-01-04 10:21:33 -05:00
Tom Needham
3c98f36121 Merge branch 'master' into ocs_api 2012-12-16 22:29:00 +00:00
Robin Appelman
946d58eaa8 merge master into filesystem 2012-12-15 02:21:26 +01:00
Bart Visscher
68562dafb4 More whitespace fixes 2012-12-15 00:43:46 +01:00
Tom Needham
5fe6129698 Merge master into ocs_api, fix conflicts. 2012-12-14 15:15:05 +00:00
Robin Appelman
98f42d314c merge master into filesystem 2012-12-06 17:47:28 +01:00
Bart Visscher
8ce3aca331 Move loading of all the apps to setting the active navigation entry. 
We can't do the loading before matching the route, because some routes
need to do the loading after matching of the route. For example the
navigation detection of the app settings page.
 2012-11-30 12:47:44 +01:00
Robin Appelman
4b940955dd merge master into filesystem 2012-11-04 21:12:18 +01:00
Felix Moeller
30d7993e01 Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
Felix Moeller
afadf93d31 Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
Robin Appelman
6e9e263497 merge master into filesystem 2012-10-30 22:59:55 +01:00
Bart Visscher
40fe6c6346 Remove subnavigation key, not used 2012-10-29 15:04:55 +01:00
Tom Needham
bcdf3a23db Merge master into ocs_api 2012-10-28 11:16:04 +00:00
Robin Appelman
38371d1275 Merge branch 'master' into filesystem 2012-10-27 14:28:24 +02:00
Bart Visscher
0120f3fd62 Merge branch 'routing' 
Conflicts:
	core/lostpassword/index.php
	core/lostpassword/resetpassword.php
 2012-10-27 11:58:02 +02:00
Robin Appelman
286fd78865 Merge branch 'master' into filesystem 2012-10-26 17:40:57 +02:00
Georg Ehrke
1888ac0d41 add the possibility to add an preupdate.php 2012-10-26 13:10:56 +02:00
Robin Appelman
7b150dfa96 merge master into filesystem 2012-10-24 15:32:29 +02:00
Felix Moeller
36d0d75901 Codestyle: FunctionCallArgumentSpacing 2012-10-23 08:35:54 +02:00
Felix Moeller
ff5f9370c4 Checkstyle: MultiLineCondition 2012-10-23 08:25:30 +02:00
Robin Appelman
5217ca219a Merge branch 'master' into filesystem 2012-10-21 15:16:23 +02:00
Bart Visscher
051dde08db Check for file exists before loading app version file 2012-10-20 23:49:55 +02:00
Bart Visscher
6081bfa2bc Merge branch 'master' into routing 
Conflicts:
	lib/search/provider/file.php
	settings/ajax/changepassword.php
	settings/settings.php
 2012-10-17 16:38:11 +02:00
Bart Visscher
44287d680b Check for file exists before loading app version file 2012-10-17 14:06:25 +02:00
Robin Appelman
77cef5f514 merge master into filesystem 2012-10-17 13:14:17 +02:00
Bart Visscher
4af5b016cc Whitespace cleanup 2012-10-14 21:04:08 +02:00
Robin Appelman
07c5384189 fix namespaces in filesystem and filesystemview 2012-10-10 12:25:46 +02:00
Frank Karlitschek
c701bed2e3 fix a lot of small layout bugs and make the apps page overall prettier plus add ratings finally 2012-10-08 15:49:48 +02:00
Frank Karlitschek
3fdebaa5dc automatically remove and prevent installation of apps with a require version less than the current one. We check now the first ad second part of the version number. 
Also increase the require tags of the core apps to 4.9 Please note that 4.9 is the internal versionnumber of the upcoming 4.5 release.
You have to pu a <require>4.9</require> into the info.xml of your app to make it as compatible with 4.5
 2012-10-02 12:10:45 +02:00
Bart Visscher
d0bd2bbf27 Convert menu entries of settings pages to use router 2012-09-28 23:20:17 +02:00