summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Replace OC.Router.generate() with OC.generateUrl()Thomas Müller2014-03-0214-154/+72
|
* 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'
| * | | | 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 finished
| * | | 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 #7419
| * | | | 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 mail
| * | | | Translate string when an error occured while sending a forgot password mailJoas Schilling2014-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | Fix #7423
* | | | | Merge pull request #3760 from IMM0rtalis/remove_logout_redirect_slashBart Visscher2014-02-261-1/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | - removed slash-adding for logout-header-redirect
| * | | | - add slash if webroot is an empty stringFlorian Scholz2013-06-251-1/+2
| | | | | | | | | | | | | | | | | | | | - added comment
| * | | | - 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 folder
| * | | | 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 scope
| * | | | | Add owncloud version to JS scopeJoas Schilling2014-02-261-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fix #5361
* | | | | | Merge pull request #7416 from owncloud/share_api_7311Thomas Müller2014-02-261-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | [share api] only add "received_from" field if a share was found
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add option to change email settings in admin section
| * | | | | | Remove unused variables, add doc blocks and break linesJoas Schilling2014-02-264-16/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #7166
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-07 00:55:53 +0000