summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Double slash for SMB storage id for compatibilityVincent Petry2015-07-282-1/+16
* Merge pull request #17840 from owncloud/fix-enc-wrapper-without-encryptionThomas Müller2015-07-272-1/+97
|\
| * add condition to update queryBjoern Schiessle2015-07-271-1/+1
| * Add an update script to reset the valueJoas Schilling2015-07-242-1/+97
* | Merge pull request #17526 from owncloud/fix-17516Morris Jobke2015-07-274-2/+96
|\ \
| * | LDAP: when checking group for matching filter, also take base DN into conside...Arthur Schiwon2015-07-094-2/+96
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-274-0/+10
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-252-0/+4
* | | Merge pull request #17075 from owncloud/bootstrap-tooltipBernhard Posselt2015-07-231-2/+2
|\ \ \ | |_|/ |/| |
| * | fix tipsy dependencyHendrik Leppelsack2015-07-081-2/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-236-4/+76
* | | Merge pull request #17413 from owncloud/public-api-querybuilderMorris Jobke2015-07-224-79/+85
|\ \ \
| * | | Fix existing usages by removing the quotesJoas Schilling2015-07-214-54/+60
| * | | Use the public interface and our method instead of the doctrine thingJoas Schilling2015-07-214-25/+25
* | | | Merge pull request #17806 from owncloud/enc_improved_app_descriptionRobin McCorkell2015-07-221-13/+8
|\ \ \ \
| * | | | improved app description and adjust it to the way the new encryption module w...Bjoern Schiessle2015-07-221-13/+8
* | | | | Fixing line comments and indentationViktor Szépe2015-07-212-24/+25
| |/ / / |/| | |
* | | | Merge pull request #17381 from owncloud/fix_sharing_add_to_groupMorris Jobke2015-07-211-4/+10
|\ \ \ \
| * | | | use the correct user if we update the share tableBjoern Schiessle2015-07-031-4/+10
* | | | | Merge pull request #17750 from owncloud/enc_migration_fix_mountpoint_detectionJoas Schilling2015-07-212-4/+81
|\ \ \ \ \
| * | | | | fix mount point detectionBjoern Schiessle2015-07-202-4/+81
| | |/ / / | |/| | |
* / | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-214-0/+16
|/ / / /
* | | | Merge pull request #17701 from owncloud/fix_repeated_migrationBjörn Schießle2015-07-204-22/+114
|\ \ \ \
| * | | | unit testsBjoern Schiessle2015-07-171-2/+36
| * | | | don't move keys if the key where already moved in a previous migration runBjoern Schiessle2015-07-174-21/+79
* | | | | Merge pull request #17723 from owncloud/fix-17631blizzz2015-07-202-125/+133
|\ \ \ \ \
| * | | | | fix indentation. no code changes, whitespace only.Arthur Schiwon2015-07-201-126/+126
| * | | | | fix runtime caching in ldap's user manager, fixes #17631Arthur Schiwon2015-07-172-2/+10
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-208-0/+10
|/ / / / /
* | | | | Merge pull request #17706 from rullzer/external_diricon_filelistMorris Jobke2015-07-171-0/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | The external directories should get the correct iconRoeland Jago Douma2015-07-171-0/+4
* | | | | [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