Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares | Morris Jobke | 2015-01-29 | 2 | -57/+118 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix intendation | Joas Schilling | 2015-01-29 | 1 | -3/+3 | |
| * | | | | | | | Fix more assertions | Joas Schilling | 2015-01-29 | 1 | -26/+26 | |
| * | | | | | | | Fix 2 assertions | Joas Schilling | 2015-01-29 | 1 | -3/+3 | |
| * | | | | | | | make sure that we always create a public share key for remote shares | Bjoern Schiessle | 2015-01-29 | 2 | -32/+93 | |
* | | | | | | | | Merge pull request #13728 from owncloud/federated_cloud | Thomas Müller | 2015-01-29 | 2 | -5/+5 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | rename 'server-to-server sharing' to 'federated cloud' | Bjoern Schiessle | 2015-01-29 | 2 | -5/+5 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #13746 from owncloud/no-groups-provisioning-api | Thomas Müller | 2015-01-29 | 2 | -1/+5 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | disallow provisioning api to be enabled for groups only | Thomas Müller | 2015-01-29 | 2 | -1/+5 | |
* | | | | | | | | Merge pull request #13604 from owncloud/encryption-key-migration-as-repair-step | Thomas Müller | 2015-01-29 | 3 | -21/+115 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | user fs must be setup up, so that the real user folder is mounted on the user... | Arthur Schiwon | 2015-01-22 | 1 | -0/+1 | |
| * | | | | | | | | adding console command to migrate encryption keys - refs #13450 | Thomas Müller | 2015-01-22 | 3 | -21/+114 | |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-29 | 24 | -0/+48 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #13401 from is-apps/amazon_s3_checkboxes | Thomas Müller | 2015-01-28 | 1 | -1/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Align checkbox configuration in external files | Ross Nicoll | 2015-01-19 | 1 | -1/+7 | |
* | | | | | | | | | Fix trash error when deleting files with the same name at the same time (happ... | Robin Appelman | 2015-01-28 | 1 | -0/+3 | |
| |_|/ / / / / / |/| | | | | | | | ||||||
* | | | | | | | | [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 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 | |
* | | | | | | | | | Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefix | Vincent Petry | 2015-01-27 | 7 | -4/+226 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix bogus deletion on copy + unlink through rename | Vincent Petry | 2015-01-26 | 3 | -0/+38 | |
| * | | | | | | | | | 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 | |
| * | | | | | | | | | Unregister trashbin storage wrapper at the end of tests | Vincent Petry | 2015-01-23 | 2 | -0/+4 | |
| * | | | | | | | | | 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 | |
* | | | | | | | | | | Allow saving incomplete external storage config | Vincent Petry | 2015-01-27 | 2 | -2/+67 | |
* | | | | | | | | | | Fix mount config unit test failures | Vincent Petry | 2015-01-27 | 1 | -7/+29 | |
* | | | | | | | | | | Merge pull request #13679 from owncloud/public-disablesharejsplugin | Thomas Müller | 2015-01-27 | 3 | -3/+30 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | 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 | |
* | | | | | | | | | | | 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 | Vincent Petry | 2015-01-26 | 2 | -4/+124 | |
| |/ / / / / / / / / / | ||||||
* / / / / / / / / / / | [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 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | certificate manager should always use a \OC\Files\View otherwise we will get ... | Bjoern Schiessle | 2015-01-26 | 1 | -1/+26 | |
| * | | | | | | | | | | certificate manager only needs the user-id, no need to pass on the complete u... | Bjoern Schiessle | 2015-01-26 | 3 | -5/+6 | |
| * | | | | | | | | | | use uid provided by setupfs hook to mount server2server shares, otherwise mou... | Bjoern Schiessle | 2015-01-26 | 5 | -35/+34 | |
* | | | | | | | | | | | 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 | |
* | | | | | | | | | [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 | |
|\ \ \ \ \ \ \ \ |