summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* in case a translation javascript is not found we no longer bail outThomas Müller2014-10-295-45/+5
| | | | remove translation.php
* Added OC.L10N namespace with translation functionsVincent Petry2014-10-2917-130/+343
| | | | | | | | | | | Added addTranslations and fixed de.js file Fixed de.js to use OC.L10N.register() and use to correct expected format. Added JS unit tests for OC.L10N class Include translations JS script for all apps
* l10n.pl now generates js files as wellThomas Müller2014-10-292-5/+10
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-10-2921-26/+76
|
* Merge pull request #11738 from owncloud/update-patchwork-utf8Morris Jobke2014-10-282-2/+0
|\ | | | | Use composer autoloader to load Patchwork
| * Use composer autoloader to load PatchworkThomas Müller2014-10-282-2/+0
|/
* Merge pull request #11805 from owncloud/AdamWill-issue9643Lukas Reschke2014-10-283-59/+18
|\ | | | | use Composer autoloader not OC for non-Composer 3rdparty (#9643)
| * use Composer autoloader not OC for non-Composer 3rdparty (#9643)Adam Williamson2014-10-283-59/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Composer's autoloader is rather better than the OwnCloud autoloader's handling of non-OC classes. Plus we can rely on upstream Composer to maintain it and not worry about it ourselves. With this change, we drop the bits of OwnCloud's autoloader that handled non-OC classes, and register the classes that were being handled by that code with Composer's autoloader instead. As these dependencies are converted to actually being managed by Composer, the explicit registrations can be dropped as they won't be needed any more. Since OwnCloud's autoloader isn't going to handle non-OC classes any more, we no longer need to test to make sure it does it right. drop unneeded registerPrefix() and registerClass() from autoloader Now we're not handling anything but OC's own classes, these are unnecessary. error out if composer autoloader is not found (thanks bantu) We're never going to be able to work without the autoloader, if it's not there we should just throw our hands up and surrender.
* | Merge pull request #11600 from owncloud/refactor-appsettings-to-app-frameworkLukas Reschke2014-10-285-100/+143
|\ \ | |/ |/| Migrate new app settings to AppFramework
| * Migrate new app settings to AppFrameworkLukas Reschke2014-10-155-100/+143
| | | | | | | | Let's migrate those two new files.
* | Merge pull request #11791 from owncloud/webdav-getquotainfo-503-handlingMorris Jobke2014-10-281-7/+11
|\ \ | | | | | | Properly catch 503 storage not available in getQuotaInfo
| * | Properly catch 503 storage not available in getQuotaInfoVincent Petry2014-10-271-7/+11
| | | | | | | | | | | | | | | | | | | | | When doing a PROPFIND on the root and one of the mount points is not available, the returned quota attributes will now be zero. This fix prevents the expected exception to make the whole call fail.
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-2821-87/+123
| | |
* | | Merge pull request #11799 from owncloud/no-stable-etags-on-windowsLukas Reschke2014-10-271-0/+8
|\ \ \ | | | | | | | | On Windows platform we have no stable etag generation - yet
| * | | On Windows platform we have no stable etag generation - yetThomas Müller2014-10-271-0/+8
| | | |
* | | | Merge pull request #11786 from owncloud/MakeSupportedDBsConfigurableLukas Reschke2014-10-276-58/+271
|\ \ \ \ | |/ / / |/| | | Make supported DBs configurable within config.php
| * | | code cleanup during review :+1:Thomas Müller2014-10-272-25/+25
| | | |
| * | | Make supported DBs configurable within config.phpLukas Reschke2014-10-276-35/+248
| | | | | | | | | | | | | | | | | | | | | | | | This commit will make the supported DBs for installation configurable within config.php. By default the following databases are tested: "sqlite", "mysql", "pgsql". The reason behind this is that there might be instances where we want to prevent SQLite to be used by mistake. To test this play around with the new configuration parameter "supportedDatabases".
* | | | Merge pull request #11783 from owncloud/allow_passing_driver_optionsMorris Jobke2014-10-272-0/+14
|\ \ \ \ | | | | | | | | | | allow passing db driver options
| * | | | add driver options to config samplesJörn Friedrich Dreyer2014-10-271-0/+7
| | | | |
| * | | | allow passing driver options, fixes #11718Jörn Friedrich Dreyer2014-10-271-0/+7
| | | | |
* | | | | Merge pull request #11763 from owncloud/stable-etagsRobin Appelman2014-10-272-21/+59
|\ \ \ \ \ | | | | | | | | | | | | Generate stable etags for local files
| * | | | | Generate stable etags for local filesRobin Appelman2014-10-242-21/+59
| | | | | |
* | | | | | Merge pull request #11787 from owncloud/fix-php-docsMorris Jobke2014-10-271-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix PHPDoc
| * | | | | Fix PHPDocLukas Reschke2014-10-271-1/+1
| | |/ / / | |/| | | | | | | | | | | | | Stop my IDE and Scrutinizer from complaining.
* | | | | Merge pull request #11708 from owncloud/fix-momentjsVincent Petry2014-10-275-19/+28
|\ \ \ \ \ | |_|_|/ / |/| | | | Setting moment locale based on user selection
| * | | | Setting moment locale based on user selectionClark Tomlinson2014-10-235-19/+28
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-2718-16/+98
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-2624-37/+117
| | | | |
* | | | | Merge pull request #11760 from owncloud/add-type-hints-where-sensibleLukas Reschke2014-10-2510-73/+66
|\ \ \ \ \ | | | | | | | | | | | | Add type hinting to functions
| * | | | | drop unneeded hintMorris Jobke2014-10-251-1/+0
| | | | | |
| * | | | | Fix PHPDoc and remove explicit type hintLukas Reschke2014-10-241-2/+2
| | | | | |
| * | | | | Add type hinting to functionsLukas Reschke2014-10-2410-72/+66
| | | | | | | | | | | | | | | | | | | | | | | | It's only reasonable to have proper type hinting here which might even help us to catch bugs.
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-2524-38/+195
| | | | | |
* | | | | | Merge pull request #11767 from danbartram/add_db_rollbackMorris Jobke2014-10-242-0/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add missing DB rollback functionality
| * | | | | | Add missing DB rollback functionalityDan Bartram2014-10-242-0/+14
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #11709 from owncloud/temp-handlingThomas Müller2014-10-248-120/+354
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Cleanup handling of temporary files
| * | | | | Use the TempManager to handle temporary filesRobin Appelman2014-10-243-120/+7
| | | | | |
| * | | | | Add \OC\TempManager to handle creating and cleaning temporary filesRobin Appelman2014-10-245-0/+347
| | | | | |
* | | | | | Merge pull request #11735 from owncloud/mssql-migrations-masterClark Tomlinson2014-10-243-8/+27
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | disable database migration unit tests for MSSQL
| * | | | | disable database migration unit tests for MSSQLThomas Müller2014-10-233-8/+27
| | | | | |
* | | | | | Merge pull request #11752 from owncloud/use-function-outside-of-loopLukas Reschke2014-10-248-13/+21
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Use function outside of loop
| * | | | | Use function outside of loopLukas Reschke2014-10-248-13/+21
|/ / / / / | | | | | | | | | | | | | | | Otherwise the function is executed n times which is a lot of overhead
* | | | | Merge pull request #11758 from owncloud/fix-permissionsLukas Reschke2014-10-2422-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | | Make files non executable
| * | | | Make files non executableLukas Reschke2014-10-2422-0/+0
| | | | | | | | | | | | | | | | | | | | There is not much sense in having these files marked executable, we should avoid that.
* | | | | Merge pull request #11754 from owncloud/fix-division-nullLukas Reschke2014-10-241-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Prevent division by zero
| * | | | Prevent division by zeroLukas Reschke2014-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | Potentially fixes https://github.com/owncloud/core/issues/11742
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-2481-124/+130
| | | | |
* | | | | Merge pull request #7749 from owncloud/load_avatar_header_via_phpMorris Jobke2014-10-245-14/+26
|\ \ \ \ \ | | | | | | | | | | | | Load avatar in header via PHP
| * | | | | add avatardiv-shown class to bring back mobile styleMorris Jobke2014-10-231-1/+1
| | | | | |