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

fix material #1298

Merged
merged 8 commits into from
Aug 10, 2015
Merged

fix material #1298

merged 8 commits into from
Aug 10, 2015

Conversation

modos189
Copy link
Contributor

@modos189 modos189 commented Aug 7, 2015

No description provided.

@nicosomb
Copy link
Member

nicosomb commented Aug 8, 2015

yeah, good job guy. I like the notifications 👍

<i class="mdi-navigation-close"></i>
</div>
</form>
<!--<form name="entry" method="post" action="{{ path('new_entry') }}">
Copy link
Member

Choose a reason for hiding this comment

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

"add a new link" form will be displayed in the header? Or is that dead code?

@nicosomb
Copy link
Member

nicosomb commented Aug 8, 2015

just 2 comments, we can merge after that.

@modos189
Copy link
Contributor Author

modos189 commented Aug 8, 2015

When you are able to add articles I uncomment.

If I understand correctly, it is now possible to add articles from the page ONLY http://site.com/new, because you want to pass the token

@nicosomb
Copy link
Member

nicosomb commented Aug 8, 2015

If I understand correctly, it is now possible to add articles from the page ONLY http://site.com/new,

yes, you can add new articles from this page only. So you can implement form in the header I think.

@modos189
Copy link
Contributor Author

modos189 commented Aug 8, 2015

Please tell me how to do it

@nicosomb
Copy link
Member

nicosomb commented Aug 8, 2015

OK, I'll do that after my current work.

@j0k3r
Copy link
Member

j0k3r commented Aug 9, 2015

Also, could you rebase your branch against the v2 to fix conflicts?

# Conflicts:
#	src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
@modos189
Copy link
Contributor Author

Up

# Conflicts:
#	src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
nicosomb added a commit that referenced this pull request Aug 10, 2015
@nicosomb nicosomb merged commit f59601f into wallabag:v2 Aug 10, 2015
@nicosomb
Copy link
Member

I merged your PR. About new link form, my PR #1307 is not yet finished, so I think it's better for you to work on a new PR.

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.

None yet

3 participants