summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-10-30366-780/+1561
|
* fix style of generated documentationMorris Jobke2014-10-291-1/+2
|
* Merge pull request #11409 from owncloud/watcher-reuseVincent Petry2014-10-295-43/+53
|\ | | | | Pass the cached data to the filesystem watcher
| * Better reuse of cache data for getFolderContentsRobin Appelman2014-10-242-8/+14
| |
| * Fix shared cache getFolderContentsRobin Appelman2014-10-241-17/+14
| |
| * also update shared watcherRobin Appelman2014-10-241-2/+4
| |
| * Pass the cached data to the filesystem watcherRobin Appelman2014-10-242-16/+21
| |
* | Merge pull request #11835 from owncloud/enc-fixmovingsharekeystofolderMorris Jobke2014-10-293-35/+42
|\ \ | | | | | | Fix moving share keys as non-owner to subdir
| * | Added encryption test when moving file as non-ownerVincent Petry2014-10-291-2/+15
| | |
| * | Fix warning with unset extension checkVincent Petry2014-10-291-1/+1
| | |
| * | Fix moving share keys as non-owner to subdirVincent Petry2014-10-291-32/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix gathers the share keys BEFORE a file is moved to make sure that findShareKeys() is able to find all relevant keys when the file still exists. After the move/copy operation the keys are moved/copied to the target dir. Also: refactored preRename and preCopy into a single function to avoid duplicate code.
* | | Merge pull request #11831 from owncloud/make-search-non-blockingLukas Reschke2014-10-291-0/+1
|\ \ \ | | | | | | | | Close session for search
| * | | Close session for searchLukas Reschke2014-10-291-0/+1
| | | | | | | | | | | | | | | | Make search non-blocking.
* | | | just add merge commit of 3rdparty repoMorris Jobke2014-10-291-0/+0
| | | |
* | | | Merge pull request #11638 from owncloud/oc8-translationsThomas Müller2014-10-293017-48185/+95745
|\ \ \ \ | | | | | | | | | | [OC8] Load javascript translations using standard web technologies
| * | | | Fix implementation of translation short cutThomas Müller2014-10-291-9/+2
| | | | |
| * | | | Adding translations for settingsThomas Müller2014-10-291-1/+3
| | | | |
| * | | | Fix language file detectionVincent Petry2014-10-291-1/+1
| | | | |
| * | | | update all translation files to js and jsonThomas Müller2014-10-292983-47944/+95191
| | | | |
| * | | | adding console command to generate javascript translation files based on ↵Thomas Müller2014-10-2911-56/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | existing php translation files read server side translations from json files
| * | | | Include core translationsVincent Petry2014-10-293-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved search result type translations to search.js Load JS translations earlier Translations need to be loaded earlier to make sure that some JS files like search.js get access to translations at this time. This requires the template initialization to be moved to after session initialization, because only after the session we have access to the current language.
| * | | | 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
| |/ / /
* | | | Merge pull request #11689 from owncloud/doctrine-2.5Thomas Müller2014-10-292-2/+0
|\ \ \ \ | |/ / / |/| | | Update doctrine/dbal to 2.5
| * | | Update doctrine/dbal to 2.5Thomas Müller2014-10-282-2/+0
| | | |
* | | | [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
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-17 15:27:40 +0000