summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix parsing int attributes from share.php responseVincent Petry2015-09-232-7/+70
* Merge pull request #19289 from owncloud/fix-type-hint-errors-containerThomas Müller2015-09-232-2/+3
|\
| * Merge branch 'master' into fix-type-hint-errors-containerMorris Jobke2015-09-233-13/+28
| |\
| * | Fix type hint errors in the container and the interfaceJoas Schilling2015-09-232-2/+3
* | | Merge pull request #19220 from individual-it/fix_19164Thomas Müller2015-09-231-0/+2
|\ \ \
| * | | re initialize OC.Share.currentShares OC.Share.itemShares Individual IT Services2015-09-211-0/+2
* | | | Merge pull request #19236 from owncloud/call_dot_directories_functionThomas Müller2015-09-2310-12/+12
|\ \ \ \
| * | | | Replaces if ($file === '.' || $file === '..') by if(\OC\Files\Filesystem::isI...Martin2015-09-2210-12/+12
* | | | | Merge pull request #19277 from owncloud/files-plusbuttonfixThomas Müller2015-09-231-3/+4
|\ \ \ \ \
| * | | | | Only render the plus button when it makes senseVincent Petry2015-09-221-3/+4
* | | | | | Merge pull request #19279 from owncloud/share-fixbogusentryThomas Müller2015-09-231-0/+3
|\ \ \ \ \ \
| * | | | | | Fix bogus entry that appears when switching with arrow keysVincent Petry2015-09-221-0/+3
| |/ / / / /
* | | | | | Merge pull request #19247 from owncloud/fix_locking_copy_operationThomas Müller2015-09-232-42/+98
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | catch excexptions during the copy operation and make sure that we free the lo...Bjoern Schiessle2015-09-222-42/+98
* | | | | | Merge pull request #19267 from owncloud/individual-it-reduce_db_calls_for_fil...Thomas Müller2015-09-231-12/+24
|\ \ \ \ \ \
| * | | | | | reduce amount of db calls needed for file-locksIndividual IT Services2015-09-221-12/+24
| |/ / / / /
* | | | | | Merge pull request #19169 from owncloud/3rdpartyhintThomas Müller2015-09-231-1/+3
|\ \ \ \ \ \
| * | | | | | add example for 3rdparty configurationCarla Schroder2015-09-231-1/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #19285 from owncloud/fix-strengthify-tipsyThomas Müller2015-09-231-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | implement builder pattern in tipsy shimHendrik Leppelsack2015-09-231-0/+1
|/ / / / /
* | | | | Merge pull request #19270 from owncloud/files-sidebar-fixfortrashandcoThomas Müller2015-09-222-3/+3
|\ \ \ \ \
| * | | | | Properly show sidebar for trash and sharing sectionsVincent Petry2015-09-222-3/+3
* | | | | | Merge pull request #19282 from owncloud/disabled-checkboxesHendrik Leppelsack2015-09-221-0/+2
|\ \ \ \ \ \
| * | | | | | add style for disabled checkboxesHendrik Leppelsack2015-09-221-0/+2
|/ / / / / /
* | | | | | Merge pull request #19275 from owncloud/fix-19158Hendrik Leppelsack2015-09-221-3/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | left align checkboxes in group dropdownHendrik Leppelsack2015-09-221-3/+2
|/ / / / /
* | | | | Merge pull request #18893 from owncloud/move-static-dataLukas Reschke2015-09-2210-90/+87
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Update mimetypesLukas Reschke2015-09-221-34/+23
| * | | | Move mimetype files into /resources/config/Lukas Reschke2015-09-225-47/+62
| * | | | Move certificate bundle into resources/config/Lukas Reschke2015-09-224-9/+2
|/ / / /
* | | | Merge pull request #19268 from owncloud/revert-18911Robin Appelman2015-09-221-6/+0
|\ \ \ \
| * | | | Revert "Show cached previews directly"Robin Appelman2015-09-221-6/+0
| | |/ / | |/| |
* | | | Merge pull request #19266 from owncloud/fileactions-translate-detailsThomas Müller2015-09-224-1/+5
|\ \ \ \
| * | | | Properly translate file actionsVincent Petry2015-09-224-1/+5
| |/ / /
* | | | Merge pull request #19177 from owncloud/docker-check-stateThomas Müller2015-09-221-2/+8
|\ \ \ \
| * | | | Connect to database to verify if it is runningLukas Reschke2015-09-181-2/+8
* | | | | Merge pull request #19257 from owncloud/fix-floating-in-sidebarFrank Karlitschek2015-09-221-4/+1
|\ \ \ \ \
| * | | | | remove float from file/folder name in sidebar, fix #19243Jan-Christoph Borchardt2015-09-221-4/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #19262 from owncloud/fix_18970Roeland Douma2015-09-222-3/+37
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Respect disabled sharing API settingsRoeland Jago Douma2015-09-222-3/+37
|/ / / /
* | | | Merge pull request #19233 from owncloud/remove-dummy-backendVincent Petry2015-09-2226-117/+121
|\ \ \ \ | |/ / / |/| | |
| * | | Move dummy backend to Tests namespaceLukas Reschke2015-09-2226-117/+121
|/ / /
* | | Merge pull request #19231 from phil-davis/r1Thomas Müller2015-09-215-7/+7
|\ \ \
| * | | Minor text typosPhil Davis2015-09-215-7/+7
* | | | Merge pull request #19229 from owncloud/webdavauth-in-user-externalThomas Müller2015-09-21156-1279/+0
|\ \ \ \
| * | | | Move WebDAVAuth to User_ExternalThomas Müller2015-09-21156-1279/+0
|/ / / /
* | | | Merge pull request #19223 from owncloud/improve_description_decrypt_encrypt_allBjörn Schießle2015-09-213-3/+5
|\ \ \ \
| * | | | fix small typoBjoern Schiessle2015-09-211-1/+1
| * | | | improve description and help output for the encrypt-all and decrypt-all commandBjoern Schiessle2015-09-212-2/+4
|/ / / /
* | | | Merge pull request #18934 from owncloud/bump-3rdpartyThomas Müller2015-09-211-0/+0
|\ \ \ \