summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove duplicate rowThomas Müller2014-03-031-1/+0
* add .scrutinizer.ymlThomas Müller2014-03-031-0/+24
* 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.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 chackingkondou2014-02-262-1/+5
* | Merge pull request #7480 from owncloud/sabredav-1.7.11Vincent Petry2014-02-281-0/+0
|\ \
| * | 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
|\ \
| * | 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 PHPLukas Reschke2014-02-281-1/+1
* | | | Merge pull request #7455 from owncloud/rawlist-fileinfoicewind19912014-02-282-32/+29
|\ \ \ \
| * | | | 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'Jan-Christoph Borchardt2014-02-281-1/+1
* | | | | Merge pull request #7454 from owncloud/enc_remember_fopen_modeBjörn Schießle2014-02-282-6/+29
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remember original fopen access type in pre-proxy because sometimes they changeBjoern Schiessle2014-02-272-6/+29
* | | | | Fixed wrong field nameVincent Petry2014-02-271-1/+1
* | | | | Merge pull request #7439 from owncloud/unit-test-for-7430Thomas Müller2014-02-273-0/+33
|\ \ \ \ \
| * | | | | Also quote old column name during DB migrationVincent Petry2014-02-271-0/+3
| * | | | | 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 classjbtbnl2014-02-241-1/+1
* | | | | | Merge pull request #7452 from owncloud/icon-delete-hoverMorris Jobke2014-02-271-1/+2
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | 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 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 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'Jan-Christoph Borchardt2014-02-271-1/+1
|/ / / /
* | | | Merge pull request #7432 from owncloud/enc_cleanup_session_after_decrypt_allVincent Petry2014-02-273-0/+18
|\ \ \ \ | |_|_|/ |/| | |
| * | | close encryption session after decryption was finishedBjoern Schiessle2014-02-263-0/+18
* | | | Merge pull request #7421 from owncloud/password-inputThomas Müller2014-02-261-1/+4
|\ \ \ \
| * | | | disable autocomplete for shared link password input, fix #7419Jan-Christoph Borchardt2014-02-261-1/+4
* | | | | Merge pull request #7425 from owncloud/issue/7423Thomas Müller2014-02-261-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Translate string when an error occured while sending a forgot password mailJoas Schilling2014-02-261-1/+1
* | | | | Merge pull request #3760 from IMM0rtalis/remove_logout_redirect_slashBart Visscher2014-02-261-1/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | - add slash if webroot is an empty stringFlorian Scholz2013-06-251-1/+2
| * | | | - removed slash-adding for logout-header-redirectFlorian Scholz2013-06-171-1/+1