Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #15244 from owncloud/use_default_share_folder | Morris Jobke | 2015-03-26 | 3 | -5/+20 |
|\ | | | | | always fall back to default share folder | ||||
| * | always fall back to default share folder | Bjoern Schiessle | 2015-03-26 | 3 | -5/+20 |
| | | |||||
* | | Merge pull request #14925 from owncloud/ext-mountoptions-ui | Robin McCorkell | 2015-03-26 | 6 | -27/+345 |
|\ \ | | | | | | | Mount options GUI for external storage | ||||
| * | | Make sure mountOptions keep their data type | Vincent Petry | 2015-03-26 | 2 | -6/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | str_replace for $user substitution was converting the data type of mountOptions to string. This fix prevents this to happen by making sure only strings are processed by substitution. Also added a int conversion when reading the watcher policy | ||||
| * | | Added ext storage mount options GUI | Vincent Petry | 2015-03-26 | 4 | -21/+283 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added option to disable autoscan of external storages Mount option file system scan is now an int Move priority field to avoid undefined field in storage options All input elements inside the storage options block get parsed into storage options. Moving the priority field outside prevents it to appear in the storage config, as expected. It is still parsed by special code. | ||||
* | | | Merge pull request #13802 from owncloud/share-partfilepermissions | Morris Jobke | 2015-03-26 | 3 | -20/+208 |
|\ \ \ | |_|/ |/| | | Fix share permission checks | ||||
| * | | Fix share permission related unit tests | Vincent Petry | 2015-03-20 | 1 | -9/+13 |
| | | | |||||
| * | | Rename must be possible with update-only permission | Vincent Petry | 2015-03-19 | 1 | -17/+23 |
| | | | | | | | | | | | | and this as long as the rename is done within the same folder. | ||||
| * | | Reenable trashbin after failed rename | Vincent Petry | 2015-03-18 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | | | After a failed rename, the post_rename hook is not called. This quickfix makes sure the trashbin storage logic is reenabled also after a failed rename. | ||||
| * | | Fix shared storage permission checks | Vincent Petry | 2015-03-18 | 2 | -4/+166 |
| | | | |||||
* | | | Merge pull request #15001 from owncloud/kill-share-proxy | Thomas Müller | 2015-03-26 | 7 | -79/+23 |
|\ \ \ | | | | | | | | | Replace share proxy with a hook | ||||
| * | | | replace share proxy with hook | Robin Appelman | 2015-03-26 | 7 | -74/+18 |
| | | | | |||||
| * | | | rename proxy test | Robin Appelman | 2015-03-26 | 1 | -7/+7 |
| | | | | |||||
* | | | | Merge pull request #15234 from owncloud/encryption2_core | Thomas Müller | 2015-03-26 | 4 | -0/+172 |
|\ \ \ \ | | | | | | | | | | | core part of encryption 2.0 | ||||
| * | | | | implement basic encryption functionallity in core to enable multiple ↵ | Bjoern Schiessle | 2015-03-26 | 4 | -0/+172 |
| | | | | | | | | | | | | | | | | | | | | encryption modules | ||||
* | | | | | Merge pull request #15237 from owncloud/remove-ide-autocomplete-fail | Thomas Müller | 2015-03-26 | 1 | -1/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove IDE autocomplete fail | ||||
| * | | | | | Remove IDE autocomplete fail | Lukas Reschke | 2015-03-26 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | :see_no_evil: *cough* *cough* | ||||
* | | | | | | Merge pull request #15214 from owncloud/no-php-timeouts-on-webdav-master | Morris Jobke | 2015-03-26 | 1 | -0/+4 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | no php execution timeout for webdav | ||||
| * | | | | | no php execution timeout for webdav | Thomas Müller | 2015-03-26 | 1 | -0/+4 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #15129 from owncloud/version-command-bus | Lukas Reschke | 2015-03-26 | 3 | -6/+92 |
|\ \ \ \ \ | |_|/ / / |/| | | | | expire versions in a background command | ||||
| * | | | | teardown after we're done | Robin Appelman | 2015-03-26 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | save uid instead of user object in command | Robin Appelman | 2015-03-26 | 2 | -5/+5 |
| | | | | | |||||
| * | | | | Setup the filesystem in the expire command | Robin Appelman | 2015-03-26 | 3 | -4/+24 |
| | | | | | |||||
| * | | | | expire versions in a background command | Robin Appelman | 2015-03-26 | 2 | -5/+70 |
| | | | | | |||||
* | | | | | Merge pull request #14958 from owncloud/dropdown-style | Jan-Christoph Borchardt | 2015-03-26 | 1 | -3/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | popover style for apps and user dropdown menus | ||||
| * | | | | | adjust animations of Share, Versions and others to OC.menuSpeed | Jan-Christoph Borchardt | 2015-03-26 | 1 | -3/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #14495 from owncloud/update-mailmap-01 | Thomas Müller | 2015-03-26 | 288 | -2474/+5364 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Updating .mailmap | ||||
| * | | | | | | Update license headers | Jenkins for ownCloud | 2015-03-26 | 288 | -2474/+5364 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Revert "add https:// placeholder for From Link feature. closes #13255" | Robin McCorkell | 2015-03-26 | 1 | -1/+1 |
| |_|/ / / |/| | | | | | | | | | | | | | | This reverts commit 18b5966f3a7639c6190f58b0d94e05e67200d57a. | ||||
* | | | | | Merge pull request #15206 from owncloud/mark-dot-files-gray | Thomas Müller | 2015-03-26 | 2 | -1/+24 |
|\ \ \ \ \ | |/ / / / |/| | | | | Show hidden files (dot files) in gray | ||||
| * | | | | Show hidden files (dot files) in gray | Morris Jobke | 2015-03-26 | 2 | -1/+24 |
| | | | | | |||||
* | | | | | Merge pull request #15195 from owncloud/reanimate-add-guzzle | Morris Jobke | 2015-03-26 | 4 | -29/+17 |
|\ \ \ \ \ | |/ / / / |/| | | | | Add wrapper for Guzzle | ||||
| * | | | | Add wrapper for Guzzle | Lukas Reschke | 2015-03-25 | 4 | -29/+17 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-26 | 8 | -4/+32 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #15170 from owncloud/middleclickbreadcrumb | Morris Jobke | 2015-03-26 | 2 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | Fix middle click on breadcrumb | ||||
| * | | | | Fix breadcrumb click JS unit test | Vincent Petry | 2015-03-25 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fix middle click on breadcrumb | Vincent Petry | 2015-03-24 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #15185 from owncloud/fix-14775-master | Vincent Petry | 2015-03-25 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | tearDown the file system before reinitializing | ||||
| * | | | | | tearDown the file system before reinitializing - fixes #14775 | Thomas Müller | 2015-03-25 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #15180 from owncloud/ext-tabbing | Morris Jobke | 2015-03-25 | 1 | -30/+21 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Use individual timers for separate config rows | ||||
| * | | | | | Use individual timers for separate config rows | Robin McCorkell | 2015-03-24 | 1 | -30/+21 |
| | | | | | | |||||
* | | | | | | Merge pull request #15179 from owncloud/trash-recreatetrashfolderafterfulldelete | Vincent Petry | 2015-03-25 | 1 | -0/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Recreate trashbin folder after full deletion | ||||
| * | | | | | | Recreate trashbin folder after full deletion | Vincent Petry | 2015-03-24 | 1 | -0/+2 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #14970 from owncloud/sidebar-enhancements | Jan-Christoph Borchardt | 2015-03-25 | 1 | -2/+8 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | sidebar fixes | ||||
| * | | | | | double padding to account for Deleted files entry, issue with Firefox | Jan-Christoph Borchardt | 2015-03-24 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | fix position of 'Deleted files' sidebar entry, fix #10815 | Jan-Christoph Borchardt | 2015-03-18 | 1 | -2/+4 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-25 | 14 | -2/+22 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #15055 from owncloud/share-activity-grouping | Morris Jobke | 2015-03-24 | 1 | -0/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | Group sharing activities by user/group and file respectively | ||||
| * | | | | | Group sharing activities by user/group and file respectively | Joas Schilling | 2015-03-20 | 1 | -0/+14 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #15160 from owncloud/deduplicate-external-manager-tests | Morris Jobke | 2015-03-24 | 2 | -154/+67 |
|\ \ \ \ \ | | | | | | | | | | | | | Deduplicate external manager tests |