summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* fix filter index on selected groups is updated too earlyArthur Schiwon2015-05-061-2/+3
* fix broken group presentation in selected groups listArthur Schiwon2015-05-061-3/+6
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-0622-10/+116
* cleanupArthur Schiwon2015-05-052-2/+0
* not only send them back but also apply defaults to a new configuration. Fixes...Arthur Schiwon2015-05-051-0/+1
* Merge pull request #16052 from owncloud/fix-phpdoc-sharecontrollerJoas Schilling2015-05-051-0/+1
|\
| * Fix PHPDoc for the ext. share controllerLukas Reschke2015-05-041-0/+1
* | Merge pull request #15938 from owncloud/enc_update_recovery_share_keyBjörn Schießle2015-05-058-44/+92
|\ \
| * | check recovery setting for the right userBjoern Schiessle2015-04-308-44/+92
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-05118-388/+390
| |/ |/|
* | Merge pull request #16026 from owncloud/enc_ux_improvementsBjörn Schießle2015-05-041-3/+7
|\ \
| * | some small ux improvementsBjoern Schiessle2015-05-041-3/+7
* | | Merge pull request #16042 from owncloud/fix-output-bufferingThomas Müller2015-05-041-0/+2
|\ \ \
| * | | Remove hard-dependency on disabled output_bufferingLukas Reschke2015-05-041-0/+2
* | | | Fix DeleteOrphanedSharesJobMorris Jobke2015-05-041-3/+8
|/ / /
* | | Merge pull request #15652 from oparoz/better-text-previewsLukas Reschke2015-05-042-13/+60
|\ \ \
| * | | Remove overflow+watermarkOlivier Paroz2015-04-232-14/+6
| * | | Use authorization headers for better compatibilityOlivier Paroz2015-04-231-22/+25
| * | | An idea to suggest that this is just a sample of the full textOlivier Paroz2015-04-232-1/+15
| * | | Use webDAV to have access to HTTP byte rangesOlivier Paroz2015-04-231-1/+4
| * | | Cache the token valueOlivier Paroz2015-04-231-4/+3
| * | | Show a text preview instead of a bitmap preview of textOlivier Paroz2015-04-232-6/+42
* | | | Merge pull request #15752 from owncloud/feature/fix-encryption-return-valuesThomas Müller2015-05-044-93/+299
|\ \ \ \ | |_|/ / |/| | |
| * | | change error codes to 400Clark Tomlinson2015-04-242-20/+20
| * | | fix messages from settings crontrollerClark Tomlinson2015-04-222-14/+15
| * | | remove status's and adjust jsClark Tomlinson2015-04-223-67/+88
| * | | destupify testsClark Tomlinson2015-04-222-104/+100
| * | | fixing return values and adding testsClark Tomlinson2015-04-222-32/+220
* | | | Merge pull request #15584 from owncloud/enc_fix_upload_shared_folderThomas Müller2015-05-044-3/+83
|\ \ \ \
| * | | | Simplify the testJoas Schilling2015-04-303-14/+8
| * | | | skip user if we don't have a public keyBjoern Schiessle2015-04-303-1/+87
| | |_|/ | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0412-2/+50
* | | | Merge pull request #15486 from owncloud/versions-rollbackkeepfileidMorris Jobke2015-05-032-4/+121
|\ \ \ \
| * | | | Use moveFromStorage instead of streamCopy when restoring versionVincent Petry2015-04-301-14/+1
| * | | | Fix version rollback to keep fileidVincent Petry2015-04-302-4/+134
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0220-30/+36
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0114-4/+70
* | | | Moving encryption_dummy to the apps repo - fixes #15950Thomas Müller2015-04-305-218/+0
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-3036-38/+16
* | | Merge pull request #15919 from owncloud/enc_handle_empty_filesClark Tomlinson2015-04-294-34/+118
|\ \ \
| * | | method shouldn't be staticBjoern Schiessle2015-04-281-1/+1
| * | | also create encryption keys for empty filesBjoern Schiessle2015-04-282-23/+42
| * | | skip update of encryption keys if file is not encryptedBjoern Schiessle2015-04-283-13/+78
* | | | Merge pull request #15908 from owncloud/fix-replace-with-sedVincent Petry2015-04-2910-10/+10
|\ \ \ \
| * | | | Replace `replace` with `sed` statementMorris Jobke2015-04-2910-10/+10
| |/ / /
* | | | Merge pull request #15596 from owncloud/issue/15589Morris Jobke2015-04-292-9/+31
|\ \ \ \
| * | | | Add tests for the correct share id on the call aswellJoas Schilling2015-04-281-3/+15
| * | | | Correctly send Federate-Cloud Share Feedback against the remote share IDJoas Schilling2015-04-281-6/+6
| * | | | check the called URLJoas Schilling2015-04-281-3/+13
| * | | | Correctly generate the feedback URL for remote shareJoas Schilling2015-04-281-1/+1
| |/ / /