summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-126-0/+8
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-1114-2/+50
* Merge pull request #17559 from owncloud/js-joinpathsutilityMorris Jobke2015-07-102-0/+83
|\
| * More tests for joinPathsVincent Petry2015-07-101-0/+3
| * Add OC.joinPaths for convenient path joiningVincent Petry2015-07-102-0/+80
* | Merge pull request #17555 from owncloud/update-test-librariesVincent Petry2015-07-104-4311/+5971
|\ \
| * | Update JS unit test libsVincent Petry2015-07-104-4311/+5971
* | | Merge pull request #17509 from rullzer/mimetype-alias-distRoeland Douma2015-07-103-5/+19
|\ \ \ | |_|/ |/| |
| * | Move mimetypealiases.json to mimetypealiases.dist.jsonRoeland Jago Douma2015-07-103-5/+19
|/ /
* | Merge pull request #17483 from rullzer/migrate-mimetype-jsVincent Petry2015-07-109-135/+101
|\ \ | |/ |/|
| * Fix unit testsRoeland Jago Douma2015-07-093-4/+13
| * MimeTypes now also supports httpd/unix-directoryRoeland Jago Douma2015-07-092-59/+61
| * 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-092-30/+27
| * Make getMimeIcon use OC.MimeType.getIconUrlRoeland Jago Douma2015-07-091-12/+7
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-1028-42/+78
* | Merge pull request #17546 from owncloud/forwardport-16917Morris Jobke2015-07-101-1/+1
|\ \
| * | Fix the config.php owner check for console.phpPhilippe Le Brouster2015-07-091-1/+1
* | | Merge pull request #17517 from RealRancor/fix_failed_login_syntaxMorris Jobke2015-07-101-1/+1
|\ \ \ | |/ / |/| |
| * | Fixed "Remote IP:" syntax on failed loginsRealRancor2015-07-091-1/+1
| |/
* | Merge pull request #15586 from Egari/addThemeSupportToMimeIconMorris Jobke2015-07-091-15/+20
|\ \
| * | Add theme support to mimetypeIcon through imagePath integrationstolter2015-07-071-15/+20
* | | 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 #17530 from owncloud/proper-config-for-singleuser-commandMorris Jobke2015-07-093-4/+146
|\ \ \ \
| * | | | [command] single user mode - use config object & add testsMorris Jobke2015-07-093-4/+146
|/ / / /
* | | | Merge pull request #16965 from owncloud/getUserFolder-in-IRootFolderMorris Jobke2015-07-095-24/+42
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add getUserFolder to IRootFolderMorris Jobke2015-07-035-24/+42
* | | | 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-0932-10/+76
* | | | | Merge pull request #17498 from owncloud/add-db-indexesThomas Müller2015-07-082-1/+16
|\ \ \ \ \
| * | | | | Add indexes to speedup DB queriesMorris Jobke2015-07-082-1/+16
| | |_|/ / | |/| | |
* | | | | Merge pull request #17472 from RealRancor/add_is_dirMorris Jobke2015-07-081-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add is_dir check to getAllApps() functionRealRancor2015-07-081-1/+1
* | | | | Merge pull request #17330 from owncloud/fix-share-path-for-group-exceptionsMorris Jobke2015-07-082-19/+167
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make sure the owner always has the right pathJoas Schilling2015-07-071-3/+6
| * | | | 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
| * | | | Fix the path for users which have an exception for a group shareJoas Schilling2015-07-021-7/+22
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-0880-68/+20
* | | | | Merge pull request #17432 from owncloud/enhance-config-sampleMorris Jobke2015-07-071-16/+26
|\ \ \ \ \
| * | | | | [config sample] improve RST markup and wordingMorris Jobke2015-07-071-16/+26
* | | | | | Merge pull request #17439 from owncloud/update-3rdpartytextMorris Jobke2015-07-071-1/+1
|\ \ \ \ \ \
| * | | | | | Remove 3rd party text for disabled apps on updateVincent Petry2015-07-071-1/+1
| |/ / / / /
* | | | | | Merge pull request #17436 from owncloud/update-keeppageifwarningsMorris Jobke2015-07-071-8/+20
|\ \ \ \ \ \
| * | | | | | Keep update page when there are warningsVincent Petry2015-07-071-8/+20
| |/ / / / /
* | | | | | Merge pull request #15579 from owncloud/autotest-docker-postgresThomas Müller2015-07-071-1/+20
|\ \ \ \ \ \