Skip to content

Conversation

ethantkoenig
Copy link
Contributor

@ethantkoenig ethantkoenig commented Jan 27, 2017

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.

ethantkoenig and others added 30 commits December 9, 2016 20:11
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
unclejack and others added 22 commits January 24, 2017 22:37
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
@ethantkoenig ethantkoenig changed the title Revert "Changes from gitea:master (#130)" Revert "Changes from gitea:master (#130)" and add latest gitea changes Jan 27, 2017
@ethantkoenig ethantkoenig changed the title Revert "Changes from gitea:master (#130)" and add latest gitea changes Revert "Changes from gitea:master (#130)" and readd latest gitea changes Jan 27, 2017
@phillip-hopper phillip-hopper merged commit e2feb3b into unfoldingWord:develop Jan 31, 2017
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.