summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-174-4/+4
* Merge pull request #17474 from owncloud/fix_trashbinVincent Petry2015-07-162-2/+62
|\
| * only move real files to the trash binBjoern Schiessle2015-07-082-2/+62
* | Merge pull request #17500 from owncloud/encryption_migration_improvementsThomas Müller2015-07-164-8/+71
|\ \
| * | only create new key pair if both keys are missingBjoern Schiessle2015-07-082-7/+68
| * | only cleanUp the remaining keys if the migration really finished succesfullyBjoern Schiessle2015-07-082-1/+3
| |/
* | Merge pull request #17046 from nicolas-grekas/fix-16654blizzz2015-07-163-9/+5
|\ \
| * | Do not use OC*::mb_*_replace(), they are uselessNicolas Grekas2015-07-163-9/+5
* | | Lock scanner to the given userRobin Appelman2015-07-151-4/+5
* | | Merge pull request #17623 from owncloud/fed-throwcorrectexceptionMorris Jobke2015-07-141-1/+1
|\ \ \
| * | | Throw storage not available on guzzle errorVincent Petry2015-07-131-1/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-142-0/+2
|/ / /
* | | Strip public webdav info about sharing and mount pointsVincent Petry2015-07-131-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-132-0/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-122-0/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-116-0/+32
* | | Merge pull request #17483 from rullzer/migrate-mimetype-jsVincent Petry2015-07-106-73/+38
|\ \ \
| * | | Fix unit testsRoeland Jago Douma2015-07-093-4/+13
| * | | Make the filelist get the mimetypeicon from the mimetypeRoeland Jago Douma2015-07-091-9/+1
| * | | Remove ajax/mimeicon.php and its routeRoeland Jago Douma2015-07-092-29/+0
| * | | Move calls to Files.getMimeIcon to OC.MimeType.getIconUrlRoeland Jago Douma2015-07-091-27/+25
| * | | Make getMimeIcon use OC.MimeType.getIconUrlRoeland Jago Douma2015-07-091-12/+7
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-1014-14/+30
* | | | Merge pull request #17473 from owncloud/enc_fix_migrationMorris Jobke2015-07-092-14/+82
|\ \ \ \ | |/ / / |/| | |
| * | | more secure way to update the databaseBjoern Schiessle2015-07-082-14/+82
| | |/ | |/|
* | | Merge pull request #14341 from rullzer/public_share_do_not_leak_mounttypeMorris Jobke2015-07-091-0/+3
|\ \ \
| * | | Do not leak mounttype of a public shareRoeland Jago Douma2015-07-041-0/+3
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-0912-8/+40
| |/ / |/| |
* | | Merge pull request #17330 from owncloud/fix-share-path-for-group-exceptionsMorris Jobke2015-07-081-9/+139
|\ \ \
| * | | Add visibility to test methodsJoas Schilling2015-07-071-11/+11
| * | | Add test case when owner renames shared folderVincent Petry2015-07-071-5/+8
| * | | Add unit test for getUsersSharingFileVincent Petry2015-07-071-0/+127
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-0814-0/+14
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-072-0/+2
* | | | Merge pull request #16724 from owncloud/mimetype-jsRoeland Douma2015-07-062-2/+1
|\ \ \ \
| * | | | Share app no longer use the OCS API iconRoeland Jago Douma2015-07-062-2/+1
* | | | | Merge pull request #17418 from owncloud/fix-public-download-button-regressionJan-Christoph Borchardt2015-07-061-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix regression of button at public download pageMorris Jobke2015-07-061-1/+1
* | | | | Merge pull request #17290 from owncloud/remove-readonly-wrapperThomas Müller2015-07-063-76/+2
|\ \ \ \ \
| * | | | | remove no longer needed readonly wrapperRobin Appelman2015-07-011-74/+0
| * | | | | use permissions mask wrapper instead of readonly wrapperRobin Appelman2015-07-012-2/+2
* | | | | | Merge pull request #16964 from owncloud/versions_occThomas Müller2015-07-063-0/+304
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | add occ tool to delete versionsBjoern Schiessle2015-06-163-0/+304
* | | | | | Merge pull request #17335 from owncloud/better-federated-cloud-sharing-activi...Joas Schilling2015-07-062-13/+26
|\ \ \ \ \ \
| * | | | | | Use federated cloud id as a parameter typeJoas Schilling2015-07-021-3/+3
| * | | | | | Add the item name to the federated sahre activityJoas Schilling2015-07-022-1/+6
| * | | | | | Use the app constant to fix the groupingJoas Schilling2015-07-022-9/+11
| * | | | | | Use the item name when refering to the unaccepted remote shareJoas Schilling2015-07-022-2/+8
* | | | | | | Merge pull request #16733 from owncloud/add-smashbox-tests-remote-sharesJoas Schilling2015-07-064-3/+122
|\ \ \ \ \ \ \
| * | | | | | | Add OCS api to get, accept and decline remote sharesJoas Schilling2015-07-034-1/+120