summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix mail template to use p() for colorsVincent Petry2014-03-031-4/+4
| | | | Now using p() instead of print_unescaped() for colors.
* Merge pull request #7500 from owncloud/theme-mailtemplateFrank Karlitschek2014-03-033-9/+23
|\ | | | | Enable theming of the mail template header
| * make mail notification header color themableJan-Christoph Borchardt2014-03-032-2/+16
| |
| * compress mail notification logoJan-Christoph Borchardt2014-03-031-0/+0
| |
| * mail template: remove off-white background color to better blend into mail ↵Jan-Christoph Borchardt2014-03-031-7/+7
| | | | | | | | client
* | Merge pull request #7502 from jbtbnl/masterJan-Christoph Borchardt2014-03-031-4/+4
|\ \ | | | | | | Do not override button background image
| * | Do not override button background imagejbtbnl2014-03-031-4/+4
| | |
* | | Merge pull request #7506 from ↵Vincent Petry2014-03-031-0/+0
|\ \ \ | | | | | | | | | | | | | | | | owncloud/master-update3rdpartysubmoduleforlibxmlfix Update 3rdparty submodule pointer to include libxml fixes
| * | | Update 3rdparty submodule pointer to include libxml fixesVincent Petry2014-03-031-0/+0
|/ / /
* / / Allow XML entity loader for MDB2 schema loaderVincent Petry2014-03-031-0/+2
|/ / | | | | | | Forward port of 762b0d9 from stable6 to master
* | Merge pull request #7482 from owncloud/reset-3rdparty-submoduleVincent Petry2014-03-031-0/+0
|\ \ | | | | | | Update 3rdparty submodule
| * | Update 3rdparty submoduleThomas Müller2014-02-281-0/+0
| | |
* | | remove remaining testing artefactArthur Schiwon2014-03-031-1/+1
| | |
* | | intendetion. where did the whitespaces come from?Arthur Schiwon2014-03-031-2/+2
| | |
* | | LDAP: let proxy for multiple server access methods from AccessArthur Schiwon2014-03-031-4/+13
| |/ |/|
* | Merge pull request #7486 from owncloud/l10n_docstringsMorris Jobke2014-03-011-13/+15
|\ \ | | | | | | Fix some docstrings in l10n.php
| * | Fix some docstrings in l10n.phpkondou2014-03-011-13/+15
| |/
* | Merge pull request #7433 from owncloud/config_basic_authThomas Tanghus2014-03-012-1/+5
|\ \ | |/ |/| Config to disable basic_auth username checking
| * Config to disable basic_auth username chackingkondou2014-02-262-1/+5
| | | | | | | | This can be confusing and/or annoying
* | Merge pull request #7480 from owncloud/sabredav-1.7.11Vincent Petry2014-02-281-0/+0
|\ \ | | | | | | Update SabreDAV to 1.7.11
| * | Update SabreDAV to 1.7.11Thomas Müller2014-02-281-0/+0
|/ /
* | Merge pull request #7444 from owncloud/fix/7443Thomas Müller2014-02-282-23/+9
|\ \ | | | | | | remove unused code and fix wrong variable names - some PHPDoc updated
| * | add BMP mimetype for BMP previewsMorris Jobke2014-02-271-0/+1
| | |
| * | remove unused code and fix wrong variable names - some PHPDoc updatedThomas Müller2014-02-261-23/+8
| | |
* | | Merge pull request #7471 from owncloud/fix-css-loadingMorris Jobke2014-02-281-1/+1
|\ \ \ | | | | | | | | CSS is now loaded directly instead via PHP
| * | | CSS is now loaded directly instead via PHPLukas Reschke2014-02-281-1/+1
| | | | | | | | | | | | 269f24cf9617397aaf501b27ec1af2c8e3154cf8 was not changed in setup.php which prevented loading of CSS files in some environments (e.g. my local setup) for apps.
* | | | Merge pull request #7455 from owncloud/rawlist-fileinfoicewind19912014-02-282-32/+29
|\ \ \ \ | | | | | | | | | | Update rawlist to work with new fileinfo object
| * | | | Update rawlist to work with new fileinfo objectRobin Appelman2014-02-272-32/+29
| | | | |
* | | | | Merge pull request #7470 from owncloud/abort-cancelThomas Müller2014-02-281-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | profile image: relabel technical 'Abort' to more widely used 'Cancel'
| * | | | profile image: relabel technical 'Abort' to more widely used 'Cancel'Jan-Christoph Borchardt2014-02-281-1/+1
| | | | |
* | | | | Merge pull request #7454 from owncloud/enc_remember_fopen_modeBjörn Schießle2014-02-282-6/+29
|\ \ \ \ \ | |/ / / / |/| | | | [enc] remember original fopen access type in pre-proxy
| * | | | remember original fopen access type in pre-proxy because sometimes they changeBjoern Schiessle2014-02-272-6/+29
| | | | | | | | | | | | | | | | | | | | during the fopen call, e.g. 'r' becomes 'r+' if we open an URL
* | | | | Fixed wrong field nameVincent Petry2014-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This re-fixes an issue where the unencrypted size isn't updated correctly when saving a text file in the UI multiple times. Fixes #7467
* | | | | Merge pull request #7439 from owncloud/unit-test-for-7430Thomas Müller2014-02-273-0/+33
|\ \ \ \ \ | | | | | | | | | | | | adding test for migrations on columns using keywords
| * | | | | Also quote old column name during DB migrationVincent Petry2014-02-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | This fixes alter table commands that didn't quote the old column name
| * | | | | let's name the column 'select' because this is a keyword on all platformsThomas Müller2014-02-262-2/+2
| | | | | |
| * | | | | adding test for migrations on columns using keywordsThomas Müller2014-02-262-0/+30
| | |_|_|/ | |/| | |
* | | | | Merge pull request #7382 from jbtbnl/masterRaghu Nayyar2014-02-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove necessity of icon class
| * | | | | Remove necessity of icon classjbtbnl2014-02-241-1/+1
| | | | | | | | | | | | | | | | | | Only the icon specific class is needed
* | | | | | Merge pull request #7452 from owncloud/icon-delete-hoverMorris Jobke2014-02-271-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | icons: automatically show delete hover instead of using explicit class
| * | | | | | icons: automatically show delete hover instead of using explicit classJan-Christoph Borchardt2014-02-271-1/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #7446 from owncloud/etag_assert_fixesThomas Müller2014-02-276-34/+91
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | use assertSame and assertNotSame for etag checks
| * | | | | initialize etags of temporary storageJörn Friedrich Dreyer2014-02-271-0/+1
| | | | | |
| * | | | | use assertInternalType for typecheckingJörn Friedrich Dreyer2014-02-272-29/+71
| | | | | |
| * | | | | use assertSame and assertNotSame for etag checksJörn Friedrich Dreyer2014-02-275-13/+27
| | |_|/ / | |/| | |
* | | | | Merge pull request #7451 from owncloud/fix-jshintThomas Müller2014-02-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | rename config to camelcase
| * | | | | rename config to camelcaseThomas Müller2014-02-271-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #7449 from owncloud/remove-input-borderMorris Jobke2014-02-271-5/+3
|\ \ \ \ \ | | | | | | | | | | | | remove border from log in input fields, simpler and works better with themes
| * | | | | remove border from log in input fields, simpler and works better with themesJan-Christoph Borchardt2014-02-271-5/+3
| |/ / / /
* | | | | Merge pull request #7450 from owncloud/rename-advancedRaghu Nayyar2014-02-271-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Installation: relabel 'Advanced' to more descriptive 'Storage & database'
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-03 16:39:01 +0000