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

Support for XDXF enhanced #115

Closed
wants to merge 2 commits into from
Closed

Support for XDXF enhanced #115

wants to merge 2 commits into from

Conversation

soshial
Copy link

@soshial soshial commented Jul 23, 2012

  • nested and their numbering now supported (!)
  • grammar tag info supported
  • (editorial comment tag) and (word usage examples tag) tags now look better

soshial added 2 commits July 23, 2012 15:48
…nfo supported; <co> (editorial comment tag) and <ex> (word usage examples tag) tags now look better
@Abs62
Copy link
Member

Abs62 commented Jul 23, 2012

What folder ".idea" in your commit means?

@soshial
Copy link
Author

soshial commented Jul 23, 2012

I'm sorry, I have accidentally committed one meta file from my IDE. I couldn't get how to remove it from "pullable" commits.
I can try to redownload goldendict repo and replace old files with new ones without .idea and then resubmit the pull request.
I can also append some other fixes for XDXF in one pull-request.

@Abs62
Copy link
Member

Abs62 commented Jul 23, 2012

And if you speak Russian, follow style described in this post please.

@soshial
Copy link
Author

soshial commented Jul 23, 2012

Actually I do. It seems to me that my code additions comply with your code guide, don't they?
Also, asking again, should I redo pull request?

@Abs62
Copy link
Member

Abs62 commented Jul 24, 2012

It is not my guide, it is guide by program author. ;)
You wrote "while" cycles in one string, for example. And without spaces around mathematical operators. And look to spaces after/before brakets. And to variables naming.
"Стилистика эта не лучше и не хуже любых других, она просто есть, и крайне желательно при создании изменений её придерживаться". (C) dragonroot

@soshial
Copy link
Author

soshial commented Jul 24, 2012

I got it - I will fix the representation of my fixes.

Asking again, should I resubmit the pull request from scratch or I can just edit it?

@chulai
Copy link
Member

chulai commented Jul 26, 2012

@soshial, if you keep adding commits to the same branch and pushing this branch to your github remote repository, then GitHub is smart enough to add the additional commits here below the 2 commits you have now in the pull request. No need to resubmit the pull request. Just tell us when you are done so we can review and proceed with the merge. Thanks.

@soshial
Copy link
Author

soshial commented Feb 26, 2013

I have resubmitted my pull request. Please delete this one.

@chulai chulai closed this Feb 26, 2013
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