Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #11928 from owncloud/support-HTML-in-logo | Thomas Müller | 2014-11-05 | 1 | -0/+12 |
|\ | | | | | Support HTML in logo | ||||
| * | Support HTML in logo claim | Lukas Reschke | 2014-11-03 | 1 | -0/+12 |
| | | |||||
* | | fix shortcuts - underline instead of camelCase | Morris Jobke | 2014-11-04 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #11916 from owncloud/introduce-bower | Morris Jobke | 2014-11-04 | 2 | -16/+74 |
|\ \ | | | | | | | Introduce bower dependency managment for frontend libraries | ||||
| * | | ability to add bower resources | Morris Jobke | 2014-11-03 | 2 | -16/+74 |
| |/ | | | | | | | | | | | * add addVendorScript & addVendorStyle * refactoring of addScript and addStyle * add shortcuts vendorScript and vendorStyle | ||||
* | | Merge pull request #11924 from owncloud/firstCheckIfItIsDefaultConfig | Morris Jobke | 2014-11-03 | 1 | -1/+1 |
|\ \ | |/ |/| | First check whether it is the default config before touching | ||||
| * | First check whether it is the default config before touchign | Lukas Reschke | 2014-11-03 | 1 | -1/+1 |
| | | | | | | | | Potentially fixes https://github.com/owncloud/core/issues/11678 | ||||
* | | Update Pimple to V3.0 | Thomas Müller | 2014-11-03 | 2 | -13/+16 |
|/ | |||||
* | fix odd behaviour | Morris Jobke | 2014-10-31 | 1 | -4/+8 |
| | |||||
* | Merge pull request #9044 from owncloud/add-missing-email-principal | Vincent Petry | 2014-10-31 | 1 | -0/+12 |
|\ | | | | | adding missing email address for principal | ||||
| * | adding missing email address for principal | libasys | 2014-10-24 | 1 | -0/+12 |
| | | | | | | | | | | * fix #8515 * add mail only if it exists | ||||
* | | Merge pull request #11539 from owncloud/mount-setup-once | Vincent Petry | 2014-10-31 | 1 | -1/+6 |
|\ \ | | | | | | | Only mount the storages for the user once | ||||
| * | | Reset the users setup after clearing mounts | Robin Appelman | 2014-10-28 | 1 | -0/+1 |
| | | | |||||
| * | | Only mount the storages for the user once | Robin Appelman | 2014-10-27 | 1 | -1/+5 |
| | | | |||||
* | | | Merge pull request #11877 from owncloud/fix-11875-master | Morris Jobke | 2014-10-30 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | prevent PHP notice | ||||
| * | | | prevent PHP notice | Thomas Müller | 2014-10-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #11080 from owncloud/addheader-text-2 | Vincent Petry | 2014-10-30 | 2 | -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 Reschke | 2014-10-28 | 2 | -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-tar | Thomas Müller | 2014-10-30 | 1 | -2/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Update pear/archive_tar to 1.3.13 | ||||
| * | | | | | Update pear/archive_tar to 1.3.13 | Thomas Müller | 2014-10-30 | 1 | -2/+0 |
| | | | | | | |||||
* | | | | | | Merge pull request #11864 from owncloud/clear-session-after-logout | Lukas Reschke | 2014-10-30 | 1 | -0/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Clear session after logout | ||||
| * | | | | | Clear session after logout | Lukas Reschke | 2014-10-30 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/8420 | ||||
* | | | | | | Merge pull request #11858 from owncloud/fix-11064 | Morris Jobke | 2014-10-30 | 1 | -1/+2 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Allow any outgoing XHR connections | ||||
| * | | | | | Allow any outgoing XHR connections | Lukas Reschke | 2014-10-30 | 1 | -1/+2 |
| |/ / / / | | | | | | | | | | | | | | | | Quickfix for https://github.com/owncloud/core/issues/11064 | ||||
* | | | | | Merge pull request #11860 from owncloud/fix-stupid-error-because-im-a-moro | Thomas Müller | 2014-10-30 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix stupid copy paste fail | ||||
| * | | | | | Fix stupid copy paste fail | Lukas Reschke | 2014-10-30 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | ... | ||||
* | | | | | Merge pull request #11821 from owncloud/generic-response | Morris Jobke | 2014-10-30 | 1 | -2/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | Add a generic data response | ||||
| * | | | | add dataresponse | Bernhard Posselt | 2014-10-29 | 1 | -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-reuse | Vincent Petry | 2014-10-29 | 2 | -22/+32 |
|\ \ \ \ \ | | | | | | | | | | | | | Pass the cached data to the filesystem watcher | ||||
| * | | | | | Better reuse of cache data for getFolderContents | Robin Appelman | 2014-10-24 | 1 | -6/+11 |
| | | | | | | |||||
| * | | | | | Pass the cached data to the filesystem watcher | Robin Appelman | 2014-10-24 | 2 | -16/+21 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Fix implementation of translation short cut | Thomas Müller | 2014-10-29 | 1 | -9/+2 |
| | | | | | |||||
* | | | | | Fix language file detection | Vincent Petry | 2014-10-29 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | adding console command to generate javascript translation files based on ↵ | Thomas Müller | 2014-10-29 | 1 | -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 out | Thomas Müller | 2014-10-29 | 3 | -12/+5 |
| | | | | | | | | | | | | | | | | | | | | remove translation.php | ||||
* | | | | | Added OC.L10N namespace with translation functions | Vincent Petry | 2014-10-29 | 2 | -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-handling | Morris Jobke | 2014-10-28 | 1 | -7/+11 |
|\ \ \ \ | |_|/ / |/| | | | Properly catch 503 storage not available in getQuotaInfo | ||||
| * | | | Properly catch 503 storage not available in getQuotaInfo | Vincent Petry | 2014-10-27 | 1 | -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/MakeSupportedDBsConfigurable | Lukas Reschke | 2014-10-27 | 2 | -23/+121 |
|\ \ \ \ | | | | | | | | | | | Make supported DBs configurable within config.php | ||||
| * | | | | code cleanup during review :+1: | Thomas Müller | 2014-10-27 | 1 | -17/+17 |
| | | | | | |||||
| * | | | | Make supported DBs configurable within config.php | Lukas Reschke | 2014-10-27 | 2 | -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_options | Morris Jobke | 2014-10-27 | 1 | -0/+7 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | allow passing db driver options | ||||
| * | | | | allow passing driver options, fixes #11718 | Jörn Friedrich Dreyer | 2014-10-27 | 1 | -0/+7 |
| | | | | | |||||
* | | | | | Merge pull request #11763 from owncloud/stable-etags | Robin Appelman | 2014-10-27 | 1 | -0/+21 |
|\ \ \ \ \ | |/ / / / |/| | | | | Generate stable etags for local files | ||||
| * | | | | Generate stable etags for local files | Robin Appelman | 2014-10-24 | 1 | -0/+21 |
| | | | | | |||||
* | | | | | Merge pull request #11708 from owncloud/fix-momentjs | Vincent Petry | 2014-10-27 | 1 | -1/+4 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Setting moment locale based on user selection | ||||
| * | | | | Setting moment locale based on user selection | Clark Tomlinson | 2014-10-23 | 1 | -1/+4 |
| | | | | | |||||
* | | | | | Merge pull request #11760 from owncloud/add-type-hints-where-sensible | Lukas Reschke | 2014-10-25 | 6 | -54/+27 |
|\ \ \ \ \ | | | | | | | | | | | | | Add type hinting to functions | ||||
| * | | | | | drop unneeded hint | Morris Jobke | 2014-10-25 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Fix PHPDoc and remove explicit type hint | Lukas Reschke | 2014-10-24 | 1 | -2/+2 |
| | | | | | |