summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-1324-4/+86
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-1246-122/+10
|
* 32-bit typo fixVolkan Gezer2015-01-111-3/+3
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-116-10/+12
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-106-4/+8
|
* Merge pull request #13195 from owncloud/resharepermfixMorris Jobke2015-01-092-0/+158
|\ | | | | Fix reshare permission issue
| * Fix reshare permission issueVincent Petry2015-01-092-0/+158
| | | | | | | | | | The actual share permissions sent to the server on reshare are now based on possiblePermissions + permissions inherited from parent share
* | Merge pull request #13205 from owncloud/remove-shared-iconThomas Müller2015-01-092-3/+4
|\ \ | | | | | | replace outdated 'shared' people icon with regular share icon as fallback
| * | replace outdated 'shared' people icon with regular share icon as fallbackJan-Christoph Borchardt2015-01-092-3/+4
| |/
* | Merge pull request #12995 from owncloud/tbelau666-masterThomas Müller2015-01-091-1/+3
|\ \ | |/ |/| Use Doctrines filter by table name
| * add default for dbtableprefixMorris Jobke2014-12-231-1/+1
| |
| * use injected config object and fix typosMorris Jobke2014-12-221-1/+1
| |
| * Use Doctrines filter by table nametbelau6662014-12-221-0/+2
| | | | | | | | | | | | | | 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 #12984 from owncloud/ldap-user-cleanup-masterLukas Reschke2015-01-092-0/+48
|\ \ | | | | | | Ldap user cleanup master
| * | inject and use user manager to delete command instead of using old static ↵Arthur Schiwon2015-01-072-2/+13
| | | | | | | | | | | | oc_user way
| * | LDAP User Cleanup: Port from stable7 without further adjustementsArthur Schiwon2014-12-192-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-0928-46/+92
| | |
* | | Merge pull request #13179 from ↵Lukas Reschke2015-01-091-16/+12
|\ \ \ | | | | | | | | | | | | | | | | owncloud/fix-fatal-php-error-for-not-existing-files Verify whether type is correct
| * | | Verify whether type is correctLukas Reschke2015-01-081-16/+12
| | | | | | | | | | | | | | | | `$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.
* | | | 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
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-082-2/+2
| | |
* | | Merge pull request #13016 from owncloud/sharing_fixesMorris Jobke2015-01-071-2/+2
|\ \ \ | | | | | | | | 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
| | | |
* | | | Merge pull request #12687 from owncloud/auto-escape-t-placeholdersMorris Jobke2015-01-073-15/+43
|\ \ \ \ | | | | | | | | | | Auto escape t placeholders
| * | | | Autoescape of placeholders in t() and p() - for JSMorris Jobke2015-01-073-15/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add disableEscape parameter to disable this functionality * drop usage of escapeHTML() that is now done inside t() * add unit test for escaped and not escaped placeholder * proper JSDoc
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-072-0/+8
| | | | |
* | | | | Merge pull request #13126 from owncloud/update-jquery-strengthifyThomas Müller2015-01-062-50/+52
|\ \ \ \ \ | | | | | | | | | | | | Update jquery strengthify
| * | | | | bower update for jquery.strengthify 0.4.1Morris Jobke2015-01-062-50/+52
| |/ / / /
* | | | | Merge pull request #12653 from owncloud/full_content_search_resultsMorris Jobke2015-01-063-64/+12
|\ \ \ \ \ | |/ / / / |/| | | | Full content width search results
| * | | | make OCA.Search.Files available in tests and for other appsJörn Friedrich Dreyer2015-01-021-1/+2
| | | | |
| * | | | move search results below filelist, show hint when results are off screen, ↵Jörn Friedrich Dreyer2015-01-021-36/+1
| | | | | | | | | | | | | | | | | | | | use js plugin mechanism
| * | | | add paged providerJörn Friedrich Dreyer2015-01-021-1/+1
| | | | |
| * | | | move code from js.js to search.js in the search appJörn Friedrich Dreyer2015-01-021-58/+3
| | | | |
| * | | | new OC.Search, add search result formatters and handlers, use full content ↵Jörn Friedrich Dreyer2015-01-022-21/+58
| | | | | | | | | | | | | | | | | | | | width for results
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-062-14/+14
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-0510-16/+334
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-046-58/+98
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-036-18/+24
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-022-46/+52
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-014-0/+8
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-3110-2/+414
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-302-0/+8
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-292-0/+2
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-282-0/+6
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-272-0/+12
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-262-0/+10
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-252-0/+20
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-248-14/+48
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2320-32/+102
| | |
* | | remove skip to content for now, see #12999Jan-Christoph Borchardt2014-12-222-4/+1
| |/ |/|