]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
9 years agoMerge pull request #12479 from rclarkson/master
Morris Jobke [Fri, 28 Nov 2014 08:29:15 +0000 (09:29 +0100)]
Merge pull request #12479 from rclarkson/master

Limit blacklist to php files

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 28 Nov 2014 06:55:29 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

9 years agoLimit blacklist to php files
Richard Clarkson [Thu, 27 Nov 2014 19:26:45 +0000 (20:26 +0100)]
Limit blacklist to php files

During performance optimization I have discovered that the installer scans all files for the blacklisted words. This greatly impacts speed on lower end devices such as the raspberry pie. This commit limits it to PHP files which seems to achieve the desired effect.

I have used the --include option to achieve this, see http://stackoverflow.com/questions/1987926/how-do-i-grep-recursively

This contribution is MIT licensed

9 years agoMerge pull request #12426 from owncloud/jail-mask-wrappers
Robin Appelman [Thu, 27 Nov 2014 15:00:14 +0000 (16:00 +0100)]
Merge pull request #12426 from owncloud/jail-mask-wrappers

Add Jail and PermissionsMask storage wrappers

9 years agoAdd storage and cache wrappers to apply a permissions mask to a storage
Robin Appelman [Mon, 10 Nov 2014 15:00:25 +0000 (16:00 +0100)]
Add storage and cache wrappers to apply a permissions mask to a storage

9 years agoAdd storage and cache wrappers to jail a storage to a subfolder
Robin Appelman [Mon, 10 Nov 2014 15:00:08 +0000 (16:00 +0100)]
Add storage and cache wrappers to jail a storage to a subfolder

9 years agoMerge pull request #12470 from owncloud/jenkins-12447
Lukas Reschke [Thu, 27 Nov 2014 14:16:14 +0000 (15:16 +0100)]
Merge pull request #12470 from owncloud/jenkins-12447

Jenkins 12447

9 years agoMerge pull request #12462 from owncloud/issue/12460-localstorage-buildpath
Vincent Petry [Thu, 27 Nov 2014 13:57:08 +0000 (14:57 +0100)]
Merge pull request #12462 from owncloud/issue/12460-localstorage-buildpath

Introduce buildPath() in Storage\Local to reduce the difference to MappedLocal

9 years agoMove OC_USER_BACKEND_* constants to OC_User_Backend class
Joas Schilling [Wed, 26 Nov 2014 11:17:28 +0000 (12:17 +0100)]
Move OC_USER_BACKEND_* constants to OC_User_Backend class

9 years agoMove OC_GROUP_BACKEND_* constants to OC_Group_Backend class
Joas Schilling [Wed, 26 Nov 2014 11:04:59 +0000 (12:04 +0100)]
Move OC_GROUP_BACKEND_* constants to OC_Group_Backend class

9 years agoMerge pull request #12449 from owncloud/issue/12444-namespace-exceptions
Joas Schilling [Thu, 27 Nov 2014 11:14:06 +0000 (12:14 +0100)]
Merge pull request #12449 from owncloud/issue/12444-namespace-exceptions

Issue/12444 namespace exceptions

9 years agoMerge pull request #12418 from owncloud/delete_previews
Morris Jobke [Thu, 27 Nov 2014 11:09:39 +0000 (12:09 +0100)]
Merge pull request #12418 from owncloud/delete_previews

delete old previews

9 years agoRemove unused 2nd parameter of buildPath() and rename to getSourcePath()
Joas Schilling [Thu, 27 Nov 2014 09:55:39 +0000 (10:55 +0100)]
Remove unused 2nd parameter of buildPath() and rename to getSourcePath()

9 years agoIntroduce getSourcePath() in Storage\Local to reduce the difference to MappedLocal
Joas Schilling [Wed, 26 Nov 2014 15:58:25 +0000 (16:58 +0100)]
Introduce getSourcePath() in Storage\Local to reduce the difference to MappedLocal

9 years agoMerge pull request #12464 from owncloud/cache-available-languages
Vincent Petry [Thu, 27 Nov 2014 10:12:18 +0000 (11:12 +0100)]
Merge pull request #12464 from owncloud/cache-available-languages

Cache results of available languages

9 years agoReplace exception with standard exception
Joas Schilling [Wed, 26 Nov 2014 11:42:43 +0000 (12:42 +0100)]
Replace exception with standard exception

9 years agoCorrectly namespace and autoload DatabaseException
Joas Schilling [Wed, 26 Nov 2014 11:38:24 +0000 (12:38 +0100)]
Correctly namespace and autoload DatabaseException

9 years agoMerge pull request #12451 from owncloud/issue/6101-remove-gettype-class
Vincent Petry [Thu, 27 Nov 2014 10:03:55 +0000 (11:03 +0100)]
Merge pull request #12451 from owncloud/issue/6101-remove-gettype-class

Move constants from GET_TYPE to OC\Files so they can be autoloaded

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 27 Nov 2014 06:54:46 +0000 (01:54 -0500)]
[tx-robot] updated from transifex

9 years agoCache results of available languages
Lukas Reschke [Wed, 26 Nov 2014 23:01:55 +0000 (00:01 +0100)]
Cache results of available languages

This function is about 8 times calles for every single page call, when caching this variable I was able to gain a small performance improvement from 20,512 µs to 630 µs profiled with xhprof

Surely, this is no gigantic gain but if we would do that for every function out there...

9 years agoMerge pull request #12433 from owncloud/appstore
Vincent Petry [Wed, 26 Nov 2014 16:56:25 +0000 (17:56 +0100)]
Merge pull request #12433 from owncloud/appstore

added comment that App Store is disabled for EE

9 years agoMerge pull request #12304 from oparoz/patch-1
Vincent Petry [Wed, 26 Nov 2014 16:16:46 +0000 (17:16 +0100)]
Merge pull request #12304 from oparoz/patch-1

Use a more universal shebang

9 years agoMerge pull request #12448 from owncloud/no503forRoot
Morris Jobke [Wed, 26 Nov 2014 16:06:43 +0000 (17:06 +0100)]
Merge pull request #12448 from owncloud/no503forRoot

Don't show favicon to prevent iteration through subfolders

9 years agoMerge pull request #12453 from owncloud/kill-session-global
Thomas Müller [Wed, 26 Nov 2014 15:51:26 +0000 (16:51 +0100)]
Merge pull request #12453 from owncloud/kill-session-global

remove deprecated \OC:$session

9 years agoremove deprecated \OC:$session
Thomas Müller [Wed, 26 Nov 2014 12:16:22 +0000 (13:16 +0100)]
remove deprecated \OC:$session

9 years agoMove constants from GET_TYPE to OC\Files so they can be autoloaded
Joas Schilling [Wed, 26 Nov 2014 11:56:54 +0000 (12:56 +0100)]
Move constants from GET_TYPE to OC\Files so they can be autoloaded

9 years agoDon't show favicon to prevent iteration through subfolders
Lukas Reschke [Wed, 26 Nov 2014 11:38:26 +0000 (12:38 +0100)]
Don't show favicon to prevent iteration through subfolders

The codepath for generating the favicons iterates through subnodes and if one of those nodes is unavailable is throwing a 503 exception. Since these favicons don't have any use except of "making a tool for developers looking nicer" I consider it feasible to remove them.

9 years agoCorrectly namespace DatabaseSetupException
Joas Schilling [Wed, 26 Nov 2014 11:30:07 +0000 (12:30 +0100)]
Correctly namespace DatabaseSetupException

9 years agoMerge pull request #6989 from AdamWill/google-1
Robin Appelman [Wed, 26 Nov 2014 11:17:57 +0000 (12:17 +0100)]
Merge pull request #6989 from AdamWill/google-1

Migrate Google Drive external storage app to v1.0.6-beta of the google-api-php-client library

9 years agoMerge pull request #12414 from owncloud/delay-autoconfig-kill-2
Morris Jobke [Wed, 26 Nov 2014 10:05:23 +0000 (11:05 +0100)]
Merge pull request #12414 from owncloud/delay-autoconfig-kill-2

autoconfig.php only to be deleted on successful installation

9 years agoMerge pull request #12411 from owncloud/unknown-command-windows
Lukas Reschke [Wed, 26 Nov 2014 09:29:41 +0000 (10:29 +0100)]
Merge pull request #12411 from owncloud/unknown-command-windows

Replace some more "command -v" calls with the Helper method

9 years agoMerge pull request #12438 from owncloud/jenkins-no-new-session-ocs-api
Morris Jobke [Wed, 26 Nov 2014 09:22:16 +0000 (10:22 +0100)]
Merge pull request #12438 from owncloud/jenkins-no-new-session-ocs-api

because OC_User::login will create a new session we shall only try to lo...

9 years agoMerge pull request #12350 from mprokop/link_expiration
Morris Jobke [Wed, 26 Nov 2014 09:19:12 +0000 (10:19 +0100)]
Merge pull request #12350 from mprokop/link_expiration

fix calculation of expiration date if there is a default expiration date...

9 years agobecause OC_User::login will create a new session we shall only try to login if user...
Thomas Müller [Fri, 28 Mar 2014 10:25:55 +0000 (11:25 +0100)]
because OC_User::login will create a new session we shall only try to login if user and pass are set

ensure to never destroy an existing session

9 years agoMerge pull request #12421 from owncloud/issue/6101-remove-namespace-permission-constants
Morris Jobke [Wed, 26 Nov 2014 07:31:23 +0000 (08:31 +0100)]
Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permission-constants

Issue/6101 remove namespace permission constants

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 26 Nov 2014 06:54:31 +0000 (01:54 -0500)]
[tx-robot] updated from transifex

9 years agoadded comment that App Store is disabled for EE
Carla Schroder [Wed, 26 Nov 2014 00:31:02 +0000 (16:31 -0800)]
added comment that App Store is disabled for EE

9 years agoMerge pull request #12420 from owncloud/sqlite-wal-2
Morris Jobke [Tue, 25 Nov 2014 23:47:22 +0000 (00:47 +0100)]
Merge pull request #12420 from owncloud/sqlite-wal-2

adding new config parameter for sqlite to specify the journal mode

9 years agoMerge pull request #12410 from owncloud/no_session_for_public_share_key
Thomas Müller [Tue, 25 Nov 2014 21:26:40 +0000 (22:26 +0100)]
Merge pull request #12410 from owncloud/no_session_for_public_share_key

don't store private public-share-key in session

9 years agofix failing unit test for the temp manager - concurrently executed unit tests influen...
Thomas Müller [Tue, 25 Nov 2014 21:16:48 +0000 (22:16 +0100)]
fix failing unit test for the temp manager - concurrently executed unit tests influence each other

9 years agoReplace some more "command -v" calls with the Helper method
Joas Schilling [Tue, 25 Nov 2014 10:06:26 +0000 (11:06 +0100)]
Replace some more "command -v" calls with the Helper method

9 years agoReplace deprecated constant with new class constant
Joas Schilling [Tue, 25 Nov 2014 15:28:41 +0000 (16:28 +0100)]
Replace deprecated constant with new class constant

9 years agoadding new config parameter for sqlite to specify the journal mode
Thomas Müller [Wed, 29 Oct 2014 16:23:27 +0000 (17:23 +0100)]
adding new config parameter for sqlite to specify the journal mode

9 years agoMove namespaced constants to namespaced class
Joas Schilling [Tue, 25 Nov 2014 15:27:27 +0000 (16:27 +0100)]
Move namespaced constants to namespaced class

9 years agoreplace \OC:: with \OC::->getSession()
Bjoern Schiessle [Tue, 25 Nov 2014 15:15:32 +0000 (16:15 +0100)]
replace \OC:: with \OC::->getSession()

9 years agoMerge pull request #12416 from owncloud/app-info-xml-parser-2
Thomas Müller [Tue, 25 Nov 2014 14:56:52 +0000 (15:56 +0100)]
Merge pull request #12416 from owncloud/app-info-xml-parser-2

App info xml parser 2

9 years agodelete old previews
Georg Ehrke [Tue, 25 Nov 2014 14:42:02 +0000 (15:42 +0100)]
delete old previews

9 years agowe no longer need to keep the session open for encryption
Bjoern Schiessle [Tue, 25 Nov 2014 09:17:31 +0000 (10:17 +0100)]
we no longer need to keep the session open for encryption

9 years agoMerge pull request #12313 from oparoz/patch-2
Thomas Müller [Tue, 25 Nov 2014 11:40:25 +0000 (12:40 +0100)]
Merge pull request #12313 from oparoz/patch-2

The class name is Movie NOT Movies

9 years agodon't store private public-share-key in session
Bjoern Schiessle [Tue, 25 Nov 2014 09:12:30 +0000 (10:12 +0100)]
don't store private public-share-key in session

9 years agohandle invalid xml file
Thomas Müller [Tue, 25 Nov 2014 09:22:06 +0000 (10:22 +0100)]
handle invalid xml file

9 years agosimplify xml parser code
Thomas Müller [Mon, 24 Nov 2014 16:26:07 +0000 (17:26 +0100)]
simplify xml parser code

9 years agoIntroduce app info xml parser including basic unit test - necessary for #10777
Thomas Müller [Mon, 24 Nov 2014 15:24:26 +0000 (16:24 +0100)]
Introduce app info xml parser including basic unit test - necessary for #10777

9 years agoThe class name is Movie NOT Movies
Olivier Paroz [Fri, 21 Nov 2014 16:12:11 +0000 (17:12 +0100)]
The class name is Movie NOT Movies

9 years agoautoconfig.php only to be deleted on successful installation
Thomas Müller [Tue, 18 Nov 2014 22:47:00 +0000 (23:47 +0100)]
autoconfig.php only to be deleted on successful installation

9 years agoremove unused variable
Bjoern Schiessle [Tue, 25 Nov 2014 09:12:10 +0000 (10:12 +0100)]
remove unused variable

9 years agoMerge pull request #12262 from owncloud/removeAbsoluteDirectoryPathFromTemplate
Morris Jobke [Tue, 25 Nov 2014 09:09:16 +0000 (10:09 +0100)]
Merge pull request #12262 from owncloud/removeAbsoluteDirectoryPathFromTemplate

Don't disclose relative directory path for single shared files of user

9 years agoMerge pull request #12390 from owncloud/use-session-in-case
Morris Jobke [Tue, 25 Nov 2014 08:32:16 +0000 (09:32 +0100)]
Merge pull request #12390 from owncloud/use-session-in-case

Close session only if encryption app is not enabled

9 years agoMerge pull request #12402 from owncloud/fix-phpdoc
Morris Jobke [Tue, 25 Nov 2014 08:20:36 +0000 (09:20 +0100)]
Merge pull request #12402 from owncloud/fix-phpdoc

Fix PHPDoc and deprecated code

9 years agoMerge pull request #12380 from owncloud/remove-oc-migrate
Lukas Reschke [Mon, 24 Nov 2014 23:25:37 +0000 (00:25 +0100)]
Merge pull request #12380 from owncloud/remove-oc-migrate

Remove OC_Migrate

9 years agoFix PHPDoc and deprecated code
Lukas Reschke [Mon, 24 Nov 2014 22:09:49 +0000 (23:09 +0100)]
Fix PHPDoc and deprecated code

Some PHPDocs were incorrect, also used this opportunity to replace some deprecated functions.

9 years agoMerge pull request #11837 from owncloud/fix-11328
Morris Jobke [Mon, 24 Nov 2014 17:13:01 +0000 (18:13 +0100)]
Merge pull request #11837 from owncloud/fix-11328

unify count filters and introduce display name attribute detection

9 years agoMerge pull request #12391 from owncloud/fix_12361
Björn Schießle [Mon, 24 Nov 2014 16:06:48 +0000 (17:06 +0100)]
Merge pull request #12391 from owncloud/fix_12361

use login name to verify password

9 years agoMerge pull request #12294 from owncloud/route-postfix
Thomas Müller [Mon, 24 Nov 2014 15:32:54 +0000 (16:32 +0100)]
Merge pull request #12294 from owncloud/route-postfix

Add route postfix to allow url versioning when only the http method changed

9 years agouse login name to verify password
Bjoern Schiessle [Mon, 24 Nov 2014 14:44:43 +0000 (15:44 +0100)]
use login name to verify password

9 years agoClose session only if encryption app is not enabled
Lukas Reschke [Mon, 24 Nov 2014 14:02:49 +0000 (15:02 +0100)]
Close session only if encryption app is not enabled

Fixes https://github.com/owncloud/core/issues/12389

9 years agoMerge pull request #12303 from owncloud/windows-unknown-command-command
Morris Jobke [Mon, 24 Nov 2014 13:03:07 +0000 (14:03 +0100)]
Merge pull request #12303 from owncloud/windows-unknown-command-command

Deduplicate findBinaryPath() and do not try "command -v" on windows

9 years agoMerge pull request #12142 from owncloud/DeprecateOldIAPICalls
Morris Jobke [Mon, 24 Nov 2014 13:01:49 +0000 (14:01 +0100)]
Merge pull request #12142 from owncloud/DeprecateOldIAPICalls

Deprecate older API wrappers and calls

9 years agoMerge pull request #12084 from owncloud/sharing_fix_shared_with_info
Morris Jobke [Mon, 24 Nov 2014 10:44:43 +0000 (11:44 +0100)]
Merge pull request #12084 from owncloud/sharing_fix_shared_with_info

sharing: make sure that we only find the shares from a given owner

9 years agoMerge pull request #12359 from owncloud/fix-redirect-url-for-password-change
Thomas Müller [Mon, 24 Nov 2014 10:09:17 +0000 (11:09 +0100)]
Merge pull request #12359 from owncloud/fix-redirect-url-for-password-change

Use `/` as redirect location if webroot is set to an empty value

9 years agoMerge pull request #12362 from owncloud/add-ocs-header-per-default
Vincent Petry [Mon, 24 Nov 2014 10:09:00 +0000 (11:09 +0100)]
Merge pull request #12362 from owncloud/add-ocs-header-per-default

Add OCS API header per default

9 years agoRemove OC_Migrate
Lukas Reschke [Mon, 24 Nov 2014 09:53:45 +0000 (10:53 +0100)]
Remove OC_Migrate

This is unused legacy code. Let it die with ~~~honor~~ fire.

Fixes https://github.com/owncloud/core/issues/12346

9 years agoMerge pull request #12374 from owncloud/vagrant_puphpet_gitignore
Lukas Reschke [Mon, 24 Nov 2014 08:01:23 +0000 (09:01 +0100)]
Merge pull request #12374 from owncloud/vagrant_puphpet_gitignore

add puphpet and vagrant to gitignore

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 24 Nov 2014 06:54:35 +0000 (01:54 -0500)]
[tx-robot] updated from transifex

9 years agoMerge pull request #12372 from owncloud/preview_tiff_fix
Lukas Reschke [Mon, 24 Nov 2014 00:12:43 +0000 (01:12 +0100)]
Merge pull request #12372 from owncloud/preview_tiff_fix

remove ugly hack and don't use OC\Preview\Image for tiffs and svgs

9 years agoadd puphpet and vagrant to gitignore
Georg Ehrke [Sun, 23 Nov 2014 21:00:33 +0000 (22:00 +0100)]
add puphpet and vagrant to gitignore

9 years agoremove ugly hack and don't use OC\Preview\Image for tiffs and svgs
Georg Ehrke [Sun, 23 Nov 2014 18:11:03 +0000 (19:11 +0100)]
remove ugly hack and don't use OC\Preview\Image for tiffs and svgs

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 23 Nov 2014 06:54:39 +0000 (01:54 -0500)]
[tx-robot] updated from transifex

9 years agoMerge pull request #12348 from owncloud/rename-to-avoid-complaining-ci
Morris Jobke [Sat, 22 Nov 2014 15:41:29 +0000 (16:41 +0100)]
Merge pull request #12348 from owncloud/rename-to-avoid-complaining-ci

Rename providers to not begin with test

9 years agoMerge pull request #12328 from owncloud/remove-testcleanuplistener
Morris Jobke [Sat, 22 Nov 2014 09:05:47 +0000 (10:05 +0100)]
Merge pull request #12328 from owncloud/remove-testcleanuplistener

Remove testcleanuplistener

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 22 Nov 2014 06:55:21 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

9 years agomake scrutinizer happier and always count users on assisted mode, even with xp'ed...
Arthur Schiwon [Fri, 21 Nov 2014 23:51:41 +0000 (00:51 +0100)]
make scrutinizer happier and always count users on assisted mode, even with xp'ed mode (would be a regression otherwise)

9 years agoAdd OCS API header per default
Lukas Reschke [Fri, 21 Nov 2014 18:54:19 +0000 (19:54 +0100)]
Add OCS API header per default

Relieve @PVince from having to write it all the time ;-)

9 years agomake updateCount work properly with new xp'd mode as well as without
Arthur Schiwon [Fri, 21 Nov 2014 15:23:56 +0000 (16:23 +0100)]
make updateCount work properly with new xp'd mode as well as without

9 years agoalso check for the correct owner if it was submitted
Bjoern Schiessle [Mon, 10 Nov 2014 12:08:45 +0000 (13:08 +0100)]
also check for the correct owner if it was submitted

9 years agoUse `/` as redirect location if webroot is set to an empty value
Lukas Reschke [Fri, 21 Nov 2014 14:35:14 +0000 (15:35 +0100)]
Use `/` as redirect location if webroot is set to an empty value

If the webroot has been set to an empty value or ownCloud has been installed at the root location (`/``) there is a fair chance that the redirect for password resets does not work at all.

This means that while the password is getting resetted the user is not redirected to the login page.

I'm aware that it might be better to just set the webroot to `/` in those cases but this patch is better in the regard that it cannot break stuff.

Thanks to @PVince81 for helping me debugging this. (I'm a moron and assumed it couldn't be THAT easy)

Reported by @cdamken

9 years agofix counting when ldapPagingSize is 0
Arthur Schiwon [Fri, 21 Nov 2014 13:51:20 +0000 (14:51 +0100)]
fix counting when ldapPagingSize is 0

9 years agoConsolidate if statement, and update unit test
Miguel Prokop [Fri, 21 Nov 2014 12:31:56 +0000 (13:31 +0100)]
Consolidate if statement, and update unit test

9 years agoMerge pull request #12342 from owncloud/fix-master-unit-tests
Thomas Müller [Fri, 21 Nov 2014 12:07:51 +0000 (13:07 +0100)]
Merge pull request #12342 from owncloud/fix-master-unit-tests

fix unit tests of mdb2scheamreader

9 years agofix calculation of expiration date if there is a default expiration date set (but...
Miguel Prokop [Fri, 21 Nov 2014 10:01:39 +0000 (11:01 +0100)]
fix calculation of expiration date if there is a default expiration date set (but not forced) and the user does not want the link to expire.

9 years agoRename providers to not begin with test
Lukas Reschke [Fri, 21 Nov 2014 09:48:05 +0000 (10:48 +0100)]
Rename providers to not begin with test

Fixes https://github.com/owncloud/core/issues/12347

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 21 Nov 2014 07:54:26 +0000 (02:54 -0500)]
[tx-robot] updated from transifex

9 years agoMerge pull request #12344 from owncloud/fixstypo
Thomas Müller [Fri, 21 Nov 2014 07:40:07 +0000 (08:40 +0100)]
Merge pull request #12344 from owncloud/fixstypo

update grammar

9 years agoupdate grammar
Volkan Gezer [Fri, 21 Nov 2014 01:17:02 +0000 (02:17 +0100)]
update grammar

Suggested by mnestis on Transifex.

9 years agofix unit tests of mdb2scheamreader
Morris Jobke [Thu, 20 Nov 2014 21:35:37 +0000 (22:35 +0100)]
fix unit tests of mdb2scheamreader

9 years agoRevert "drop OC_Preferences::getUsers and getApps"
Morris Jobke [Thu, 20 Nov 2014 21:02:26 +0000 (22:02 +0100)]
Revert "drop OC_Preferences::getUsers and getApps"

This reverts commit 09fd34eed908203674721af86ce889bfd0a0ef8d.

9 years agoMerge pull request #12336 from owncloud/drop-getApps-getUsers
Morris Jobke [Thu, 20 Nov 2014 20:59:15 +0000 (21:59 +0100)]
Merge pull request #12336 from owncloud/drop-getApps-getUsers

drop OC_Preferences::getUsers and getApps

9 years agotrigger count on the correct filter
Arthur Schiwon [Thu, 20 Nov 2014 17:31:24 +0000 (18:31 +0100)]
trigger count on the correct filter

9 years agophpdoc and mixed up letters
Arthur Schiwon [Thu, 20 Nov 2014 17:03:47 +0000 (18:03 +0100)]
phpdoc and mixed up letters

9 years agobetter readbility, no effective changes
Arthur Schiwon [Wed, 29 Oct 2014 18:30:49 +0000 (19:30 +0100)]
better readbility, no effective changes