summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-10-1792-330/+258
|
* Merge pull request #19843 from ↵Thomas Müller2015-10-162-2/+2
|\ | | | | | | | | owncloud/an-app-is-identified-by-having-a-info.xml-app.php-should-not-be-mandatory an-app-is-identified-by-having-a-info.xml-app.php-should-not-be-manda…
| * Fix failing unit testThomas Müller2015-10-161-1/+1
| |
| * an-app-is-identified-by-having-a-info.xml-app.php-should-not-be-mandatoryThomas Müller2015-10-161-1/+1
| |
* | Merge pull request #19820 from owncloud/properError_sharing_with_ownerRoeland Douma2015-10-162-7/+51
|\ \ | | | | | | When sharing with the owner show the path
| * | Check for error when resharingRoeland Jago Douma2015-10-162-10/+27
| | |
| * | When sharing with the owner show the pathRoeland Jago Douma2015-10-162-1/+28
|/ / | | | | | | | | The error message should contain the path that is being shared not the numeric id.
* | Merge pull request #19821 from owncloud/GreenArchon-fix-memberof-regressionC. Montero Luque2015-10-162-15/+5
|\ \ | |/ |/| Revert "adjust to nested group fix
| * Adjust unit testsLukas Reschke2015-10-161-8/+3
| |
| * Fix styleLukas Reschke2015-10-161-1/+1
| |
| * Revert "adjust to nested group fixFrédéric Fortier2015-10-161-6/+1
| | | | | | | | This reverts commit 845485cfe, which fixes #19816 regression.
* | Merge pull request #19836 from owncloud/share-fix-spinner-positionThomas Müller2015-10-162-3/+12
|\ \ | | | | | | Fix spinner positions in share tab
| * | Fix spinner positions in share tabVincent Petry2015-10-162-3/+12
| | | | | | | | | | | | Also fix missing spinner when removing link share
* | | Merge pull request #19831 from owncloud/ext-dropbox-removecacheafteruploadThomas Müller2015-10-161-0/+1
|\ \ \ | | | | | | | | Remove Dropbox metadata from cache after upload
| * | | Remove Dropbox metadata from cache after uploadVincent Petry2015-10-161-0/+1
| | |/ | |/| | | | | | | | | | This will make sure that the next calls that read the mtime will get the correct value.
* | | Merge pull request #19828 from owncloud/ie9-placeholder-sicknessThomas Müller2015-10-161-0/+4
|\ \ \ | | | | | | | | [IE9] Prevent LDAP password field to become plain text
| * | | [IE9] Prevent LDAP password field to become plain textVincent Petry2015-10-161-0/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The placeholders library converts the password field to a text field to achieve placeholders functionality. However this is buggy and doesn't properly mask the password when it was set through $el.val(). This workaround sets the type back to password directly after setting a value.
* | | Merge pull request #18688 from owncloud/dav-appThomas Müller2015-10-1658-200/+261
|\ \ \ | |_|/ |/| | Consolidate webdav code - move all to one app
| * | Fix typo and adjust required versionMorris Jobke2015-10-161-2/+2
| | |
| * | Fix webdav accessRoeland Jago Douma2015-10-163-4/+5
| | | | | | | | | | | | | | | * Correct namespace * Pass the EventDispatcher to the webDAV server
| * | Fix uni testsThomas Müller2015-10-167-8/+8
| | |
| * | Remove $ETagFunction - it was never usedThomas Müller2015-10-162-13/+1
| | |
| * | Consolidate webdav code - move all to one appThomas Müller2015-10-1656-177/+249
|/ /
* | Merge pull request #19823 from owncloud/require-idnThomas Müller2015-10-161-0/+4
|\ \ | | | | | | Run test only when idn is available
| * | Run test only when idn is availableLukas Reschke2015-10-161-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-checkboxuniqueidsRoeland Douma2015-10-165-119/+138
|\ \ | |/ |/| Fix DOM element ids in share dialog
| * Fix DOM element ids in share dialogVincent Petry2015-10-165-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 transifexJenkins for ownCloud2015-10-1622-22/+276
|
* Merge pull request #19814 from owncloud/filelist-preventerrorwhennosidebarThomas Müller2015-10-153-6/+49
|\ | | | | Do not register sidebar panels when no sidebar
| * Do not register sidebar panels when no sidebarVincent Petry2015-10-153-6/+49
| |
* | Merge pull request #19806 from owncloud/fix_19572Thomas Müller2015-10-151-4/+11
|\ \ | | | | | | only wrap source if fopen was successful
| * | check if fopen was successful before continueBjoern Schiessle2015-10-151-3/+7
| | |
| * | only wrap source if fopen was successfulBjoern Schiessle2015-10-151-1/+4
| |/
* | Merge pull request #19795 from owncloud/fix-language-level-compatThomas Müller2015-10-151-2/+3
|\ \ | | | | | | Remove arbitrary expression in empty
| * | Remove arbitrary expression in emptyLukas Reschke2015-10-141-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_rewritesThomas Müller2015-10-151-2/+0
|\ \ \ | |_|/ |/| | Remove legacy non-working rewrites in .htaccess
| * | Remove legacy non-working rewrites in .htaccessRealRancor2015-10-151-2/+0
|/ /
* | Merge pull request #19797 from owncloud/specify-php-5-4Thomas Müller2015-10-151-0/+10
|\ \ | | | | | | Specify PHP 5.4 as version for scrutinizer
| * | Specify PHP 5.4 as version for scrutinizerLukas Reschke2015-10-141-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-issueLukas Reschke2015-10-157-28/+25
|\ \ | | | | | | Fix doc blocks of LDAP classes
| * | Fix doc blocks of LDAP classesJoas Schilling2015-10-157-28/+25
|/ /
* / [tx-robot] updated from transifexJenkins for ownCloud2015-10-1518-14/+124
|/
* Merge pull request #19787 from owncloud/kill-arrayparserThomas Müller2015-10-141-238/+0
|\ | | | | Remove ArrayParser because it is unused
| * Remove ArrayParser because it is unusedMorris Jobke2015-10-141-238/+0
|/
* Merge pull request #19731 from owncloud/update-list-of-deprecated-methodsThomas Müller2015-10-144-9/+29
|\ | | | | Update list of deprecated methods
| * The constant is now deprecatedJoas Schilling2015-10-142-2/+2
| |
| * update deprecation messageMorris Jobke2015-10-141-1/+1
| |
| * Update list of deprecated methodsJoas Schilling2015-10-142-7/+27
| |
* | Merge pull request #19760 from owncloud/adding_occ_upgrade_text_noteThomas Müller2015-10-141-0/+1
|\ \ | | | | | | Adding occ upgrade text note
| * | adding occ upgrade text noteMartin2015-10-141-0/+1
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-16 10:47:59 +0000