Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix parsing int attributes from share.php response | Vincent Petry | 2015-09-23 | 2 | -7/+70 |
* | Merge pull request #19289 from owncloud/fix-type-hint-errors-container | Thomas Müller | 2015-09-23 | 2 | -2/+3 |
|\ | |||||
| * | Merge branch 'master' into fix-type-hint-errors-container | Morris Jobke | 2015-09-23 | 3 | -13/+28 |
| |\ | |||||
| * | | Fix type hint errors in the container and the interface | Joas Schilling | 2015-09-23 | 2 | -2/+3 |
* | | | Merge pull request #19220 from individual-it/fix_19164 | Thomas Müller | 2015-09-23 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | re initialize OC.Share.currentShares OC.Share.itemShares | Individual IT Services | 2015-09-21 | 1 | -0/+2 |
* | | | | Merge pull request #19236 from owncloud/call_dot_directories_function | Thomas Müller | 2015-09-23 | 10 | -12/+12 |
|\ \ \ \ | |||||
| * | | | | Replaces if ($file === '.' || $file === '..') by if(\OC\Files\Filesystem::isI... | Martin | 2015-09-22 | 10 | -12/+12 |
* | | | | | Merge pull request #19277 from owncloud/files-plusbuttonfix | Thomas Müller | 2015-09-23 | 1 | -3/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Only render the plus button when it makes sense | Vincent Petry | 2015-09-22 | 1 | -3/+4 |
* | | | | | | Merge pull request #19279 from owncloud/share-fixbogusentry | Thomas Müller | 2015-09-23 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix bogus entry that appears when switching with arrow keys | Vincent Petry | 2015-09-22 | 1 | -0/+3 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #19247 from owncloud/fix_locking_copy_operation | Thomas Müller | 2015-09-23 | 2 | -42/+98 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | catch excexptions during the copy operation and make sure that we free the lo... | Bjoern Schiessle | 2015-09-22 | 2 | -42/+98 |
* | | | | | | Merge pull request #19267 from owncloud/individual-it-reduce_db_calls_for_fil... | Thomas Müller | 2015-09-23 | 1 | -12/+24 |
|\ \ \ \ \ \ | |||||
| * | | | | | | reduce amount of db calls needed for file-locks | Individual IT Services | 2015-09-22 | 1 | -12/+24 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #19169 from owncloud/3rdpartyhint | Thomas Müller | 2015-09-23 | 1 | -1/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add example for 3rdparty configuration | Carla Schroder | 2015-09-23 | 1 | -1/+3 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #19285 from owncloud/fix-strengthify-tipsy | Thomas Müller | 2015-09-23 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | implement builder pattern in tipsy shim | Hendrik Leppelsack | 2015-09-23 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #19270 from owncloud/files-sidebar-fixfortrashandco | Thomas Müller | 2015-09-22 | 2 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Properly show sidebar for trash and sharing sections | Vincent Petry | 2015-09-22 | 2 | -3/+3 |
* | | | | | | Merge pull request #19282 from owncloud/disabled-checkboxes | Hendrik Leppelsack | 2015-09-22 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add style for disabled checkboxes | Hendrik Leppelsack | 2015-09-22 | 1 | -0/+2 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #19275 from owncloud/fix-19158 | Hendrik Leppelsack | 2015-09-22 | 1 | -3/+2 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | left align checkboxes in group dropdown | Hendrik Leppelsack | 2015-09-22 | 1 | -3/+2 |
|/ / / / / | |||||
* | | | | | Merge pull request #18893 from owncloud/move-static-data | Lukas Reschke | 2015-09-22 | 10 | -90/+87 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Update mimetypes | Lukas Reschke | 2015-09-22 | 1 | -34/+23 |
| * | | | | Move mimetype files into /resources/config/ | Lukas Reschke | 2015-09-22 | 5 | -47/+62 |
| * | | | | Move certificate bundle into resources/config/ | Lukas Reschke | 2015-09-22 | 4 | -9/+2 |
|/ / / / | |||||
* | | | | Merge pull request #19268 from owncloud/revert-18911 | Robin Appelman | 2015-09-22 | 1 | -6/+0 |
|\ \ \ \ | |||||
| * | | | | Revert "Show cached previews directly" | Robin Appelman | 2015-09-22 | 1 | -6/+0 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #19266 from owncloud/fileactions-translate-details | Thomas Müller | 2015-09-22 | 4 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | Properly translate file actions | Vincent Petry | 2015-09-22 | 4 | -1/+5 |
| |/ / / | |||||
* | | | | Merge pull request #19177 from owncloud/docker-check-state | Thomas Müller | 2015-09-22 | 1 | -2/+8 |
|\ \ \ \ | |||||
| * | | | | Connect to database to verify if it is running | Lukas Reschke | 2015-09-18 | 1 | -2/+8 |
* | | | | | Merge pull request #19257 from owncloud/fix-floating-in-sidebar | Frank Karlitschek | 2015-09-22 | 1 | -4/+1 |
|\ \ \ \ \ | |||||
| * | | | | | remove float from file/folder name in sidebar, fix #19243 | Jan-Christoph Borchardt | 2015-09-22 | 1 | -4/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #19262 from owncloud/fix_18970 | Roeland Douma | 2015-09-22 | 2 | -3/+37 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Respect disabled sharing API settings | Roeland Jago Douma | 2015-09-22 | 2 | -3/+37 |
|/ / / / | |||||
* | | | | Merge pull request #19233 from owncloud/remove-dummy-backend | Vincent Petry | 2015-09-22 | 26 | -117/+121 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Move dummy backend to Tests namespace | Lukas Reschke | 2015-09-22 | 26 | -117/+121 |
|/ / / | |||||
* | | | Merge pull request #19231 from phil-davis/r1 | Thomas Müller | 2015-09-21 | 5 | -7/+7 |
|\ \ \ | |||||
| * | | | Minor text typos | Phil Davis | 2015-09-21 | 5 | -7/+7 |
* | | | | Merge pull request #19229 from owncloud/webdavauth-in-user-external | Thomas Müller | 2015-09-21 | 156 | -1279/+0 |
|\ \ \ \ | |||||
| * | | | | Move WebDAVAuth to User_External | Thomas Müller | 2015-09-21 | 156 | -1279/+0 |
|/ / / / | |||||
* | | | | Merge pull request #19223 from owncloud/improve_description_decrypt_encrypt_all | Björn Schießle | 2015-09-21 | 3 | -3/+5 |
|\ \ \ \ | |||||
| * | | | | fix small typo | Bjoern Schiessle | 2015-09-21 | 1 | -1/+1 |
| * | | | | improve description and help output for the encrypt-all and decrypt-all command | Bjoern Schiessle | 2015-09-21 | 2 | -2/+4 |
|/ / / / | |||||
* | | | | Merge pull request #18934 from owncloud/bump-3rdparty | Thomas Müller | 2015-09-21 | 1 | -0/+0 |
|\ \ \ \ |