Bjoern Schiessle f8563ec583 Merge branch 'master' into sharing_mail_notification_master ...

increased version number to trigger db update

Conflicts:
	lib/util.php

2013-09-05 13:39:45 +02:00

..

archive

Fix some typos

2013-07-16 06:01:26 +02:00

backgroundjob

Move legacy backgroundjob classes to a place where they can be autoloaded

2013-05-03 16:42:48 +02:00

cache

use strict equals in readdir loops to prevent issues with '0' files

2013-08-19 12:04:53 +02:00

connector/sabre

webdav quota information contains the values for used and free - not total

2013-08-29 12:34:48 +02:00

db

More style fixes

2013-08-07 22:22:33 +02:00

fileproxy

remove outdated quota proxy

2013-08-16 15:50:50 +02:00

files

Merge pull request #4477 from owncloud/hooks-view

2013-09-04 16:09:22 -07:00

group

consolidate validity check for users in group class

2013-08-26 17:46:31 +02:00

hooks

forward previously registerd hooks

2013-07-08 16:54:26 +02:00

l10n

[tx-robot] updated from transifex

2013-09-05 07:37:32 -04:00

legacy

add function to get config object from OC_Config

2013-07-29 16:32:37 +02:00

log

fix typo

2013-08-28 18:36:32 +02:00

memcache

Class Auto Loader: Cache paths in APC

2013-08-18 12:29:43 +02:00

migration

app migrate: Use = instead of LIKE as described in the comment above.

2013-07-29 18:41:22 +02:00

minimizer

adding space between) and {

2012-09-07 15:22:01 +02:00

ocs

remove the activity call here. it is not implemented anyways. This will be provided by Activity app in the future.

2013-08-31 18:14:46 +02:00

preview

style fixes for preview lib

2013-08-19 12:16:55 +02:00

public

Merge branch 'master' into sharing_mail_notification_master

2013-09-05 13:39:45 +02:00

search

merge master into filesystem

2012-11-04 21:12:18 +01:00

session

implement ArrayInterface with Session

2013-05-28 16:52:40 +02:00

setup

Clean up \OC\Util

2013-08-15 15:57:32 +02:00

template

Merge master into oc_preview

2013-08-14 20:56:44 +02:00

user

Add _many_ newlines at the end of files

2013-08-18 11:06:59 +02:00

vobject

Add _many_ newlines at the end of files

2013-08-18 11:06:59 +02:00

api.php

Allow setting defaults and requirements for the api route

2013-06-28 17:25:10 +02:00

app.php

Merge branch 'master' into clean_up_util

2013-09-02 07:58:06 +02:00

appconfig.php

Style-fix: Breakup long lines

2013-02-14 08:38:37 +01:00

archive.php

use strict equals in readdir loops to prevent issues with '0' files

2013-08-19 12:04:53 +02:00

arrayparser.php

Use a parser to read custom mount configuration instead of including the php files

2013-02-16 01:30:44 +01:00

autoloader.php

Class Auto Loader: Cache paths in APC

2013-08-18 12:29:43 +02:00

backgroundjob.php

Whitespace cleanup

2013-01-16 18:09:16 +01:00

base.php

Merge branch 'master' into clean_up_util

2013-09-02 07:58:06 +02:00

cache.php

Seperate memory based cache from OC_Cache

2013-03-17 16:00:39 +01:00

config.php

merge master

2013-07-24 16:31:01 +02:00

db.php

More style fixes

2013-08-07 22:22:33 +02:00

defaults.php

coding-style fixes

2013-09-03 13:37:06 +02:00

eventsource.php

Split scanning logic from ajax file

2013-07-19 16:44:47 +02:00

filechunking.php

Style-fix: Breakup long lines

2013-02-14 08:38:37 +01:00

fileproxy.php

remove fileatime from common storage backend

2012-11-24 22:55:26 +01:00

files.php

Fixed review issues

2013-07-22 23:04:14 +02:00

geo.php

Add _many_ newlines at the end of files

2013-08-18 11:06:59 +02:00

group.php

fix function call for searUsers()

2013-08-08 13:41:04 +02:00

helper.php

Merge master into oc_preview

2013-08-30 18:11:18 +02:00

hintexception.php

Merge branch 'master' into convert-oc_config

2013-06-27 17:54:17 +02:00

hook.php

Whitespace fixes

2013-02-22 19:05:36 +01:00

image.php

Check for $this->fileInfo and @depend on testData()

2013-09-01 15:50:58 +02:00

installer.php

Merge branch 'master' into improve_app-management

2013-08-21 19:20:25 +02:00

json.php

use utf-8 encoding for json

2013-04-25 11:36:41 +02:00

l10n.php

Changing elseif statement to what the PEAR coding guidelines say.

2013-08-09 22:32:38 +02:00

log.php

Fix usage of non existent consts

2013-06-28 11:15:25 +02:00

mail.php

move to non-static OC_Defaults

2013-07-04 10:11:16 +02:00

migrate.php

Check if username is valid and remove slashes from filename

2013-03-11 16:21:26 +01:00

mimetypes.list.php

add reveal mimetype

2013-08-03 21:59:44 +02:00

minimizer.php

really check if mod_deflate is loaded

2012-11-15 10:35:53 +01:00

ocs.php

Style-fix: Breakup long lines

2013-02-14 08:38:37 +01:00

ocsclient.php

remove knowledgebase calls that are no longer used in ownCloud 5/6

2013-08-31 18:00:53 +02:00

preferences.php

Fix some typos

2013-07-16 06:01:26 +02:00

preview.php

fix parameter missing warning

2013-08-29 16:13:16 +02:00

request.php

use $_SERVER['SERVER_NAME'] in case $_SERVER['HTTP_HOST'] is not set

2013-07-01 23:51:43 +02:00

response.php

clean up usage of DatabaseSetupException and catch Exceptions in entrypoints

2013-06-10 13:45:19 +02:00

route.php

Checkstyle fixes: NoSpaceAfterComma

2012-11-04 11:10:46 +01:00

router.php

Fix previous commit

2013-02-07 18:30:01 +01:00

search.php

Whitespace fixes

2013-02-22 19:05:36 +01:00

setup.php

Clean up \OC\Util

2013-08-15 15:57:32 +02:00

subadmin.php

Check if user is admin - bool

2013-01-14 19:45:17 +01:00

template.php

style fixes

2013-07-30 12:33:54 +02:00

templatelayout.php

Clean up \OC\Util

2013-08-15 15:57:32 +02:00

updater.php

revert debugging code which accidentially entered this pull request

2013-08-27 10:49:10 +02:00

user.php

Clean up \OC\Util

2013-08-15 15:57:32 +02:00

util.php

Merge branch 'master' into sharing_mail_notification_master

2013-09-05 13:39:45 +02:00

vcategories.php

fix numRows usage in core lib

2013-06-24 16:29:59 +02:00

vobject.php

Checkstyle: many fixes

2012-11-02 19:53:02 +01:00