Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Consolidate webdav code - move all to one app | Thomas Müller | 2015-10-16 | 56 | -177/+249 |
| | |||||
* | Merge pull request #19823 from owncloud/require-idn | Thomas Müller | 2015-10-16 | 1 | -0/+4 |
|\ | | | | | Run test only when idn is available | ||||
| * | Run test only when idn is available | Lukas Reschke | 2015-10-16 | 1 | -0/+4 |
| | | | | | | | | IDN is not installed on all machines making the unit test execution fail on those without. Let's make IDN thus a pre-requirement for the text execution. | ||||
* | | Merge pull request #19822 from owncloud/share-checkboxuniqueids | Roeland Douma | 2015-10-16 | 5 | -119/+138 |
|\ \ | |/ |/| | Fix DOM element ids in share dialog | ||||
| * | Fix DOM element ids in share dialog | Vincent Petry | 2015-10-16 | 5 | -119/+138 |
|/ | | | | | | | | - Rely on class names instead of global ids - When global ids are needed for label+checkbox, append the view id (cid) to the element's id This fixes the checkboxes when multiple sidebars exist in the DOM. | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-16 | 22 | -22/+276 |
| | |||||
* | Merge pull request #19814 from owncloud/filelist-preventerrorwhennosidebar | Thomas Müller | 2015-10-15 | 3 | -6/+49 |
|\ | | | | | Do not register sidebar panels when no sidebar | ||||
| * | Do not register sidebar panels when no sidebar | Vincent Petry | 2015-10-15 | 3 | -6/+49 |
| | | |||||
* | | Merge pull request #19806 from owncloud/fix_19572 | Thomas Müller | 2015-10-15 | 1 | -4/+11 |
|\ \ | | | | | | | only wrap source if fopen was successful | ||||
| * | | check if fopen was successful before continue | Bjoern Schiessle | 2015-10-15 | 1 | -3/+7 |
| | | | |||||
| * | | only wrap source if fopen was successful | Bjoern Schiessle | 2015-10-15 | 1 | -1/+4 |
| |/ | |||||
* | | Merge pull request #19795 from owncloud/fix-language-level-compat | Thomas Müller | 2015-10-15 | 1 | -2/+3 |
|\ \ | | | | | | | Remove arbitrary expression in empty | ||||
| * | | Remove arbitrary expression in empty | Lukas Reschke | 2015-10-14 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | Those are only allowed in PHP 5.5, thus making our code incompatible with PHP 5.4 Fixes https://github.com/owncloud/core/issues/19793 | ||||
* | | | Merge pull request #19802 from RealRancor/fix_rewrites | Thomas Müller | 2015-10-15 | 1 | -2/+0 |
|\ \ \ | |_|/ |/| | | Remove legacy non-working rewrites in .htaccess | ||||
| * | | 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 | ||||
| * | | Specify PHP 5.4 as version for scrutinizer | Lukas Reschke | 2015-10-14 | 1 | -0/+10 |
| |/ | | | | | Let's see if this helps for cases such as https://github.com/owncloud/core/issues/19793 | ||||
* | | 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 | ||||
| * | | 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 | ||||
| * | 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 |
|\ | | | | | Update list of deprecated methods | ||||
| * | 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 | ||||
| * | | 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 | ||||
| * | | 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 | ||||
| * | | 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 | ||||
| * | | | 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 |
|\ \ \ | | | | | | | | | Fix more IE issues | ||||
| * | | | [IE8] Fix button background color | Vincent Petry | 2015-10-07 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | IE8 doesn't support rgba... | ||||
| * | | | [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 |
| | | | | | | | | | | | | | | | | IE9 flattened the icons, so give it an explicit height. | ||||
| * | | | [IE] Add border to dropdown menus | Vincent Petry | 2015-10-07 | 1 | -1/+6 |
| |/ / | | | | | | | | | | | | | As a fallback because box-shadow doesn't give the same effect and drop shadow doesn't work with IE. | ||||
* | | | Merge pull request #19631 from owncloud/share-emailsenterror | Thomas Müller | 2015-10-14 | 4 | -13/+185 |
|\ \ \ | | | | | | | | | Fix share email sending feedback | ||||
| * | | | 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 |
| | | | | | | | | | | | | | | | | Redisplay email address after failure | ||||
* | | | | 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 | ||||
| * | | | | 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 | ||||
| * | | | | 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 | ||||
| * | | | | 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 | ||||
| * | | | | Debounce cancel upload message | Vincent Petry | 2015-10-12 | 1 | -6/+5 |
| | | | | |