summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | 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
* | | | | | | Merge pull request #13191 from owncloud/fix-rename-fieldMorris Jobke2015-01-091-2/+6
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | 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
|\ \ \ \ \ \
| * | | | | | fix order of initalizing instance properties, and paremeter order in a method...Arthur Schiwon2015-01-081-10/+12
| * | | | | | 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 oc_...Arthur Schiwon2015-01-072-2/+13
| * | | | | | 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
* | | | | | | Merge pull request #13184 from owncloud/fix-keyLukas Reschke2015-01-091-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Verify existence of $_GET keyLukas Reschke2015-01-091-1/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-0988-150/+274
* | | | | | | Merge pull request #13179 from owncloud/fix-fatal-php-error-for-not-existing-...Lukas Reschke2015-01-092-18/+15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Verify whether type is correctLukas Reschke2015-01-082-18/+15
* | | | | | | Merge pull request #12988 from owncloud/logfile_downloadMorris Jobke2015-01-0912-51/+297
|\ \ \ \ \ \ \
| * | | | | | | add Download logfile button to admin settingsGeorg Ehrke2015-01-0712-51/+297
* | | | | | | | Merge pull request #13148 from owncloud/self-destroying-notificationsMorris Jobke2015-01-082-0/+134
|\ \ \ \ \ \ \ \
| * | | | | | | | Add timeout for notificationsMorris Jobke2015-01-082-0/+134
* | | | | | | | | Merge pull request #13170 from owncloud/extstorage-fixsharedmountpointrootlea...Thomas Müller2015-01-081-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix source path when share is a mount pointVincent Petry2015-01-081-1/+3
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #13165 from mypetyak/typos-in-external-storage-xmlLukas Reschke2015-01-081-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Minor typo updates to External Storage descriptionChristopher Bunn2015-01-071-2/+2
* | | | | | | | | Merge pull request #13172 from owncloud/addCheckForOldRewriteRulesToMakeOurCr...Lukas Reschke2015-01-084-3/+50
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Add version to .htaccessLukas Reschke2015-01-084-3/+50
|/ / / / / / / /
* | | | | | | | 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 is b...Thomas Müller2015-01-081-0/+5
|/ / / / / / / /
* / / / / / / / [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
|/ / / / / / /
* | | | | | | Merge pull request #13016 from owncloud/sharing_fixesMorris Jobke2015-01-073-6/+38
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | shareType and permissions are integersBjoern Schiessle2015-01-071-2/+2
| * | | | | | don't delete share table entries for the unique name if re-share permission w...Bjoern Schiessle2015-01-072-4/+36
* | | | | | | Merge pull request #13150 from owncloud/fix-sharing-activity-extensionMorris Jobke2015-01-071-5/+3
|\ \ \ \ \ \ \
| * | | | | | | Correctly return false when translating a foreign activityJoas Schilling2015-01-071-5/+3
|/ / / / / / /
* | | | | | | Merge pull request #12687 from owncloud/auto-escape-t-placeholdersMorris Jobke2015-01-075-17/+45
|\ \ \ \ \ \ \
| * | | | | | | Autoescape of placeholders in t() and p() - for JSMorris Jobke2015-01-075-17/+45
* | | | | | | | Merge pull request #13140 from owncloud/issue/13139-provisioning-api-testsMorris Jobke2015-01-074-310/+286
|\ \ \ \ \ \ \ \
| * | | | | | | | Extend Test\TestCase and do not use uniqid()Joas Schilling2015-01-074-310/+286
* | | | | | | | | Merge pull request #13138 from owncloud/issue/13134-incorrect-admin-warning-o...Lukas Reschke2015-01-072-6/+6
|\ \ \ \ \ \ \ \ \