summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorageMorris Jobke2015-01-284-25/+144
|\
| * Add back exit()Vincent Petry2015-01-261-1/+1
| * Catch storage exception in scanner for remote sharesVincent Petry2015-01-264-25/+144
* | Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefixVincent Petry2015-01-277-4/+226
|\ \
| * | Fix bogus deletion on copy + unlink through renameVincent Petry2015-01-263-0/+38
| * | 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-231-41/+2
| * | 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
| * | Call final unlink in trash wrapper's storageVincent Petry2015-01-234-2/+178
* | | 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 #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
| |/ / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2015-01-272-0/+2
|/ / /
* | | Merge pull request #13490 from owncloud/fix_reshare_s2s_shareVincent Petry2015-01-267-39/+64
|\ \ \
| * | | certificate manager should always use a \OC\Files\View otherwise we will get ...Bjoern Schiessle2015-01-261-1/+26
| * | | certificate manager only needs the user-id, no need to pass on the complete u...Bjoern Schiessle2015-01-263-5/+6
| * | | use uid provided by setupfs hook to mount server2server shares, otherwise mou...Bjoern Schiessle2015-01-265-35/+34
* | | | Prevent double slash in shareinfo request URLVincent Petry2015-01-261-1/+1
|/ / /
* | | Remove duplicated definition of APIControllerJoas Schilling2015-01-261-12/+0
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2516-14/+58
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-246-2/+6
* | | by default send mail for new server-to-server shareBjoern Schiessle2015-01-232-3/+75
* | | Ignore favorites that are not available when creating the favorites listJoas Schilling2015-01-232-3/+19
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2316-2/+50
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-22112-232/+120
* | | Merge pull request #13517 from owncloud/keymanager-storageMorris Jobke2015-01-221-12/+9
|\ \ \
| * | | Bypass the view when storing encryption keysRobin Appelman2015-01-201-12/+9
* | | | Merge pull request #13568 from owncloud/s2s_delete_shares_jenkinsMorris Jobke2015-01-224-0/+144
|\ \ \ \
| * | | | delete all server-to-server shares if a user gets deletedBjoern Schiessle2015-01-214-0/+144
| | |_|/ | |/| |
* / | | Make naming of encryption app consistentLukas Reschke2015-01-212-2/+10
|/ / /
* | | Merge pull request #13432 from owncloud/animate_gifs_public_sharingThomas Müller2015-01-214-3/+20
|\ \ \
| * | | show animated gifs on public sharing pageGeorg Ehrke2015-01-194-3/+20
* | | | Merge pull request #13540 from owncloud/s2s-fixpasswordfromdialogThomas Müller2015-01-212-58/+202
|\ \ \ \
| * | | | Add unit test for external share JS dialogVincent Petry2015-01-212-57/+200
| * | | | External share dialog must properly read entered passwordVincent Petry2015-01-211-1/+2
| | |_|/ | |/| |
* | | | Fixed external cache test namespaceVincent Petry2015-01-211-1/+3
* | | | Fix webdav mkdir for remote sharesVincent Petry2015-01-212-0/+115
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2114-44/+106
* | | Merge pull request #13520 from owncloud/fix-comparison-opLukas Reschke2015-01-201-1/+1
|\ \ \
| * | | this must be larger then (>), since buggy behaviour occurs when the parameter...Arthur Schiwon2015-01-201-1/+1
| | |/ | |/|
* / | avoid $this->cache being null - fixes #13491Thomas Müller2015-01-201-1/+1
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2020-10/+56
* | Merge pull request #13416 from owncloud/reauthenticate-if-session-differs-fro...Morris Jobke2015-01-191-2/+11
|\ \