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

Adds Start-TLS conditionnal option to AuthLDAP plugin. Simplify settings wording. #179

Merged
merged 2 commits into from Mar 18, 2014
Merged

Conversation

lemeur
Copy link
Collaborator

@lemeur lemeur commented Mar 12, 2014

No description provided.

mennodekker added a commit that referenced this pull request Mar 18, 2014
Adds Start-TLS conditionnal option to AuthLDAP plugin. Simplify settings wording.
@mennodekker mennodekker merged commit 5ed499e into LimeSurvey:master Mar 18, 2014
@mennodekker
Copy link
Contributor

I think commit messages for pull requests also need to be correct (to make it appear in the changelog). Next time, please make sure to create a bug/feature request and use that in the commit message.

(And thanks for your work on the plugin ofcourse!)

@lemeur
Copy link
Collaborator Author

lemeur commented Mar 18, 2014

Hi Menno,

My first pull request had a correct commit message I think, but didn't appear in the last changelog though !
Maybe this is because the ticket was not closed on Mantis? I haven't checked your new release procedures (when I left the project we were on SVN) so I may be wrong.

But you're right I should have openned a new ticket because this is a different issue. Will do next time.

Thanx for your commitment to the project.

thibault

Envoyé de mon iPad

Le 18 mars 2014 à 07:54, Menno Dekker notifications@github.com a écrit :

I think commit messages for pull requests also need to be correct (to make it appear in the changelog). Next time, please make sure to create a bug/feature request and use that in the commit message.

(And thanks for your work on the plugin ofcourse!)


Reply to this email directly or view it on GitHub.

@Shnoulle
Copy link
Collaborator

I don't think wommit message system was updated:

  Fixed issue : Add a line in release text
  Fixed issue #XXXX : Add a line in release text
  New feature : Add aline in release text

Seam you lost the issue in last commit Fixed #08838: The "Access" filter in the administration surveylist c712fad

@lemeur
Copy link
Collaborator Author

lemeur commented Mar 19, 2014

Arghh... You're right I forgot the word 'issue'... My mistake.

I'm not familiar with git and in all my tests to work with branches And all my successive attempts to make a good pull request I've lost a word in my commit issue.

However, I thought that when accepting a pull request you could change the commit message to better suit the project's needs. But I agree that it makes unecessary extra work for,the repository manager.

Hopefully, I think I've understood git's philosophy now :-)

thibault

Le 18 mars 2014 à 23:00, Denis Chenu notifications@github.com a écrit :

I don't think wommit message system was updated:

Fixed issue : Add a line in release text
Fixed issue #XXXX : Add a line in release text
New feature : Add aline in release text
Seam you lost the issue in last commit Fixed #08838: The "Access" filter in the administration surveylist c712fad


Reply to this email directly or view it on GitHub.

@Shnoulle
Copy link
Collaborator

I move from SVN to GIT with a real pleasure, after some times it's really better and simpler. And it's really easy to manage multiple git ( http://git.sondages.pro/ ) ;).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants