summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-12272-270/+250
* l10n: delete permanently fixVolkan Gezer2015-01-111-2/+2
* Merge pull request #13251 from owncloud/spaceoutsideVolkan Gezer2015-01-111-2/+2
|\
| * keep spaces out of translationVolkan Gezer2015-01-111-2/+2
* | suggestion by transifex translatorVolkan Gezer2015-01-111-1/+1
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-1112-26/+38
* Merge pull request #13226 from owncloud/fix-encodingVolkan Gezer2015-01-101-1/+1
|\
| * Don't double encode stringLukas Reschke2015-01-101-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-1028-18/+84
|/
* Merge pull request #13204 from owncloud/enc_fix_key_lostVincent Petry2015-01-092-630/+714
|\
| * 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 #13188 from owncloud/add-check-if-user-is-logged-inThomas Müller2015-01-092-0/+3
|\ \ | |/ |/|
| * Add check if user is logged-inLukas Reschke2015-01-092-0/+3
* | fix rename field position, fix #12927Jan-Christoph Borchardt2015-01-091-2/+6
* | Merge pull request #12984 from owncloud/ldap-user-cleanup-masterLukas Reschke2015-01-0936-190/+1411
|\ \
| * | 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 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
| * | 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-1929-64/+1202
* | | 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-0932-86/+124
|/ /
* | 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
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-08126-156/+164
|/ / /
* | | smb: rename textfield from root to subfolderMartin2015-01-071-5/+5
* | | Merge pull request #13016 from owncloud/sharing_fixesMorris Jobke2015-01-071-0/+32
|\ \ \ | |/ / |/| |
| * | don't delete share table entries for the unique name if re-share permission w...Bjoern Schiessle2015-01-071-0/+32
* | | 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-071-1/+1
|\ \ \
| * | | Autoescape of placeholders in t() and p() - for JSMorris Jobke2015-01-071-1/+1
* | | | Extend Test\TestCase and do not use uniqid()Joas Schilling2015-01-074-310/+286
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-07258-68/+326
* | | | Merge pull request #13130 from owncloud/getstoragestats-error-handlingLukas Reschke2015-01-061-1/+5
|\ \ \ \
| * | | | Add error handling to getstoragestats.phpRobin Appelman2015-01-061-1/+5
| |/ / /
* | | | Merge pull request #13128 from owncloud/files-scan-pathThomas Müller2015-01-061-1/+1
|\ \ \ \
| * | | | Fix check if a path argument is passed to occ files:scanRobin Appelman2015-01-061-1/+1
| |/ / /
* | | | Merge pull request #12653 from owncloud/full_content_search_resultsMorris Jobke2015-01-0610-18/+410
|\ \ \ \ | |/ / / |/| | |
| * | | use class for no results div instead of id. the elements are not unique.Jörn Friedrich Dreyer2015-01-067-12/+12