summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Typo + use regular assignmentLukas Reschke2014-02-281-2/+2
* Remove .htaccess creation codeLukas Reschke2014-02-284-49/+15
* 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
* | | | | Merge pull request #7393 from owncloud/fix_path_in_sharing_resultsBjörn Schießle2014-02-263-1/+84
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix path in sharing results if it is a file in the Shared folderBjoern Schiessle2014-02-253-1/+84
* | | | | Merge pull request #7409 from owncloud/issue/5361Thomas Müller2014-02-261-2/+4
|\ \ \ \ \
| * | | | | Add owncloud version to JS scopeJoas Schilling2014-02-261-2/+4
* | | | | | Merge pull request #7416 from owncloud/share_api_7311Thomas Müller2014-02-261-6/+6
|\ \ \ \ \ \
| * | | | | | only add "received_from" if a share was foundBjoern Schiessle2014-02-261-6/+6
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #7174 from owncloud/issue/7166Jan-Christoph Borchardt2014-02-269-44/+279
|\ \ \ \ \ \
| * | | | | | Remove unused variables, add doc blocks and break linesJoas Schilling2014-02-264-16/+37
| * | | | | | Hide SMTP options based on selected send modeJoas Schilling2014-02-262-18/+36
| * | | | | | Remove duplicated definition and move OC.msg to js/js.jsJoas Schilling2014-02-194-66/+28
| * | | | | | Add option to change email settings in admin sectionJoas Schilling2014-02-186-0/+234
* | | | | | | Merge pull request #7406 from owncloud/settings-apps.js-styleJan-Christoph Borchardt2014-02-261-5/+17
|\ \ \ \ \ \ \
| * | | | | | | coding style fixes: cut long lines, whitespaceJan-Christoph Borchardt2014-02-261-5/+17
* | | | | | | | Merge pull request #7410 from owncloud/scrutinizer_fix_kondouMorris Jobke2014-02-261-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix scrutinizer issue in settings/js/apps.jskondou2014-02-261-2/+2
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #7414 from owncloud/fix-3rdparty-submoduleThomas Müller2014-02-261-0/+0
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Update 3rdparty submoduleThomas Müller2014-02-261-0/+0
|/ / / / / / /
* | | | | | | Merge pull request #7279 from owncloud/folderid-reuseicewind19912014-02-262-2/+13
|\ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-15 09:10:52 +0000