Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding my 1.3.6patch repro #1601

Merged
11 commits merged into from
Feb 12, 2014
Merged

adding my 1.3.6patch repro #1601

11 commits merged into from
Feb 12, 2014

Conversation

rallek
Copy link
Contributor

@rallek rallek commented Feb 12, 2014

Q A
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets
Refs tickets
License MIT
Doc PR

this will close my collection at https://github.com/rallek/1.3.6patch

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  | #704
| License       | MIT
| Doc PR        |
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  | #924
| License       | MIT
| Doc PR        |

see also https://gist.github.com/cmfcmf/6329308
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  | #516, #938
| License       | MIT
| Doc PR        |
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #762
| Refs tickets  | #775
| License       | MIT
| Doc PR        |
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  | #783
| License       | MIT
| Doc PR        |
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  | #1561
| License       | MIT
| Doc PR        |
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  |
| License       | MIT
| Doc PR        |

do not know the tickets of this fixes
@cmfcmf
Copy link
Contributor

cmfcmf commented Feb 12, 2014

This looks far better! 🎉 ⭐ 💯

@rallek
Copy link
Contributor Author

rallek commented Feb 12, 2014

:)
my first contribution to the core ;-)

@@ -18,7 +18,7 @@
</div>
<form id="users_loginblock_login_form" class="z-form z-linear{if !$show_login_form} z-hide{/if}" action="{modurl modname="Users" type="user" func="login"}" method="post">
<div>
<input type="hidden" id="users_loginblock_returnpage" name="returnpage" value="{$returnpage|safetext}" />
<input type="hidden" id="users_loginblock_returnpage" name="returnpage" value="{$returnpage}" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This and the change in the following file however will have to be reverted.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

help needed. No idea what to do and what you mean

``|safetext`` added
``|safetext`` added
``public `` added
thanks to cmf!
Korinthen for cmf ;-)
@ghost
Copy link

ghost commented Feb 12, 2014

@rallek good work but next time create a topic branch or your PRs can get screwed up after you submit them.

@ghost
Copy link

ghost commented Feb 12, 2014

PR need the header in the description as per CONTRIBUTING in repo.

@rallek
Copy link
Contributor Author

rallek commented Feb 12, 2014

added the header. Details I added always at each commit

ghost pushed a commit that referenced this pull request Feb 12, 2014
This PR was merged into zikula:release-1.3 branch.

Discussion
----------

adding my 1.3.6patch repro

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | 
| Refs tickets  | 
| License       | MIT
| Doc PR        | 

this will close my collection at https://github.com/rallek/1.3.6patch

Commits
-------

be16503 workflow fix

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  | #704
| License       | MIT
| Doc PR        | rallek
3d081c9 drag and drop fix for extmenu

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  | #924
| License       | MIT
| Doc PR        |

see also https://gist.github.com/cmfcmf/6329308 rallek
6715748 Fixed Block filtering in 1.3.5/6

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  | #516, #938
| License       | MIT
| Doc PR        | rallek
2ca1a5b Fixed displaying of selection boxes

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #762
| Refs tickets  | #775
| License       | MIT
| Doc PR        | rallek
64f0cd8 added jpeg

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  | #783
| License       | MIT
| Doc PR        | rallek
a2b3e3a Avoid flush by category selector

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  | #1561
| License       | MIT
| Doc PR        | rallek
dd0036b some more fixes

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| Refs tickets  |
| License       | MIT
| Doc PR        |

do not know the tickets of this fixes rallek
2f519ce Update users_user_login.tpl

``|safetext`` added rallek
966e29b Update users_block_login.tpl

``|safetext`` added rallek
b05529e Update CategorySelector.php

``public `` added
thanks to cmf! rallek
20383d0 Update PageUtil.php

Korinthen for cmf ;-) rallek
@ghost ghost merged commit 79d8c78 into zikula:release-1.3 Feb 12, 2014
@rallek rallek deleted the release-1.3 branch February 12, 2014 19:51
@espaan
Copy link
Contributor

espaan commented Feb 13, 2014

👍 Thanks a lot Ralf for collecting and caring ;-)

@craigh
Copy link
Member

craigh commented Feb 13, 2014

@rallek - can you please make sure that any fixes included here are also fixed in the 1.3 branch?

@ghost
Copy link

ghost commented Feb 13, 2014

The merge policy should only be to back-port from 1.3.

@rallek
Copy link
Contributor Author

rallek commented Feb 13, 2014

My PR was only backport from 1.3. Nothing to do for 1.3 from my side.

I am not able to do programming for the core at all :-)

My PR was reviewed by cmf. Thanks for helping!

@espaan
Copy link
Contributor

espaan commented Feb 13, 2014

I also think it's only backports from 1.3, there is nothing new here.

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants