Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | Merge pull request #17546 from owncloud/forwardport-16917 | Morris Jobke | 2015-07-10 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix the config.php owner check for console.php | Philippe Le Brouster | 2015-07-09 | 1 | -1/+1 |
* | | | | | Merge pull request #17517 from RealRancor/fix_failed_login_syntax | Morris Jobke | 2015-07-10 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fixed "Remote IP:" syntax on failed logins | RealRancor | 2015-07-09 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #15586 from Egari/addThemeSupportToMimeIcon | Morris Jobke | 2015-07-09 | 1 | -15/+20 |
|\ \ \ \ | |||||
| * | | | | Add theme support to mimetypeIcon through imagePath integration | stolter | 2015-07-07 | 1 | -15/+20 |
* | | | | | 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 #17530 from owncloud/proper-config-for-singleuser-command | Morris Jobke | 2015-07-09 | 3 | -4/+146 |
|\ \ \ \ \ \ | |||||
| * | | | | | | [command] single user mode - use config object & add tests | Morris Jobke | 2015-07-09 | 3 | -4/+146 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #16965 from owncloud/getUserFolder-in-IRootFolder | Morris Jobke | 2015-07-09 | 5 | -24/+42 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Add getUserFolder to IRootFolder | Morris Jobke | 2015-07-03 | 5 | -24/+42 |
* | | | | | | Merge pull request #14341 from rullzer/public_share_do_not_leak_mounttype | Morris Jobke | 2015-07-09 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Do not leak mounttype of a public share | Roeland Jago Douma | 2015-07-04 | 1 | -0/+3 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-09 | 32 | -10/+76 |
* | | | | | | | Merge pull request #17498 from owncloud/add-db-indexes | Thomas Müller | 2015-07-08 | 2 | -1/+16 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add indexes to speedup DB queries | Morris Jobke | 2015-07-08 | 2 | -1/+16 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #17472 from RealRancor/add_is_dir | Morris Jobke | 2015-07-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Add is_dir check to getAllApps() function | RealRancor | 2015-07-08 | 1 | -1/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #17330 from owncloud/fix-share-path-for-group-exceptions | Morris Jobke | 2015-07-08 | 2 | -19/+167 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | |