summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* unit testsBjoern Schiessle2015-01-091-4/+86
|
* don't move encryption keys if a mount point was renamedBjoern Schiessle2015-01-091-626/+628
|
* Merge pull request #12011 from owncloud/reuse-etag-defaultMorris Jobke2015-01-091-2/+2
|\ | | | | Default to reusing etags in the scanner
| * Default to reusing etags in the scannerRobin Appelman2014-11-061-2/+2
| |
* | Merge pull request #12995 from owncloud/tbelau666-masterThomas Müller2015-01-097-32/+47
|\ \ | | | | | | Use Doctrines filter by table name
| * | add default for dbtableprefixMorris Jobke2014-12-234-5/+5
| | |
| * | add proper prefix for migration testsMorris Jobke2014-12-231-1/+1
| | |
| * | use injected config object and fix typosMorris Jobke2014-12-224-11/+25
| | |
| * | inject \OCP\IConfig instance in migratorMorris Jobke2014-12-223-23/+13
| | |
| * | Use Doctrines filter by table nametbelau6662014-12-225-6/+17
| | | | | | | | | | | | | | | | | | | | | Doctrine's SchemaManager can filter table names by regular expression. On this way it picks up only ownClouds's tables in a database. by tbelau666
* | | Merge pull request #13191 from owncloud/fix-rename-fieldMorris Jobke2015-01-091-2/+6
|\ \ \ | | | | | | | | fix rename field position, fix #12927
| * | | fix rename field position, fix #12927Jan-Christoph Borchardt2015-01-091-2/+6
|/ / /
* | | Merge pull request #12984 from owncloud/ldap-user-cleanup-masterLukas Reschke2015-01-0939-191/+1474
|\ \ \ | | | | | | | | Ldap user cleanup master
| * | | fix order of initalizing instance properties, and paremeter order in a ↵Arthur Schiwon2015-01-081-10/+12
| | | | | | | | | | | | | | | | method call
| * | | fix table name for getListArthur Schiwon2015-01-081-2/+2
| | | |
| * | | doc fixes and removal of unnecessary use statementsArthur Schiwon2015-01-075-10/+6
| | | |
| * | | add test for mapping's getList methodArthur Schiwon2015-01-071-0/+24
| | | |
| * | | inject and use user manager to delete command instead of using old static ↵Arthur Schiwon2015-01-072-2/+13
| | | | | | | | | | | | | | | | oc_user way
| * | | inject DB Connection to user managerArthur Schiwon2015-01-0710-87/+94
| | | |
| * | | inject IDateTimeFormatter to show-remnants commandArthur Schiwon2015-01-062-4/+11
| | | |
| * | | inject oc config to User_LDAPArthur Schiwon2015-01-069-53/+89
| | | |
| * | | revert changes to deprecated preferences as it is a not needed leftoverArthur Schiwon2015-01-061-3/+1
| | | |
| * | | smaller fixes: coding style, PHPdoc, typos and few for DIArthur Schiwon2015-01-068-71/+51
| | | |
| * | | planned refactorings for OC 8Arthur Schiwon2014-12-206-55/+83
| | | |
| * | | move from \OC\Preferences to \OCP\IConfigArthur Schiwon2014-12-204-67/+38
| | | |
| * | | basic adjustments for OC 8. I.e. no visible issues, LDAP tests pass.Arthur Schiwon2014-12-2010-41/+73
| | | |
| * | | LDAP User Cleanup: Port from stable7 without further adjustementsArthur Schiwon2014-12-1933-66/+1257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP User Cleanup background job for user clean up adjust user backend for clean up register background job remove dead code dependency injection make Helper non-static for proper testing check whether it is OK to run clean up job. Do not forget to pass arguments. use correct method to get the config from server methods can be private, proper indirect testing is given no automatic user deletion make limit readable for test purposes make method less complex add first tests let preferences accept limit and offset for getUsersForValue DI via constructor does not work for background jobs after detecting, now we have retrieving deleted users and their details we need this method to be public for now finalize export method, add missing getter clean up namespaces and get rid of unnecessary files helper is not static anymore cleanup according to scrutinizer add cli tool to show deleted users uses are necessary after recent namespace change also remove user from mappings table on deletion add occ command to delete users fix use statement improve output big fixes / improvements PHP doc return true in userExists early for cleaning up deleted users bump version control state and interval with one config.php setting, now ldapUserCleanupInterval. 0 will disable it. enabled by default. improve doc rename cli method to be consistent with others introduce ldapUserCleanupInterval in sample config don't show last login as unix epoche start when no login happend less log output consistent namespace for OfflineUser rename GarbageCollector to DeletedUsersIndex and move it to user subdir fix unit tests add tests for deleteUser more test adjustements Conflicts: apps/user_ldap/ajax/clearMappings.php apps/user_ldap/appinfo/app.php apps/user_ldap/lib/access.php apps/user_ldap/lib/helper.php apps/user_ldap/tests/helper.php core/register_command.php lib/private/preferences.php lib/private/user.php add ldap:check-user to check user existance on the fly Conflicts: apps/user_ldap/lib/helper.php forgotten file PHPdoc fixes, no code change and don't forget to adjust tests
* | | | Merge pull request #13184 from owncloud/fix-keyLukas Reschke2015-01-091-1/+3
|\ \ \ \ | | | | | | | | | | Verify existence of $_GET key
| * | | | Verify existence of $_GET keyLukas Reschke2015-01-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise when the file without any specified mimetype was accessed the error log was flooded with entries such as "Undefined index: mime", there can be multiple issues found about this in the forum and our bugtracker. To test this access `/index.php/apps/files/ajax/mimeicon.php` with and without `$_GET['mime']`. Fixes itself.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-0988-150/+274
| | | | |
* | | | | Merge pull request #13179 from ↵Lukas Reschke2015-01-092-18/+15
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | owncloud/fix-fatal-php-error-for-not-existing-files Verify whether type is correct
| * | | | Verify whether type is correctLukas Reschke2015-01-082-18/+15
| | | | | | | | | | | | | | | | | | | | `$this->info` can very well contain an empty array or possibly other values. This means that when this code path is called a PHP Fatal error might get thrown which is not what we want.
* | | | | Merge pull request #12988 from owncloud/logfile_downloadMorris Jobke2015-01-0912-51/+297
|\ \ \ \ \ | | | | | | | | | | | | Logfile download
| * | | | | add Download logfile button to admin settingsGeorg Ehrke2015-01-0712-51/+297
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add logSettingsController add download logfile button move getEntries to LogSettingsController move set log level to logsettingscontroller.php add warning if logfile is bigger than 100MB add unit test for set log level fix typecasting, add new line at EoF show log and logfile download only if log_type is set to owncloud add unit test for getFilenameForDownload
* | | | | | Merge pull request #13148 from owncloud/self-destroying-notificationsMorris Jobke2015-01-082-0/+134
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add timeout for notifications
| * | | | | | Add timeout for notificationsMorris Jobke2015-01-082-0/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * options for timeout in seconds and if it contains HTML * if timeout is 0 it will show the message permanently * removes the notification after a given (default: 5 seconds) timeframe * based on work by @brantje * provide JS unit tests for notifications
* | | | | | | Merge pull request #13170 from ↵Thomas Müller2015-01-081-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/extstorage-fixsharedmountpointrootleadingslash Fix source path when share is a mount point
| * | | | | | | Fix source path when share is a mount pointVincent Petry2015-01-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever an external storage mount point is shared directly, its path is empty which causes a leading slash to appear in the source path. This fix removes the bogus leading slash in such situation.
* | | | | | | | Merge pull request #13165 from mypetyak/typos-in-external-storage-xmlLukas Reschke2015-01-081-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Minor typo updates to External Storage description
| * | | | | | | Minor typo updates to External Storage descriptionChristopher Bunn2015-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This text is visible to admin users when they read the description of the External Storage app.
* | | | | | | | Merge pull request #13172 from ↵Lukas Reschke2015-01-084-3/+50
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | owncloud/addCheckForOldRewriteRulesToMakeOurCrappyIntegrationWorking Add version to .htaccess
| * | | | | | | Add version to .htaccessLukas Reschke2015-01-084-3/+50
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if a user does not replace the .htaccess file with the new update this can lead to serious problems in case Apache is used as webserver. This commit adds the version to the .htaccess file and the update routine fails in case not the newest version is specified in there. This obviously means that every release has to update the version specified in .htaccess as well. But I see no better solution for it. Conflicts: lib/private/updater.php
* | | | | | | Merge pull request #13166 from owncloud/support-setup-in-php-dev-serverMorris Jobke2015-01-081-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | check for working htaccess will result in a dead lock because the server...
| * | | | | | | check for working htaccess will result in a dead lock because the server is ↵Thomas Müller2015-01-081-0/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | blocking the request to itself - fixes #13153
* / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2015-01-08190-218/+172
|/ / / / / /
* | | | | | Merge #13074 from branch 'mmattel-smb_rename_text_root_to_subfolder'Morris Jobke2015-01-071-5/+5
|\ \ \ \ \ \
| * | | | | | smb: rename textfield from root to subfolderMartin2015-01-071-5/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "root" or "subfolder" -> "Remote subfolder" on selected storages missed ftp...
* | | | | | Merge pull request #13016 from owncloud/sharing_fixesMorris Jobke2015-01-073-6/+38
|\ \ \ \ \ \ | |/ / / / / |/| | | | | don't delete share table entries for the unique name if re-share permission was removed
| * | | | | shareType and permissions are integersBjoern Schiessle2015-01-071-2/+2
| | | | | |
| * | | | | don't delete share table entries for the unique name if re-share permission ↵Bjoern Schiessle2015-01-072-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | was removed