| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #13370 from Sugaroverdose/fix_#13322 | Thomas Müller | 2015-01-15 | 1 | -0/+1 |
| |\ | | | | | Force browser to redraw favorite icon on src change | ||||
| | * | Force browser to redraw favorite icon | Sugaroverdose | 2015-01-15 | 1 | -0/+1 |
| | | | | | | | | | on src change | ||||
| * | | Merge pull request #13347 from owncloud/share-scanpermissionsfromsource | Morris Jobke | 2015-01-15 | 3 | -1/+47 |
| |\ \ | | | | | | | Use source storage permissions when scanning shared storage | ||||
| | * | | Use source storage permissions when scanning shared storage | Vincent Petry | 2015-01-14 | 3 | -1/+47 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-15 | 12 | -8/+76 |
| | | | | |||||
| * | | | Merge pull request #13352 from owncloud/hhvm-array-key | Robin McCorkell | 2015-01-15 | 1 | -5/+6 |
| |\ \ \ | | | | | | | | | HHVM: Do not use key() on array as the result depends on the internal array pointer. | ||||
| | * | | | Do not use key() on array as the result depends on the internal array pointer. | Andreas Fischer | 2015-01-15 | 1 | -5/+6 |
| | | | | | |||||
| * | | | | Merge pull request #13350 from owncloud/autoload-translations | Morris Jobke | 2015-01-14 | 8 | -11/+0 |
| |\ \ \ \ | | | | | | | | | | | Autoload app's js translations | ||||
| | * | | | | Remove unneeded addTranslations() calls | Vincent Petry | 2015-01-14 | 8 | -11/+0 |
| | | | | | | |||||
| * | | | | | Merge pull request #13351 from owncloud/check-for-existence | Lukas Reschke | 2015-01-14 | 1 | -2/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | Check for existence of $_GET keys | ||||
| | * | | | | | Check for existence of $_GET keys | Lukas Reschke | 2015-01-14 | 1 | -2/+2 |
| | | |/ / / | |/| | | | | | | | | | | | | | `$dir` may for example very well not get passed at well. | ||||
| * / | | | | remove deprecated code - fixes #13119 | Thomas Müller | 2015-01-14 | 3 | -50/+51 |
| |/ / / / | |||||
| * | | | | Merge pull request #13345 from owncloud/increase-files-external-versions | Morris Jobke | 2015-01-14 | 2 | -2/+5 |
| |\ \ \ \ | |/ / / |/| | | | Increase files_externals oC required version and its own version | ||||
| | * | | | Increase files_externals oC required version and its own version | Joas Schilling | 2015-01-14 | 2 | -2/+5 |
| | |/ / | |||||
| * | | | Merge pull request #13332 from oparoz/fix-download-button | Thomas Müller | 2015-01-14 | 1 | -1/+6 |
| |\ \ \ | | | | | | | | | Download the current public folder only | ||||
| | * | | | Download the current public folder only | Olivier Paroz | 2015-01-14 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From within a shared/public directory, when drilling down folders, some users want to be able to download what they're currently looking at, not the whole shared folder. The whole archive is always a click away anyway since a user can click on the home button. | ||||
| * | | | | Merge pull request #13286 from owncloud/sharing_upgrade | Björn Schießle | 2015-01-14 | 4 | -1/+131 |
| |\ \ \ \ | | | | | | | | | | | update script for new server-to-server sharing | ||||
| | * | | | | set accept to 1 (=true) for all server-to-server shares on update, at this ↵ | Bjoern Schiessle | 2015-01-13 | 4 | -1/+131 |
| | | | | | | | | | | | | | | | | | | | | | point in time all shares are created by the first version of server-to-server sharing and are accepted if they were added to the table | ||||
| * | | | | | Merge pull request #13288 from owncloud/enc_fix_public_download | Lukas Reschke | 2015-01-14 | 3 | -25/+14 |
| |\ \ \ \ \ | | | | | | | | | | | | | [encryption] fix download of public shared files | ||||
| | * | | | | | if we download a public shared file we need to retrieve the user from the path | Bjoern Schiessle | 2015-01-13 | 3 | -25/+14 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #13335 from owncloud/disable-rememberme-files-external | Thomas Müller | 2015-01-14 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | The files_external app might need the password so autologin must be disabled | ||||
| | * | | | | | The files_external app might need the password so autologin must be disabled | Joas Schilling | 2015-01-14 | 1 | -0/+1 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Merge pull request #13311 from owncloud/fix_restore_keys | Björn Schießle | 2015-01-14 | 2 | -21/+135 |
| |\ \ \ \ \ | |/ / / / |/| | | | | adapt decrypt all to the new folder structure | ||||
| | * | | | | adapt decrypt all and restore/delete key backups to the new folder structure ↵ | Bjoern Schiessle | 2015-01-13 | 2 | -21/+135 |
| | | | | | | | | | | | | | | | | | | | | | for encryption key introduced with OC8 | ||||
| * | | | | | Merge pull request #13325 from owncloud/kill-strip-slashes | Morris Jobke | 2015-01-14 | 5 | -9/+8 |
| |\ \ \ \ \ | | | | | | | | | | | | | Get rid of `stripslashes()` | ||||
| | * | | | | | Get rid of `stripslashes()` | Lukas Reschke | 2015-01-13 | 5 | -9/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This conversions are actually totally unneeded and probably left-overs from ages where the safe_mode was still a valid thing. | ||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-14 | 168 | -12/+410 |
| | |_|_|/ / |/| | | | | |||||
| * | | | | | Fix PHP doc and enforce type | Lukas Reschke | 2015-01-13 | 1 | -3/+3 |
| |/ / / / | |||||
| * | | | | Merge pull request #13277 from owncloud/pasteurl | Joas Schilling | 2015-01-13 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / |/| | | | add https:// placeholder for From Link feature. closes #13255 | ||||
| | * | | | add https:// placeholder for From Link feature. closes #13255 | Volkan Gezer | 2015-01-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #13289 from owncloud/fav-keepfavoncancelrename | Morris Jobke | 2015-01-13 | 2 | -6/+41 |
| |\ \ \ \ | | | | | | | | | | | Properly update internal file info with updated tags | ||||
| | * | | | | Properly update internal file info with updated tags | Vincent Petry | 2015-01-12 | 2 | -6/+41 |
| | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever tags are updated, they need to be updated in the file list's file info array as well. This commit also adds unit tests and makes sure that whichever tags are sent back by the server after update are used when updating attributes/fileinfo. | ||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-13 | 186 | -246/+326 |
| | | | | | |||||
| * | | | | Merge pull request #13154 from owncloud/fix13141 | Thomas Müller | 2015-01-12 | 2 | -7/+122 |
| |\ \ \ \ | | | | | | | | | | | don't show no files yet when mask is in place, fixes #13141 | ||||
| | * | | | | add js tests for filelist filtering | Jörn Friedrich Dreyer | 2015-01-09 | 2 | -6/+119 |
| | | | | | | |||||
| | * | | | | don't show no files yet when mask is in place, fixes #13141 | Jörn Friedrich Dreyer | 2015-01-07 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | Merge pull request #13272 from owncloud/fav-renamekeepfav | Joas Schilling | 2015-01-12 | 2 | -2/+75 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fixes issues when renaming favorite file | ||||
| | * | | | | | Return path attribute for ajax rename operations | Vincent Petry | 2015-01-12 | 2 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue when renaming files from a flat list view like "Favorites" or "Shared with you", in which case the path needs to be present in the response to make sure the data-path attribute is properly set in the JS side. | ||||
| | * | | | | | Return tags after rename | Vincent Petry | 2015-01-12 | 2 | -2/+72 |
| | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | To make it possible for the web UI to correctly display the tag/favorite information after a rename, this information is now returned in the rename response | ||||
| * | | | | | Merge pull request #13285 from owncloud/fix-encryption-check-number-of-parts | Morris Jobke | 2015-01-12 | 1 | -0/+9 |
| |\ \ \ \ \ | | | | | | | | | | | | | Check array size, before using the 3rd element from it | ||||
| | * | | | | | Check array size, before using the 3rd element from it | Joas Schilling | 2015-01-12 | 1 | -0/+9 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #13279 from owncloud/upload-original-name | Morris Jobke | 2015-01-12 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Send the proper original name for uploaded files | ||||
| | * | | | | | | Send the proper original name for uploaded files | Robin Appelman | 2015-01-12 | 1 | -2/+2 |
| | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | | Merge pull request #13280 from owncloud/fix-12306 | Morris Jobke | 2015-01-12 | 2 | -2/+8 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | fix retrieval of user groups | ||||
| | * | | | | | fix retrieval of user groups | Arthur Schiwon | 2015-01-12 | 2 | -2/+8 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #13210 from owncloud/use-isset | Morris Jobke | 2015-01-12 | 1 | -5/+5 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Check for existence of $_GET keys | ||||
| | * | | | | Check for existence of $_GET keys | Lukas Reschke | 2015-01-09 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | Otherwise PHP errors are thrown in the error log. | ||||
| * | | | | | Merge pull request #13268 from owncloud/dnd-files-container | Lukas Reschke | 2015-01-12 | 1 | -1/+10 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Allow dropping files on the table container | ||||
| | * | | | | Allow dropping files on the table container | Vincent Petry | 2015-01-12 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to drop files below the table even if the table is smaller than the window height. Added a check to make sure upload is not triggered on invisible lists. | ||||
| * | | | | | Merge pull request #13182 from owncloud/download_versions | Björn Schießle | 2015-01-12 | 10 | -146/+396 |
| |\ \ \ \ \ | |/ / / / |/| | | | | make versions of shared files downloadable | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |