summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Add trashbin storage wrapper unit test for versionsVincent Petry2015-01-231-6/+76
| * | | | | | Simplify trash storage unit testsVincent Petry2015-01-231-46/+16
| * | | | | | Unregister trashbin storage wrapper at the end of testsVincent Petry2015-01-232-0/+4
| * | | | | | Preserve mtime when doing cross storage moveRobin Appelman2015-01-233-45/+40
| * | | | | | Remove storage wrapper for oc_trashbin in unit testVincent Petry2015-01-231-0/+2
| * | | | | | Only move files from the current user to the trashbinRobin Appelman2015-01-231-4/+5
| * | | | | | Apply wrappers to existing mounts before registering itRobin Appelman2015-01-232-8/+11
| * | | | | | Call final unlink in trash wrapper's storageVincent Petry2015-01-234-2/+178
| * | | | | | removeStorageWrapper to unregister a storage wrapperVincent Petry2015-01-232-3/+24
| * | | | | | Do not call wrapStorage if storate with same name added twiceVincent Petry2015-01-223-1/+12
* | | | | | | Merge pull request #13707 from owncloud/extstorage-fixincompletestorageconfigVincent Petry2015-01-272-9/+96
|\ \ \ \ \ \ \
| * | | | | | | Allow saving incomplete external storage configVincent Petry2015-01-272-2/+67
| * | | | | | | Fix mount config unit test failuresVincent Petry2015-01-271-7/+29
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #13699 from owncloud/check-if-file-existsMorris Jobke2015-01-271-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Use `file_exists` to verify that config file existsLukas Reschke2015-01-271-1/+3
* | | | | | | | Merge pull request #13636 from owncloud/add-warning-if-restore-of-data-is-not...Lukas Reschke2015-01-275-36/+235
|\ \ \ \ \ \ \ \
| * | | | | | | | Add value if restore of data is possible for a userMorris Jobke2015-01-275-36/+235
| |/ / / / / / /
* | | | | | | | Merge pull request #13701 from owncloud/disable-appcode-checkerLukas Reschke2015-01-271-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | disable the app code checker - some previous shipped apps cannot be installed...Thomas Müller2015-01-271-1/+1
* | | | | | | | Merge pull request #13676 from owncloud/fix-node-ifaceThomas Müller2015-01-272-3/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | fix node interfaceBernhard Posselt2015-01-262-3/+2
* | | | | | | | | Merge pull request #13679 from owncloud/public-disablesharejspluginThomas Müller2015-01-273-3/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Do not disclose share owner in public file listVincent Petry2015-01-261-1/+4
| * | | | | | | | | Disable JS plugin for sharing in public modeVincent Petry2015-01-262-2/+26
* | | | | | | | | | Merge pull request #13691 from owncloud/s2s-acceptsinglefileThomas Müller2015-01-272-4/+124
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Only reload file list after remote share accept request returnsVincent Petry2015-01-262-4/+124
| |/ / / / / / / /
* | | | | | | | | Merge pull request #13694 from owncloud/little-bit-more-descriptive-htaccess-...Thomas Müller2015-01-271-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make error more descriptiveLukas Reschke2015-01-261-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-276-0/+12
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #13490 from owncloud/fix_reshare_s2s_shareVincent Petry2015-01-2610-68/+98
|\ \ \ \ \ \ \ \
| * | | | | | | | certificate manager should always use a \OC\Files\View otherwise we will get ...Bjoern Schiessle2015-01-264-19/+48
| * | | | | | | | certificate manager only needs the user-id, no need to pass on the complete u...Bjoern Schiessle2015-01-266-20/+22
| * | | | | | | | use uid provided by setupfs hook to mount server2server shares, otherwise mou...Bjoern Schiessle2015-01-265-35/+34
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #13677 from owncloud/s2s-doubleslashrequestVincent Petry2015-01-261-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Prevent double slash in shareinfo request URLVincent Petry2015-01-261-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #13660 from owncloud/remove-duplicate-service-definitionThomas Müller2015-01-261-12/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove duplicated definition of APIControllerJoas Schilling2015-01-261-12/+0
| |/ / / / /
* | | | | | Merge pull request #13621 from owncloud/system-config-multisetThomas Müller2015-01-2615-137/+258
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | naming fixes while reviewingThomas Müller2015-01-263-19/+21
| * | | | | Use setConfigs() instead of calling setConfig() multiple timesJoas Schilling2015-01-239-99/+105
| * | | | | Add a method to set/unset multiple config values in one callJoas Schilling2015-01-236-22/+135
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-262-0/+2
* | | | | | 8.0 beta 2v8.0.0beta2Frank Karlitschek2015-01-261-2/+2
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2528-14/+80
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2480-6/+190
* | | | | | Merge pull request #13637 from owncloud/s2s_notification_new_defaultsBjörn Schießle2015-01-232-3/+75
|\ \ \ \ \ \
| * | | | | | by default send mail for new server-to-server shareBjoern Schiessle2015-01-232-3/+75
|/ / / / / /
* | | | | | Merge pull request #13626 from owncloud/check-for-hhvmClark Tomlinson2015-01-231-0/+14
|\ \ \ \ \ \
| * | | | | | Don't check for `always_populate_raw_post_data` on HHVMLukas Reschke2015-01-231-0/+14
* | | | | | | Merge pull request #13463 from owncloud/share-getitemsharedwithuser-emptygroupLukas Reschke2015-01-232-21/+48
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |