summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8086 from owncloud/fix_copy_conflict_translations_in_jsThomas Müller2014-04-071-2/+2
|\
| * Fix copy conflict dialog translationJörn Friedrich Dreyer2014-04-071-2/+2
* | Merge pull request #6221 from leo-b/ldap_get_all_groupsblizzz2014-04-073-3/+49
|\ \ | |/ |/|
| * adapt description of paging size configurationAlexander Bergolth2014-03-281-1/+1
| * change default ldap paging size to 500Alexander Bergolth2014-03-281-1/+1
| * make getGroupsChunk() protected instead of privateAlexander Bergolth2014-03-131-1/+1
| * adapt coding styleAlexander Bergolth2014-03-131-15/+15
| * fix another oversight... sigh..root2014-03-051-1/+1
| * getGroups(): fix overall max search limit for paged searchesroot2014-03-041-3/+3
| * getGroups() $limit was not handled correctlyroot2014-03-041-2/+7
| * revert updateGroups job to use getGroups() instead of getAllGroups()root2014-03-041-1/+1
| * merge functionality of getAllGroups into getGroupsroot2014-03-041-15/+18
| * Merge branch 'ldap_paging_chunksize' into ldap_get_all_groupsroot2014-03-042-1/+5
| |\
| | * add ldap_paging_size config optionroot2014-03-042-1/+5
| * | use getAllGroup() in the updateGroups background jobroot2014-03-041-1/+1
| * | add getAllGroups() that uses a paged search if availableroot2014-03-041-0/+34
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-074-0/+9
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-066-3/+19
* | Show higher resolution previews for high dpi screensRobin Appelman2014-04-041-2/+4
* | Merge pull request #8015 from owncloud/storageinfo-reuseVincent Petry2014-04-041-2/+2
|\ \
| * | Allow reusing FileInfo for getStorageInfoRobin Appelman2014-04-021-2/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-0471-224/+115
* | | Merge pull request #6968 from owncloud/files-ajaxloadMorris Jobke2014-04-0338-1366/+2337
|\ \ \
| * | | Correctly set svg for crumb dividerVincent Petry2014-04-031-1/+1
| * | | Fixed dirInfo check for non existing dir in files ajax callVincent Petry2014-04-031-1/+1
| * | | Removed redundant free space and upload limit in public pageVincent Petry2014-04-031-4/+0
| * | | Files, trashbin, public apps use ajax/JSON for the file listVincent Petry2014-04-0238-1365/+2340
* | | | Merge pull request #7969 from Xenopathic/files_external_fixVincent Petry2014-04-031-4/+4
|\ \ \ \
| * | | | Fix error log spamRobin McCorkell2014-04-031-4/+4
* | | | | Merge pull request #7970 from owncloud/webdav-upload-hashThomas Müller2014-04-031-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix uploading files containing a # in the path for webdavRobin Appelman2014-03-311-1/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-0313-1/+23
* | | | | Merge pull request #8014 from owncloud/uploadsize-reuseicewind19912014-04-021-1/+1
|\ \ \ \ \
| * | | | | Reuse known free space in the files appRobin Appelman2014-04-021-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #7978 from owncloud/enc_cleanupVincent Petry2014-04-021-45/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | there is no need to re-calculate the shares after a touchBjoern Schiessle2014-03-311-45/+0
| |/ / /
* | | | Merge pull request #8003 from owncloud/extstorage-sftp-upgradephpseclibVincent Petry2014-04-0227-723/+1287
|\ \ \ \
| * | | | Upgraded phpseclib to version 0.3.6Vincent Petry2014-04-0227-723/+1287
* | | | | Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabledMorris Jobke2014-04-022-10/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | always encrypt files to ownerBjoern Schiessle2014-03-312-10/+8
| |/ / /
* | / / [tx-robot] updated from transifexJenkins for ownCloud2014-04-0254-98/+16
| |/ / |/| |
* | | Merge pull request #7989 from owncloud/files-deletefileregressionfixThomas Müller2014-04-012-8/+20
|\ \ \
| * | | Fixed broken delete file actionVincent Petry2014-04-012-8/+20
* | | | Merge pull request #7935 from owncloud/getpath-sharedVincent Petry2014-04-012-8/+89
|\ \ \ \
| * | | | Improve phpdocRobin Appelman2014-03-311-0/+7
| * | | | Implement getPath for shared filesRobin Appelman2014-03-282-8/+82
* | | | | Merge pull request #7997 from owncloud/correct-remember-trashbin-stateBart Visscher2014-04-011-3/+3
|\ \ \ \ \
| * | | | | Remember before change works betterBart Visscher2014-04-011-3/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #7986 from owncloud/files-fixredirectwhendirnotexistsVincent Petry2014-04-011-1/+1
|\ \ \ \ \
| * | | | | Fix dirInfo check when dir does not existVincent Petry2014-04-011-1/+1
| | |_|/ / | |/| | |