summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11928 from owncloud/support-HTML-in-logoThomas Müller2014-11-051-0/+12
|\ | | | | Support HTML in logo
| * Support HTML in logo claimLukas Reschke2014-11-031-0/+12
| |
* | fix shortcuts - underline instead of camelCaseMorris Jobke2014-11-041-2/+2
| |
* | Merge pull request #11916 from owncloud/introduce-bowerMorris Jobke2014-11-042-16/+74
|\ \ | | | | | | Introduce bower dependency managment for frontend libraries
| * | ability to add bower resourcesMorris Jobke2014-11-032-16/+74
| |/ | | | | | | | | | | * add addVendorScript & addVendorStyle * refactoring of addScript and addStyle * add shortcuts vendorScript and vendorStyle
* | Merge pull request #11924 from owncloud/firstCheckIfItIsDefaultConfigMorris Jobke2014-11-031-1/+1
|\ \ | |/ |/| First check whether it is the default config before touching
| * First check whether it is the default config before touchignLukas Reschke2014-11-031-1/+1
| | | | | | | | Potentially fixes https://github.com/owncloud/core/issues/11678
* | Update Pimple to V3.0Thomas Müller2014-11-032-13/+16
|/
* fix odd behaviourMorris Jobke2014-10-311-4/+8
|
* Merge pull request #9044 from owncloud/add-missing-email-principalVincent Petry2014-10-311-0/+12
|\ | | | | adding missing email address for principal
| * adding missing email address for principallibasys2014-10-241-0/+12
| | | | | | | | | | * fix #8515 * add mail only if it exists
* | Merge pull request #11539 from owncloud/mount-setup-onceVincent Petry2014-10-311-1/+6
|\ \ | | | | | | Only mount the storages for the user once
| * | Reset the users setup after clearing mountsRobin Appelman2014-10-281-0/+1
| | |
| * | Only mount the storages for the user onceRobin Appelman2014-10-271-1/+5
| | |
* | | Merge pull request #11877 from owncloud/fix-11875-masterMorris Jobke2014-10-301-1/+1
|\ \ \ | | | | | | | | prevent PHP notice
| * | | prevent PHP noticeThomas Müller2014-10-301-1/+1
| | | |
* | | | Merge pull request #11080 from owncloud/addheader-text-2Vincent Petry2014-10-302-9/+24
|\ \ \ \ | | | | | | | | | | Fix the addHeader tag attributes text methods to not ignore the text parameter
| * | | | Fix the "addHeader($tag, $attributes, $text)" methods to not ignore the ↵Lukas Reschke2014-10-282-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $text parameter Also support closing tags with no text content given Conflicts: lib/private/template.php
* | | | | Merge pull request #11740 from owncloud/update-archive-tarThomas Müller2014-10-301-2/+0
|\ \ \ \ \ | | | | | | | | | | | | Update pear/archive_tar to 1.3.13
| * | | | | Update pear/archive_tar to 1.3.13Thomas Müller2014-10-301-2/+0
| | | | | |
* | | | | | Merge pull request #11864 from owncloud/clear-session-after-logoutLukas Reschke2014-10-301-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Clear session after logout
| * | | | | Clear session after logoutLukas Reschke2014-10-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/8420
* | | | | | Merge pull request #11858 from owncloud/fix-11064Morris Jobke2014-10-301-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Allow any outgoing XHR connections
| * | | | | Allow any outgoing XHR connectionsLukas Reschke2014-10-301-1/+2
| |/ / / / | | | | | | | | | | | | | | | Quickfix for https://github.com/owncloud/core/issues/11064
* | | | | Merge pull request #11860 from owncloud/fix-stupid-error-because-im-a-moroThomas Müller2014-10-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix stupid copy paste fail
| * | | | | Fix stupid copy paste failLukas Reschke2014-10-301-1/+1
| |/ / / / | | | | | | | | | | ...
* | | | | Merge pull request #11821 from owncloud/generic-responseMorris Jobke2014-10-301-2/+3
|\ \ \ \ \ | |/ / / / |/| | | | Add a generic data response
| * | | | add dataresponseBernhard Posselt2014-10-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix docstrings adjust copyright date another copyright date update another header update implement third headers argument, fix indention, fix docstrings fix docstrings
* | | | | Merge pull request #11409 from owncloud/watcher-reuseVincent Petry2014-10-292-22/+32
|\ \ \ \ \ | | | | | | | | | | | | Pass the cached data to the filesystem watcher
| * | | | | Better reuse of cache data for getFolderContentsRobin Appelman2014-10-241-6/+11
| | | | | |
| * | | | | Pass the cached data to the filesystem watcherRobin Appelman2014-10-242-16/+21
| | |_|_|/ | |/| | |
* | | | | Fix implementation of translation short cutThomas Müller2014-10-291-9/+2
| | | | |
* | | | | Fix language file detectionVincent Petry2014-10-291-1/+1
| | | | |
* | | | | adding console command to generate javascript translation files based on ↵Thomas Müller2014-10-291-31/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | existing php translation files read server side translations from json files
* | | | | in case a translation javascript is not found we no longer bail outThomas Müller2014-10-293-12/+5
| | | | | | | | | | | | | | | | | | | | remove translation.php
* | | | | Added OC.L10N namespace with translation functionsVincent Petry2014-10-292-2/+36
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | 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.
* | | | Merge pull request #11786 from owncloud/MakeSupportedDBsConfigurableLukas Reschke2014-10-272-23/+121
|\ \ \ \ | | | | | | | | | | Make supported DBs configurable within config.php
| * | | | code cleanup during review :+1:Thomas Müller2014-10-271-17/+17
| | | | |
| * | | | Make supported DBs configurable within config.phpLukas Reschke2014-10-272-7/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-271-0/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | | allow passing db driver options
| * | | | allow passing driver options, fixes #11718Jörn Friedrich Dreyer2014-10-271-0/+7
| | | | |
* | | | | Merge pull request #11763 from owncloud/stable-etagsRobin Appelman2014-10-271-0/+21
|\ \ \ \ \ | |/ / / / |/| | | | Generate stable etags for local files
| * | | | Generate stable etags for local filesRobin Appelman2014-10-241-0/+21
| | | | |
* | | | | Merge pull request #11708 from owncloud/fix-momentjsVincent Petry2014-10-271-1/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | Setting moment locale based on user selection
| * | | | Setting moment locale based on user selectionClark Tomlinson2014-10-231-1/+4
| | | | |
* | | | | Merge pull request #11760 from owncloud/add-type-hints-where-sensibleLukas Reschke2014-10-256-54/+27
|\ \ \ \ \ | | | | | | | | | | | | 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
| | | | | |