Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-25 | 2 | -0/+4 |
* | Merge pull request #17075 from owncloud/bootstrap-tooltip | Bernhard Posselt | 2015-07-23 | 1 | -2/+2 |
|\ | |||||
| * | fix tipsy dependency | Hendrik Leppelsack | 2015-07-08 | 1 | -2/+2 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-23 | 6 | -4/+76 |
* | | Merge pull request #17413 from owncloud/public-api-querybuilder | Morris Jobke | 2015-07-22 | 4 | -79/+85 |
|\ \ | |||||
| * | | Fix existing usages by removing the quotes | Joas Schilling | 2015-07-21 | 4 | -54/+60 |
| * | | Use the public interface and our method instead of the doctrine thing | Joas Schilling | 2015-07-21 | 4 | -25/+25 |
* | | | Merge pull request #17806 from owncloud/enc_improved_app_description | Robin McCorkell | 2015-07-22 | 1 | -13/+8 |
|\ \ \ | |||||
| * | | | improved app description and adjust it to the way the new encryption module w... | Bjoern Schiessle | 2015-07-22 | 1 | -13/+8 |
* | | | | Fixing line comments and indentation | Viktor Szépe | 2015-07-21 | 2 | -24/+25 |
| |/ / |/| | | |||||
* | | | Merge pull request #17381 from owncloud/fix_sharing_add_to_group | Morris Jobke | 2015-07-21 | 1 | -4/+10 |
|\ \ \ | |||||
| * | | | use the correct user if we update the share table | Bjoern Schiessle | 2015-07-03 | 1 | -4/+10 |
* | | | | Merge pull request #17750 from owncloud/enc_migration_fix_mountpoint_detection | Joas Schilling | 2015-07-21 | 2 | -4/+81 |
|\ \ \ \ | |||||
| * | | | | fix mount point detection | Bjoern Schiessle | 2015-07-20 | 2 | -4/+81 |
| | |/ / | |/| | | |||||
* / | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-21 | 4 | -0/+16 |
|/ / / | |||||
* | | | Merge pull request #17701 from owncloud/fix_repeated_migration | Björn Schießle | 2015-07-20 | 4 | -22/+114 |
|\ \ \ | |||||
| * | | | unit tests | Bjoern Schiessle | 2015-07-17 | 1 | -2/+36 |
| * | | | don't move keys if the key where already moved in a previous migration run | Bjoern Schiessle | 2015-07-17 | 4 | -21/+79 |
* | | | | Merge pull request #17723 from owncloud/fix-17631 | blizzz | 2015-07-20 | 2 | -125/+133 |
|\ \ \ \ | |||||
| * | | | | fix indentation. no code changes, whitespace only. | Arthur Schiwon | 2015-07-20 | 1 | -126/+126 |
| * | | | | fix runtime caching in ldap's user manager, fixes #17631 | Arthur Schiwon | 2015-07-17 | 2 | -2/+10 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-20 | 8 | -0/+10 |
|/ / / / | |||||
* | | | | Merge pull request #17706 from rullzer/external_diricon_filelist | Morris Jobke | 2015-07-17 | 1 | -0/+4 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | The external directories should get the correct icon | Roeland Jago Douma | 2015-07-17 | 1 | -0/+4 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-17 | 4 | -4/+4 |
* | | | | Merge pull request #17474 from owncloud/fix_trashbin | Vincent Petry | 2015-07-16 | 2 | -2/+62 |
|\ \ \ \ | |||||
| * | | | | only move real files to the trash bin | Bjoern Schiessle | 2015-07-08 | 2 | -2/+62 |
* | | | | | Merge pull request #17500 from owncloud/encryption_migration_improvements | Thomas Müller | 2015-07-16 | 4 | -8/+71 |
|\ \ \ \ \ | |||||
| * | | | | | only create new key pair if both keys are missing | Bjoern Schiessle | 2015-07-08 | 2 | -7/+68 |
| * | | | | | only cleanUp the remaining keys if the migration really finished succesfully | Bjoern Schiessle | 2015-07-08 | 2 | -1/+3 |
| |/ / / / | |||||
* | | | | | Merge pull request #17046 from nicolas-grekas/fix-16654 | blizzz | 2015-07-16 | 3 | -9/+5 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Do not use OC*::mb_*_replace(), they are useless | Nicolas Grekas | 2015-07-16 | 3 | -9/+5 |
* | | | | | Lock scanner to the given user | Robin Appelman | 2015-07-15 | 1 | -4/+5 |
* | | | | | Merge pull request #17623 from owncloud/fed-throwcorrectexception | Morris Jobke | 2015-07-14 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Throw storage not available on guzzle error | Vincent Petry | 2015-07-13 | 1 | -1/+1 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-14 | 2 | -0/+2 |
|/ / / / / | |||||
* | | | | | Strip public webdav info about sharing and mount points | Vincent Petry | 2015-07-13 | 1 | -1/+1 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-13 | 2 | -0/+2 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-12 | 2 | -0/+2 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-11 | 6 | -0/+32 |
* | | | | | Merge pull request #17483 from rullzer/migrate-mimetype-js | Vincent Petry | 2015-07-10 | 6 | -73/+38 |
|\ \ \ \ \ | |||||
| * | | | | | Fix unit tests | Roeland Jago Douma | 2015-07-09 | 3 | -4/+13 |
| * | | | | | Make the filelist get the mimetypeicon from the mimetype | Roeland Jago Douma | 2015-07-09 | 1 | -9/+1 |
| * | | | | | Remove ajax/mimeicon.php and its route | Roeland Jago Douma | 2015-07-09 | 2 | -29/+0 |
| * | | | | | Move calls to Files.getMimeIcon to OC.MimeType.getIconUrl | Roeland Jago Douma | 2015-07-09 | 1 | -27/+25 |
| * | | | | | Make getMimeIcon use OC.MimeType.getIconUrl | Roeland Jago Douma | 2015-07-09 | 1 | -12/+7 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-10 | 14 | -14/+30 |
* | | | | | | Merge pull request #17473 from owncloud/enc_fix_migration | Morris Jobke | 2015-07-09 | 2 | -14/+82 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | more secure way to update the database | Bjoern Schiessle | 2015-07-08 | 2 | -14/+82 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #14341 from rullzer/public_share_do_not_leak_mounttype | Morris Jobke | 2015-07-09 | 1 | -0/+3 |
|\ \ \ \ \ |