aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-118-2/+32
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-1030-18/+100
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-0992-446/+98
* improved admin settingsBjoern Schiessle2015-05-083-63/+90
* Merge pull request #16170 from owncloud/fix-15621Thomas Müller2015-05-081-6/+9
|\
| * drop global file cache support, fixes #15621Arthur Schiwon2015-05-071-6/+9
* | Merge pull request #16183 from owncloud/fix-16147Thomas Müller2015-05-081-2/+2
|\ \
| * | check optional parameter before using it, fixes #16147Arthur Schiwon2015-05-071-2/+2
| |/
* | Merge pull request #16160 from owncloud/issue-15924-php-notice-empty-path-pat...Morris Jobke2015-05-082-1/+15
|\ \
| * | Add a test for getting the versions of an empty pathJoas Schilling2015-05-071-1/+12
| * | Do not run method when the path is emptyJoas Schilling2015-05-071-0/+3
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2015-05-086-4/+18
|/
* Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-pageMorris Jobke2015-05-073-7/+5
|\
| * Display the module settings in the list of the encryption modulesJoas Schilling2015-05-043-7/+5
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0722-22/+60
* | 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
| |/ / /