Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | 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 | 5 | -8/+73 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | ||||||
| * | | | | | | | 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 | 3 | -1/+5 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #17046 from nicolas-grekas/fix-16654 | blizzz | 2015-07-16 | 5 | -26/+12 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Do not use OC*::mb_*_replace(), they are useless | Nicolas Grekas | 2015-07-16 | 5 | -26/+12 | |
* | | | | | | | Merge pull request #17660 from owncloud/properly-wait-for-oracle-docker | Thomas Müller | 2015-07-15 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [autotest] wait for oracle docker container initialization instead of waiting... | Morris Jobke | 2015-07-15 | 1 | -2/+4 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #17659 from owncloud/files-scan-user-path | Vincent Petry | 2015-07-15 | 1 | -4/+5 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Lock scanner to the given user | Robin Appelman | 2015-07-15 | 1 | -4/+5 | |
* | | | | | | | Merge pull request #17639 from owncloud/remove-file-target-index | Morris Jobke | 2015-07-15 | 2 | -8/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Remove index on file_target of share table | Morris Jobke | 2015-07-14 | 2 | -8/+1 | |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-15 | 2 | -0/+14 | |
|/ / / / / / | ||||||
* | | | | | | 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 | |
* | | | | | | | Merge pull request #17606 from owncloud/appstore-timeout | Morris Jobke | 2015-07-14 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Handle returned null value in app level code | Morris Jobke | 2015-07-13 | 1 | -2/+2 | |
* | | | | | | | | Merge pull request #17620 from owncloud/s2s-hasupdated-catch405 | Morris Jobke | 2015-07-14 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Throw StorageNotAvailable if propfind on root failed | Vincent Petry | 2015-07-13 | 1 | -1/+5 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-14 | 6 | -0/+6 | |
* | | | | | | | | Merge pull request #17565 from owncloud/fix/remote_share | Roeland Douma | 2015-07-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | allow remote shares for users with email as usernames | Felix Böhm | 2015-07-10 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #17599 from owncloud/fix-joinpaths-trailingslash | Morris Jobke | 2015-07-13 | 2 | -4/+18 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix OC.joinPaths with empty arguments | Vincent Petry | 2015-07-13 | 2 | -4/+18 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #17605 from owncloud/pwebdav-stripmountinfo | Vincent Petry | 2015-07-13 | 3 | -6/+45 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Strip public webdav info about sharing and mount points | Vincent Petry | 2015-07-13 | 3 | -6/+45 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #17609 from owncloud/core-js-helpersforcurrenturl | Morris Jobke | 2015-07-13 | 1 | -0/+45 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Add helper functions for host, port and webroot | Vincent Petry | 2015-07-13 | 1 | -0/+45 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #17481 from rullzer/mimetype-list | Morris Jobke | 2015-07-13 | 4 | -202/+183 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Move to OC::$configDif | Roeland Jago Douma | 2015-07-10 | 1 | -3/+3 | |
| * | | | | | | | Move mimetypemapping.json to mimetypemapping.dist.json | Roeland Jago Douma | 2015-07-08 | 2 | -2/+12 | |
| * | | | | | | | Move mimetypes.list.php to config/mimetypemapping.json | Roeland Jago Douma | 2015-07-08 | 4 | -202/+173 | |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-13 | 8 | -4/+26 | |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-12 | 6 | -0/+8 | |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-11 | 14 | -2/+50 | |
* | | | | | | | | Merge pull request #17559 from owncloud/js-joinpathsutility | Morris Jobke | 2015-07-10 | 2 | -0/+83 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | More tests for joinPaths | Vincent Petry | 2015-07-10 | 1 | -0/+3 | |
| * | | | | | | | | Add OC.joinPaths for convenient path joining | Vincent Petry | 2015-07-10 | 2 | -0/+80 | |
* | | | | | | | | | Merge pull request #17555 from owncloud/update-test-libraries | Vincent Petry | 2015-07-10 | 4 | -4311/+5971 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Update JS unit test libs | Vincent Petry | 2015-07-10 | 4 | -4311/+5971 | |
* | | | | | | | | | | Merge pull request #17509 from rullzer/mimetype-alias-dist | Roeland Douma | 2015-07-10 | 3 | -5/+19 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Move mimetypealiases.json to mimetypealiases.dist.json | Roeland Jago Douma | 2015-07-10 | 3 | -5/+19 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #17483 from rullzer/migrate-mimetype-js | Vincent Petry | 2015-07-10 | 9 | -135/+101 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Fix unit tests | Roeland Jago Douma | 2015-07-09 | 3 | -4/+13 | |
| * | | | | | | | | MimeTypes now also supports httpd/unix-directory | Roeland Jago Douma | 2015-07-09 | 2 | -59/+61 | |
| * | | | | | | | | 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 | 2 | -30/+27 | |
| * | | | | | | | | 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 | 28 | -42/+78 |