aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Missing memcache should not cause occ hard-failRobin McCorkell2015-07-152-12/+41
| | | | Warning is now printed to logs, but occ and cron will still work.
* Merge pull request #17639 from owncloud/remove-file-target-indexMorris Jobke2015-07-152-8/+1
|\ | | | | Remove index on file_target of share table
| * Remove index on file_target of share tableMorris Jobke2015-07-142-8/+1
| | | | | | | | | | | | * causes issues on InnoDB because it exceeds the maximal key length of an index which is 767 (3-byte charset * varchar(512) = 1536) * fixes #17619
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-152-0/+14
|/
* Merge pull request #17623 from owncloud/fed-throwcorrectexceptionMorris Jobke2015-07-141-1/+1
|\ | | | | Throw storage not available on guzzle error
| * Throw storage not available on guzzle errorVincent Petry2015-07-131-1/+1
| | | | | | | | | | | | If the remote server is in maintenance mode, we must throw storage not available exception instead of not found which might auto-remove the share.
* | Merge pull request #17606 from owncloud/appstore-timeoutMorris Jobke2015-07-141-2/+2
|\ \ | | | | | | Handle returned null value in app level code
| * | Handle returned null value in app level codeMorris Jobke2015-07-131-2/+2
| | | | | | | | | | | | | | | | | | * getApplication on OCSClient can also return null this is now handled properly * fixes #17587
* | | Merge pull request #17620 from owncloud/s2s-hasupdated-catch405Morris Jobke2015-07-141-1/+5
|\ \ \ | | | | | | | | Throw StorageNotAvailable if propfind on root failed
| * | | Throw StorageNotAvailable if propfind on root failedVincent Petry2015-07-131-1/+5
| | |/ | |/| | | | | | | | | | If PROPFIND fails with 404 or 405 on the remote share root, it means the storage is not available. Throw StorageNotAvailable is such case.
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-146-0/+6
| | |
* | | Merge pull request #17565 from owncloud/fix/remote_shareRoeland Douma2015-07-131-1/+1
|\ \ \ | |/ / |/| | allow remote shares for users with email as usernames
| * | allow remote shares for users with email as usernamesFelix Böhm2015-07-101-1/+1
| | |
* | | Merge pull request #17599 from owncloud/fix-joinpaths-trailingslashMorris Jobke2015-07-132-4/+18
|\ \ \ | | | | | | | | Fix OC.joinPaths with empty arguments
| * | | Fix OC.joinPaths with empty argumentsVincent Petry2015-07-132-4/+18
| | |/ | |/| | | | | | | | | | When empty arguments are given, the leading or trailing slash was not detected properly.
* | | Merge pull request #17605 from owncloud/pwebdav-stripmountinfoVincent Petry2015-07-133-6/+45
|\ \ \ | | | | | | | | Strip public webdav info about sharing and mount points
| * | | Strip public webdav info about sharing and mount pointsVincent Petry2015-07-133-6/+45
| |/ / | | | | | | | | | | | | Remove information about whether a file is an incoming share or mount point when requested over public webdav.
* | | Merge pull request #17609 from owncloud/core-js-helpersforcurrenturlMorris Jobke2015-07-131-0/+45
|\ \ \ | |/ / |/| | Add helper functions for host, port and webroot
| * | Add helper functions for host, port and webrootVincent Petry2015-07-131-0/+45
|/ / | | | | | | | | | | These should be used in the future instead of location.*. It will make it possible to stub these methods for writing unit tests and simulating different URL schemes.
* | Merge pull request #17481 from rullzer/mimetype-listMorris Jobke2015-07-134-202/+183
|\ \ | | | | | | Move mimetypes.list.php to config/mimetypemapping.dist.json
| * | Move to OC::$configDifRoeland Jago Douma2015-07-101-3/+3
| | |
| * | Move mimetypemapping.json to mimetypemapping.dist.jsonRoeland Jago Douma2015-07-082-2/+12
| | | | | | | | | | | | | | | | | | This allows users to create their own mapping file to extend our current mappings. This makes sure that custom mappings are not lost on OC upgrades.
| * | Move mimetypes.list.php to config/mimetypemapping.jsonRoeland Jago Douma2015-07-084-202/+173
| | | | | | | | | | | | | | | | | | | | | | | | This allows users to add new mimetypemappings (extention -> mimetype) themself. And not have to wait until a new release for updated mimetypes. Fixes: #15384
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-138-4/+26
| | |
* | | [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
|\ \ \ | | | | | | | | Add OC.joinPaths for convenient path joining
| * | | 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 libs
| * | | | Update JS unit test libsVincent Petry2015-07-104-4311/+5971
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update sinon to 1.15.4. Update karma-jasmine to 0.3.0 Update jasmine to 2.3.4 This brings a bunch of new useful functions for unit testing.
* | | | | Merge pull request #17509 from rullzer/mimetype-alias-distRoeland Douma2015-07-103-5/+19
|\ \ \ \ \ | |_|/ / / |/| | | | Move mimetypealiases.json to mimetypealiases.dist.json
| * | | | 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
|\ \ \ \ | |/ / / |/| | | Move away from OCA.files.getMimeIcon and use OC.MimeType.getIconUrl
| * | | Fix unit testsRoeland Jago Douma2015-07-093-4/+13
| | | |
| * | | MimeTypes now also supports httpd/unix-directoryRoeland Jago Douma2015-07-092-59/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we both use dir and httpd/unix-directory in OC they should map to the same icon. Fixes #17527
| * | | 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.php
| * | | | Fix the config.php owner check for console.phpPhilippe Le Brouster2015-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The config directory must be taken from OC::$configDir Minor fix - Remove uneeded slash in the configdir path.
* | | | | Merge pull request #17517 from RealRancor/fix_failed_login_syntaxMorris Jobke2015-07-101-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fixed "Remote IP:" syntax on failed logins
| * | | | 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 integration
| * | | | 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 database
| * | | | | 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 tests
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-12 17:17:02 +0000