Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #19795 from owncloud/fix-language-level-compat | Thomas Müller | 2015-10-15 | 1 | -2/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove arbitrary expression in empty | Lukas Reschke | 2015-10-14 | 1 | -2/+3 | |
* | | | | | | | Merge pull request #19802 from RealRancor/fix_rewrites | Thomas Müller | 2015-10-15 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Remove legacy non-working rewrites in .htaccess | RealRancor | 2015-10-15 | 1 | -2/+0 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #19797 from owncloud/specify-php-5-4 | Thomas Müller | 2015-10-15 | 1 | -0/+10 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Specify PHP 5.4 as version for scrutinizer | Lukas Reschke | 2015-10-14 | 1 | -0/+10 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #19799 from owncloud/issue-19793-php54-ldap-comp-issue | Lukas Reschke | 2015-10-15 | 7 | -28/+25 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix doc blocks of LDAP classes | Joas Schilling | 2015-10-15 | 7 | -28/+25 | |
|/ / / / / / | ||||||
* / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-15 | 18 | -14/+124 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #19787 from owncloud/kill-arrayparser | Thomas Müller | 2015-10-14 | 1 | -238/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove ArrayParser because it is unused | Morris Jobke | 2015-10-14 | 1 | -238/+0 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #19731 from owncloud/update-list-of-deprecated-methods | Thomas Müller | 2015-10-14 | 4 | -9/+29 | |
|\ \ \ \ \ | ||||||
| * | | | | | The constant is now deprecated | Joas Schilling | 2015-10-14 | 2 | -2/+2 | |
| * | | | | | update deprecation message | Morris Jobke | 2015-10-14 | 1 | -1/+1 | |
| * | | | | | Update list of deprecated methods | Joas Schilling | 2015-10-14 | 2 | -7/+27 | |
* | | | | | | Merge pull request #19760 from owncloud/adding_occ_upgrade_text_note | Thomas Müller | 2015-10-14 | 1 | -0/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | adding occ upgrade text note | Martin | 2015-10-14 | 1 | -0/+1 | |
* | | | | | | | Merge pull request #19764 from owncloud/issue-19759-app-check-code-issue | Thomas Müller | 2015-10-14 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Variables don't have a class, so we can't use toString() on it | Joas Schilling | 2015-10-14 | 1 | -2/+2 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #19625 from owncloud/passwordchange-hidestrengthify | Thomas Müller | 2015-10-14 | 2 | -2/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Properly hide strengthify after password change | Vincent Petry | 2015-10-07 | 2 | -2/+2 | |
* | | | | | | | Merge pull request #19627 from owncloud/users-deletebeforecreate | Thomas Müller | 2015-10-14 | 2 | -31/+43 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Delete last undoable user before user creation | Vincent Petry | 2015-10-07 | 2 | -31/+43 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #19630 from owncloud/fix-ie-pain | Thomas Müller | 2015-10-14 | 3 | -1/+18 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [IE8] Fix button background color | Vincent Petry | 2015-10-07 | 1 | -0/+6 | |
| * | | | | | | | [IE8] Fix "new" button width | Vincent Petry | 2015-10-07 | 1 | -0/+5 | |
| * | | | | | | | [IE9] Set explicit height to file actions menu icon | Vincent Petry | 2015-10-07 | 1 | -0/+1 | |
| * | | | | | | | [IE] Add border to dropdown menus | Vincent Petry | 2015-10-07 | 1 | -1/+6 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #19631 from owncloud/share-emailsenterror | Thomas Müller | 2015-10-14 | 4 | -13/+185 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add unit tests for sending e-mail for link shares | Roeland Jago Douma | 2015-10-08 | 2 | -10/+170 | |
| * | | | | | | | Fix share email sending feedback | Vincent Petry | 2015-10-08 | 2 | -3/+15 | |
* | | | | | | | | Merge pull request #19633 from owncloud/sidebar-alt-favorite | Thomas Müller | 2015-10-14 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Move alt text for favorite action to image | Vincent Petry | 2015-10-07 | 1 | -2/+1 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #19634 from owncloud/notif-showtemporary | Thomas Müller | 2015-10-14 | 1 | -20/+8 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | showTemporary instead of show for notifications | Vincent Petry | 2015-10-08 | 1 | -20/+8 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #19647 from owncloud/trashbin-removesidebar | Thomas Müller | 2015-10-14 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove sidebar for trashbin view | Vincent Petry | 2015-10-08 | 1 | -1/+2 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #19710 from owncloud/files-canceluploaddebounce-re | Thomas Müller | 2015-10-14 | 1 | -6/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Debounce cancel upload message | Vincent Petry | 2015-10-12 | 1 | -6/+5 | |
* | | | | | | | | | Merge pull request #19714 from owncloud/trash-deletesectionposition-2 | Thomas Müller | 2015-10-14 | 3 | -14/+18 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Revert "Revert "Move trashbin specific CSS that modifies sidebar"" | Thomas Müller | 2015-10-12 | 3 | -14/+18 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #19738 from owncloud/proppatch-lastmodified | Thomas Müller | 2015-10-14 | 2 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix mtime PROPPATCH to be "lastmodified" instead of "getlastmodified" | Vincent Petry | 2015-10-13 | 2 | -6/+6 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #19747 from owncloud/files-delete-hidenotif | Thomas Müller | 2015-10-14 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Hide notification on delete | Vincent Petry | 2015-10-13 | 1 | -0/+2 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #19580 from owncloud/issue-19399-remote-shares-case-sensit... | Thomas Müller | 2015-10-14 | 3 | -0/+41 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Make sure that remote shares use the correct uid casing | Joas Schilling | 2015-10-06 | 3 | -0/+41 | |
* | | | | | | | | | | Merge pull request #19645 from owncloud/file-conflict-disablecontinue | Thomas Müller | 2015-10-14 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Check .conflicts for checkboxes | Morris Jobke | 2015-10-08 | 1 | -1/+1 | |
| * | | | | | | | | | | Disable "Continue" button in conflict dialog when no selection | Vincent Petry | 2015-10-08 | 1 | -0/+11 | |
| | |_|_|/ / / / / / | |/| | | | | | | | |