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

231 commits

Author SHA1 Message Date
Robin Appelman
c5402f4575 use strict equals in readdir loops to prevent issues with '0' files 2013-08-19 12:04:53 +02:00
Jan-Christoph Borchardt
367b248bc0 show 'More apps' link to app administration directly in app navigation 2013-08-07 18:18:09 +02:00
Bart Visscher
179b42c56d Fixed review issues 2013-07-22 23:04:14 +02:00
Bart Visscher
df8ad46dae Change exit calls to throwing an exception 
This way the error won't be fatal in a unit test
 2013-07-21 22:29:50 +02:00
kondou
d9c697534d Fix some typos 2013-07-16 06:01:26 +02:00
Björn Schießle
c4aef89278 introduce pre-disable-app hook and use it for the encryption app to reset migration status if the app was disabled 2013-06-27 14:09:22 +02:00
Björn Schießle
839bce80c6 make main menu aware of the different owncloud editions 2013-06-12 16:20:23 +02:00
Jörn Friedrich Dreyer
5ec13742b3 use to_char to allow comparing string to CLOB cloumns in oracle 2013-06-10 10:33:02 +02:00
Jörn Friedrich Dreyer
cbd5eb9a1a use to_char only for oracle, whitespace 2013-05-22 13:59:07 +02:00
Jörn Friedrich Dreyer
eceb3c8ed5 add debug output 2013-05-22 13:59:07 +02:00
Bernhard Posselt
f415f3e03e return true once one owncloud version number is bigger at any position 2013-02-25 23:06:26 +01:00
Bernhard Posselt
5bf3d286f0 created unittests and factored out version test into seperate method 2013-02-25 12:38:00 +01:00
Bernhard Posselt
ecd40f0abc spaces to tabs 2013-02-25 11:40:55 +01:00
Bernhard Posselt
736d5deaee version checks for apps now use all three version numbers and fixed bug that would not do the version check correctly for the second version 2013-02-25 11:39:55 +01:00
Bart Visscher
ffae6f4b84 Style-fix: Breakup long lines 2013-02-14 08:38:37 +01:00
Bart Visscher
2679123846 Add braces around single line if statements 2013-02-14 08:36:26 +01:00
Bart Visscher
d3ef967993 Fix indentation style 2013-02-14 08:36:26 +01:00
Bart Visscher
5c4a804ddb Fix SpaceBeforeOpenBrace errors 2013-02-14 08:36:26 +01:00
Frank Karlitschek
4a130d106c I'm an evil bastard and I commit this 3 letter text fix without a pull request. 2013-02-09 10:09:37 +01:00
Lukas Reschke
01fabd6c65 Merge pull request #1577 from owncloud/typo_catagory 
Typo
 2013-02-10 02:31:34 -08:00
Lukas Reschke
bd2f8980cd Typo 2013-02-09 23:37:42 +01:00
Thomas Müller
0222c589ac Merge pull request #1546 from owncloud/fix-loading-hooks 
Fix loading hooks when going though the routing system
 2013-02-09 09:59:41 -08:00
Bart Visscher
9dddcae9ca Remove invalid characters from app id to prevent loading of invalid resources 2013-02-09 15:10:40 +01:00
Bart Visscher
340d6fce11 Better way of getting the navigation entries for an app 2013-02-08 18:53:43 +01:00
Thomas Müller
efdaea4557 Merge pull request #1357 from owncloud/alternative-loging-master 
add support for apps to register alternative login methods
 2013-02-06 06:49:58 -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
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
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
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