-
-
Notifications
You must be signed in to change notification settings - Fork 6
Revert "Changes from gitea:master (#130)" and readd latest gitea changes #138
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
Merged
phillip-hopper
merged 227 commits into
unfoldingWord:develop
from
ethantkoenig:ufw_develop
Jan 31, 2017
Merged
Revert "Changes from gitea:master (#130)" and readd latest gitea changes #138
phillip-hopper
merged 227 commits into
unfoldingWord:develop
from
ethantkoenig:ufw_develop
Jan 31, 2017
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Delete old temp local copy before we create a new temp local copy
* Correction LDAP username validation As https://msdn.microsoft.com/en-us/library/aa366101(v=vs.85).aspx describe spaces should not be in start or at the end of username but they can be inside the username. So please check my solution for it. * Check for zero length passwords in LDAP module. According to https://tools.ietf.org/search/rfc4513#section-5.1.2 LDAP client should always check before bind whether a password is an empty value. There are at least one LDAP implementation which does not return error if you try to bind with DN set and empty password - AD. * Clearing the login/email spaces at the [start/end]
* Autogenerate Version On Build * Fixes * Changed Version to v0.9.0 * balls * I hate newlines * Don't remove .VERSION-file on `make clean` * v0.9.0 => 1.0.0 * damn new-lines... * Always rebuild templates/.VERSION * Delete .VERSION * Update Makefile
* Update example install url from try.gogs.io to try.gitea.io * Ask if issue can be reproduced on try.gitea.io * Link try.gitea.io to the README
* Added stupid docker task to makefile * Dropped unknown option PrintLastLog from docker ssh config * OpenSSH should log to docker stdout * Set random pw for docker git user, otherwise it is locked * Stop using templates and public within docker
Until aircover gets updated so that it works again I have disabled to coverage report upload for now.
Just to make it easier for administrator to configure libre avatar, as it is done for "duoshuo" and "gravatar"
* serve video files using the HTML5 video tag * lint fix: add comment to IsVideoFile
Signed-off-by: Michael de Wit <mjwwit@gmail.com>
Change test mail subject and body to 'Gitea Test Mail!'
* Remove unused custom-alphabet feature of random string generator Fix random string generator Random string generator should return error if it fails to read random data via crypto/rand * Fixes variable (un)initialization mixed assign Update test GetRandomString
Add support for using "libravatar" as the GravatarSource
Signed-off-by: Thomas Boerger <tboerger@suse.de>
* Add Korean support * replace Gogs to Gitea
* Update locales * replace Gogs to Gitea
* fix homepage docs link broken * fix homepage docs links after docs updated
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Fix SSH server on Windows when running as service
* Update ru-RU translation * Fixed translation for ru-RU. Incorrect quotation marks. * Update ru-RU translation. Changed 'issue' translation. Updated 'notifications' translation. * Changed translation of “issue” from “trouble” to “task”. This translation is being used in most tracking systems. * Improved translation of the sentence to sound better in Russian.
PullRequestCtx.HeadInfo did not contain the current selected branch causing issue gogs#304
This reverts commit 17b247f.
70a4fa6
to
64698b5
Compare
64698b5
to
f761a3e
Compare
phillip-hopper
approved these changes
Jan 31, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reverts the changes from #130. In #130, I rebased all of the gitea changes down to a single commit. That isn't the best approach, since it will cause us to have to repeatedly resolve the same merge conflicts every time we bring in changes from gitea.
This PR also sensibly brings in the latest gitea changes.