Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Align checkbox configuration in external files | Ross Nicoll | 2015-01-19 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | Modified CSS for files_external application to render labels around checkboxes at the same width as other input elements, aligning them with other elements on the same page. | |||||
* | | | | Fix trash error when deleting files with the same name at the same time ↵ | Robin Appelman | 2015-01-28 | 1 | -0/+3 | |
| |_|/ |/| | | | | | | | | (happens in unit tests) | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-28 | 14 | -10/+46 | |
| | | | ||||||
* | | | Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorage | Morris Jobke | 2015-01-28 | 4 | -25/+144 | |
|\ \ \ | | | | | | | | | Catch storage exception in scanner for remote shares | |||||
| * | | | Add back exit() | Vincent Petry | 2015-01-26 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Catch storage exception in scanner for remote shares | Vincent Petry | 2015-01-26 | 4 | -25/+144 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever an exception occurs during scan of a remote share, the share is checked for availability. If the storage is gone, it will be removed automatically. Also, getDirectoryContent() will now skip unavailable storages. | |||||
* | | | | Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefix | Vincent Petry | 2015-01-27 | 7 | -4/+226 | |
|\ \ \ \ | | | | | | | | | | | Call final unlink in trash wrapper's storage | |||||
| * | | | | Fix bogus deletion on copy + unlink through rename | Vincent Petry | 2015-01-26 | 3 | -0/+38 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Cross-storage rename would cause copy + unlink. That unlink operation must not trigger the trashbin. | |||||
| * | | | | Add trashbin storage wrapper unit test for versions | Vincent Petry | 2015-01-23 | 1 | -6/+76 | |
| | | | | | ||||||
| * | | | | Simplify trash storage unit tests | Vincent Petry | 2015-01-23 | 1 | -46/+16 | |
| | | | | | | | | | | | | | | | | | | | | Needed to make it properly init the mount points | |||||
| * | | | | Unregister trashbin storage wrapper at the end of tests | Vincent Petry | 2015-01-23 | 2 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | Some more tests that uses the storage wrapper now remove it afterwards | |||||
| * | | | | Preserve mtime when doing cross storage move | Robin Appelman | 2015-01-23 | 1 | -41/+2 | |
| | | | | | ||||||
| * | | | | Remove storage wrapper for oc_trashbin in unit test | Vincent Petry | 2015-01-23 | 1 | -0/+2 | |
| | | | | | ||||||
| * | | | | Only move files from the current user to the trashbin | Robin Appelman | 2015-01-23 | 1 | -4/+5 | |
| | | | | | ||||||
| * | | | | Call final unlink in trash wrapper's storage | Vincent Petry | 2015-01-23 | 4 | -2/+178 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of cross-storage delete, the files are copied to the trash, then deleted. The final delete on the source storage would still reach the trash wrapper. This fix makes forwards that second call to the wrapped storage to make the final delete work. It fixes the issue with remote shares, local shares and external storage. Also, it uses a new function "renameRecursive" that renames the files and preserves the mtimes (like "copy_recursive" did in the past)) | |||||
* | | | | | Allow saving incomplete external storage config | Vincent Petry | 2015-01-27 | 2 | -2/+67 | |
| | | | | | | | | | | | | | | | | | | | | This is needed for Dropbox and others that need a token. | |||||
* | | | | | Fix mount config unit test failures | Vincent Petry | 2015-01-27 | 1 | -7/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because setStorageId now instantiates storages, they might throw exceptions if arguments are missing. This fixes the unit test to not throw exceptions and have their default config arguments set. | |||||
* | | | | | Merge pull request #13679 from owncloud/public-disablesharejsplugin | Thomas Müller | 2015-01-27 | 3 | -3/+30 | |
|\ \ \ \ \ | | | | | | | | | | | | | Disable JS plugin for sharing in public mode | |||||
| * | | | | | Do not disclose share owner in public file list | Vincent Petry | 2015-01-26 | 1 | -1/+4 | |
| | | | | | | ||||||
| * | | | | | Disable JS plugin for sharing in public mode | Vincent Petry | 2015-01-26 | 2 | -2/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the logic that registers the share action and modifies the rows. Share actions aren't needed in the public file list. | |||||
* | | | | | | Merge pull request #13691 from owncloud/s2s-acceptsinglefile | Thomas Müller | 2015-01-27 | 2 | -4/+124 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Only reload file list after remote share accept request returns | |||||
| * | | | | | | Only reload file list after remote share accept request returns | Vincent Petry | 2015-01-26 | 2 | -4/+124 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | When accepting a remote share, an ajax request is sent to the server. Only once this request returns should the file list be reloaded. | |||||
* / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-27 | 2 | -0/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #13490 from owncloud/fix_reshare_s2s_share | Vincent Petry | 2015-01-26 | 7 | -39/+64 | |
|\ \ \ \ \ | | | | | | | | | | | | | use uid provided by setupfs hook to mount server2server shares | |||||
| * | | | | | certificate manager should always use a \OC\Files\View otherwise we will get ↵ | Bjoern Schiessle | 2015-01-26 | 1 | -1/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | problems for different primary storages | |||||
| * | | | | | certificate manager only needs the user-id, no need to pass on the complete ↵ | Bjoern Schiessle | 2015-01-26 | 3 | -5/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | user object | |||||
| * | | | | | use uid provided by setupfs hook to mount server2server shares, otherwise ↵ | Bjoern Schiessle | 2015-01-26 | 5 | -35/+34 | |
| | | | | | | | | | | | | | | | | | | | | | | | | mount will fail for public link shares | |||||
* | | | | | | Prevent double slash in shareinfo request URL | Vincent Petry | 2015-01-26 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Remove duplicated definition of APIController | Joas Schilling | 2015-01-26 | 1 | -12/+0 | |
| | | | | | ||||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-25 | 16 | -14/+58 | |
| | | | | | ||||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-24 | 6 | -2/+6 | |
| | | | | | ||||||
* | | | | | by default send mail for new server-to-server share | Bjoern Schiessle | 2015-01-23 | 2 | -3/+75 | |
| | | | | | ||||||
* | | | | | Ignore favorites that are not available when creating the favorites list | Joas Schilling | 2015-01-23 | 2 | -3/+19 | |
| | | | | | | | | | | | | | | | | | | | | Also correctly return the exception for all cases when adding/removing favos | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-23 | 16 | -2/+50 | |
| |_|_|/ |/| | | | ||||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-22 | 112 | -232/+120 | |
| | | | | ||||||
* | | | | Merge pull request #13517 from owncloud/keymanager-storage | Morris Jobke | 2015-01-22 | 1 | -12/+9 | |
|\ \ \ \ | | | | | | | | | | | Bypass the view when storing encryption keys | |||||
| * | | | | Bypass the view when storing encryption keys | Robin Appelman | 2015-01-20 | 1 | -12/+9 | |
| | | | | | ||||||
* | | | | | Merge pull request #13568 from owncloud/s2s_delete_shares_jenkins | Morris Jobke | 2015-01-22 | 4 | -0/+144 | |
|\ \ \ \ \ | | | | | | | | | | | | | [ignore] delete all server-to-server shares if a user gets deleted | |||||
| * | | | | | delete all server-to-server shares if a user gets deleted | Bjoern Schiessle | 2015-01-21 | 4 | -0/+144 | |
| | |_|/ / | |/| | | | ||||||
* / | | | | Make naming of encryption app consistent | Lukas Reschke | 2015-01-21 | 2 | -2/+10 | |
|/ / / / | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/13580 | |||||
* | | | | Merge pull request #13432 from owncloud/animate_gifs_public_sharing | Thomas Müller | 2015-01-21 | 4 | -3/+20 | |
|\ \ \ \ | | | | | | | | | | | show animated gifs on public sharing page | |||||
| * | | | | show animated gifs on public sharing page | Georg Ehrke | 2015-01-19 | 4 | -3/+20 | |
| | | | | | ||||||
* | | | | | Merge pull request #13540 from owncloud/s2s-fixpasswordfromdialog | Thomas Müller | 2015-01-21 | 2 | -58/+202 | |
|\ \ \ \ \ | | | | | | | | | | | | | External share dialog must properly read entered password | |||||
| * | | | | | Add unit test for external share JS dialog | Vincent Petry | 2015-01-21 | 2 | -57/+200 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved external share JS code into a small plugin to make it testable. Added unit test for the external share dialog logic + ajax calls. | |||||
| * | | | | | External share dialog must properly read entered password | Vincent Petry | 2015-01-21 | 1 | -1/+2 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Fixed external cache test namespace | Vincent Petry | 2015-01-21 | 1 | -1/+3 | |
| | | | | | ||||||
* | | | | | Fix webdav mkdir for remote shares | Vincent Petry | 2015-01-21 | 2 | -0/+115 | |
|/ / / / | ||||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-21 | 14 | -44/+106 | |
| | | | | ||||||
* | | | | Merge pull request #13520 from owncloud/fix-comparison-op | Lukas Reschke | 2015-01-20 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | this must be larger then (>), since buggy behaviour occurs when the para... | |||||
| * | | | | this must be larger then (>), since buggy behaviour occurs when the ↵ | Arthur Schiwon | 2015-01-20 | 1 | -1/+1 | |
| | |/ / | |/| | | | | | | | | | | parameter is a small number |