Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | LDAP: let proxy for multiple server access methods from Access | Arthur Schiwon | 2014-03-03 | 1 | -4/+13 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #7486 from owncloud/l10n_docstrings | Morris Jobke | 2014-03-01 | 1 | -13/+15 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix some docstrings in l10n.php | kondou | 2014-03-01 | 1 | -13/+15 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #7433 from owncloud/config_basic_auth | Thomas Tanghus | 2014-03-01 | 2 | -1/+5 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Config to disable basic_auth username chacking | kondou | 2014-02-26 | 2 | -1/+5 | |
* | | | | | | | | Merge pull request #7480 from owncloud/sabredav-1.7.11 | Vincent Petry | 2014-02-28 | 1 | -0/+0 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | Update SabreDAV to 1.7.11 | Thomas Müller | 2014-02-28 | 1 | -0/+0 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #7444 from owncloud/fix/7443 | Thomas Müller | 2014-02-28 | 2 | -23/+9 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | add BMP mimetype for BMP previews | Morris Jobke | 2014-02-27 | 1 | -0/+1 | |
| * | | | | | | | remove unused code and fix wrong variable names - some PHPDoc updated | Thomas Müller | 2014-02-26 | 1 | -23/+8 | |
* | | | | | | | | Merge pull request #7471 from owncloud/fix-css-loading | Morris Jobke | 2014-02-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | CSS is now loaded directly instead via PHP | Lukas Reschke | 2014-02-28 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #7455 from owncloud/rawlist-fileinfo | icewind1991 | 2014-02-28 | 2 | -32/+29 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Update rawlist to work with new fileinfo object | Robin Appelman | 2014-02-27 | 2 | -32/+29 | |
* | | | | | | | | | | Merge pull request #7470 from owncloud/abort-cancel | Thomas Müller | 2014-02-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | profile image: relabel technical 'Abort' to more widely used 'Cancel' | Jan-Christoph Borchardt | 2014-02-28 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #7454 from owncloud/enc_remember_fopen_mode | Björn Schießle | 2014-02-28 | 2 | -6/+29 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | remember original fopen access type in pre-proxy because sometimes they change | Bjoern Schiessle | 2014-02-27 | 2 | -6/+29 | |
* | | | | | | | | | | Fixed wrong field name | Vincent Petry | 2014-02-27 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #7439 from owncloud/unit-test-for-7430 | Thomas Müller | 2014-02-27 | 3 | -0/+33 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Also quote old column name during DB migration | Vincent Petry | 2014-02-27 | 1 | -0/+3 | |
| * | | | | | | | | | | let's name the column 'select' because this is a keyword on all platforms | Thomas Müller | 2014-02-26 | 2 | -2/+2 | |
| * | | | | | | | | | | adding test for migrations on columns using keywords | Thomas Müller | 2014-02-26 | 2 | -0/+30 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #7382 from jbtbnl/master | Raghu Nayyar | 2014-02-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Remove necessity of icon class | jbtbnl | 2014-02-24 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge pull request #7452 from owncloud/icon-delete-hover | Morris Jobke | 2014-02-27 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | icons: automatically show delete hover instead of using explicit class | Jan-Christoph Borchardt | 2014-02-27 | 1 | -1/+2 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #7446 from owncloud/etag_assert_fixes | Thomas Müller | 2014-02-27 | 6 | -34/+91 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | initialize etags of temporary storage | Jörn Friedrich Dreyer | 2014-02-27 | 1 | -0/+1 | |
| * | | | | | | | | | | use assertInternalType for typechecking | Jörn Friedrich Dreyer | 2014-02-27 | 2 | -29/+71 | |
| * | | | | | | | | | | use assertSame and assertNotSame for etag checks | Jörn Friedrich Dreyer | 2014-02-27 | 5 | -13/+27 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #7451 from owncloud/fix-jshint | Thomas Müller | 2014-02-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | rename config to camelcase | Thomas Müller | 2014-02-27 | 1 | -1/+1 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #7449 from owncloud/remove-input-border | Morris Jobke | 2014-02-27 | 1 | -5/+3 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | remove border from log in input fields, simpler and works better with themes | Jan-Christoph Borchardt | 2014-02-27 | 1 | -5/+3 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #7450 from owncloud/rename-advanced | Raghu Nayyar | 2014-02-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Installation: relabel 'Advanced' to more descriptive 'Storage & database' | Jan-Christoph Borchardt | 2014-02-27 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #7432 from owncloud/enc_cleanup_session_after_decrypt_all | Vincent Petry | 2014-02-27 | 3 | -0/+18 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | close encryption session after decryption was finished | Bjoern Schiessle | 2014-02-26 | 3 | -0/+18 | |
* | | | | | | | | Merge pull request #7421 from owncloud/password-input | Thomas Müller | 2014-02-26 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | disable autocomplete for shared link password input, fix #7419 | Jan-Christoph Borchardt | 2014-02-26 | 1 | -1/+4 | |
* | | | | | | | | | Merge pull request #7425 from owncloud/issue/7423 | Thomas Müller | 2014-02-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Translate string when an error occured while sending a forgot password mail | Joas Schilling | 2014-02-26 | 1 | -1/+1 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #3760 from IMM0rtalis/remove_logout_redirect_slash | Bart Visscher | 2014-02-26 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | - add slash if webroot is an empty string | Florian Scholz | 2013-06-25 | 1 | -1/+2 | |
| * | | | | | | | - removed slash-adding for logout-header-redirect | Florian Scholz | 2013-06-17 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #7393 from owncloud/fix_path_in_sharing_results | Björn Schießle | 2014-02-26 | 3 | -1/+84 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | fix path in sharing results if it is a file in the Shared folder | Bjoern Schiessle | 2014-02-25 | 3 | -1/+84 | |
* | | | | | | | | Merge pull request #7409 from owncloud/issue/5361 | Thomas Müller | 2014-02-26 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add owncloud version to JS scope | Joas Schilling | 2014-02-26 | 1 | -2/+4 |