aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-064-0/+10
* Use the old code for remote shares for nowRoeland Jago Douma2015-11-051-0/+8
* The new sharing code now handles deletionRoeland Jago Douma2015-11-053-3/+196
* Prepare OCS Share endpointRoeland Jago Douma2015-11-052-5/+70
* Merge pull request #20301 from owncloud/fix-files_external-empty-user-mountingThomas Müller2015-11-051-0/+5
|\
| * [files_external] fix empty user mounts settingMorris Jobke2015-11-041-0/+5
* | [tx-robot] updated from transifexJenkins for ownCloud2015-11-0528-26/+152
* | Merge pull request #20053 from owncloud/getfileinfo-lockingThomas Müller2015-11-041-26/+26
|\ \
| * | Split checkUpdateRobin Appelman2015-11-031-26/+26
* | | add port to host only, if an URL is used instead of a plain hostnameArthur Schiwon2015-11-041-3/+7
| |/ |/|
* | Merge pull request #20272 from owncloud/phil-davis-setEncryptHomeStorageThomas Müller2015-11-041-1/+1
|\ \
| * | Correct the description of function setEncryptHomeStoragePhil Davis2015-11-031-1/+1
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2015-11-0444-40/+176
|/
* Merge pull request #20223 from owncloud/fix-apply-webdav-tagsThomas Müller2015-11-031-1/+1
|\
| * Fix TagList namespace in property mapVincent Petry2015-11-021-1/+1
* | fix external storage wording detail, ref #19858Jan-Christoph Borchardt2015-11-031-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2015-11-034-0/+8
* | Merge branch 'master' into fix-20151blizzz2015-11-0236-12/+187
|\|
| * Merge pull request #20192 from owncloud/fix-20090Thomas Müller2015-11-022-0/+12
| |\
| | * if a user that is flag as deleted shows up again, remove that flag. Fixes #20090Arthur Schiwon2015-10-302-0/+12
| * | Merge pull request #20219 from owncloud/issue-19707-scrollto-in-trashibnThomas Müller2015-11-021-1/+3
| |\ \
| | * | Fix scrollto= parameter in trashbin viewJoas Schilling2015-11-021-1/+3
| * | | Merge pull request #20181 from owncloud/files-fixdownloadspinnerThomas Müller2015-11-024-3/+101
| |\ \ \ | | |/ / | |/| |
| | * | Fix file action download spinnerVincent Petry2015-10-304-3/+101
| * | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-028-8/+18
| * | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-0110-0/+38
| * | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-3112-0/+14
| * | | Merge pull request #19940 from owncloud/ldap-server-wizard-tooltipThomas Müller2015-10-311-0/+1
| |\ \ \ | | |_|/ | |/| |
| | * | add tooltip to ldap server wizardHendrik Leppelsack2015-10-291-0/+1
* | | | add method to count users by loginname and use it for diagnose test, fixes #2...Arthur Schiwon2015-10-305-3/+167
|/ / /
* | | Merge pull request #20175 from owncloud/login-arrowThomas Müller2015-10-302-5/+0
|\ \ \
| * | | remove unneeded icons from input fields to not distract from submit button, f...Jan-Christoph Borchardt2015-10-302-5/+0
* | | | Merge pull request #20160 from owncloud/share-allowdeleteinshareoverviewThomas Müller2015-10-302-27/+11
|\ \ \ \
| * | | | Bring back delete permission in share overviewVincent Petry2015-10-292-27/+11
| | |_|/ | |/| |
* | | | Merge pull request #20167 from owncloud/fix-docker-ip-retrievalThomas Müller2015-10-304-4/+4
|\ \ \ \
| * | | | Use proper statement to retrieve the IP of an docker instanceMorris Jobke2015-10-304-4/+4
* | | | | Merge pull request #20156 from owncloud/files-filter-triger-onceRobin Appelman2015-10-301-2/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | dont trigger the scroll event of every single item we filter in the file listRobin Appelman2015-10-291-2/+3
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-3016-8/+138
* | | | | Merge pull request #20051 from otetard/feature/newfilemenu_extendThomas Müller2015-10-291-31/+46
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Allow apps to add new items in the “New” filemenu.Olivier Tétard2015-10-261-31/+46
* | | | | Merge pull request #20135 from owncloud/check-if-null-subadminThomas Müller2015-10-295-1294/+1995
|\ \ \ \ \
| * | | | | Drop OC_SubAdmin and replace usagesLukas Reschke2015-10-295-1294/+1995
| | |_|/ / | |/| | |
* | | | | Merge pull request #20122 from owncloud/files-consolidateiconupdateThomas Müller2015-10-295-8/+86
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix icon update to be more consistentVincent Petry2015-10-295-8/+86
* | | | | Merge pull request #19000 from UoM-ResPlat-DevOps/swift-squelch-expected-404-...Thomas Müller2015-10-291-1/+4
|\ \ \ \ \
| * | | | | Don't log expected Swift 404 responsesTim Dettrick2015-09-141-1/+4
* | | | | | Merge pull request #19100 from owncloud/ext-tooltip-unavailableThomas Müller2015-10-294-14/+67
|\ \ \ \ \ \
| * | | | | | Display storage status as tooltipRobin McCorkell2015-10-234-7/+47
| * | | | | | Remove status indicator on modificationRobin McCorkell2015-10-231-8/+21