summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add commit compare functionalityChristopher Brickley2014-09-0111-66/+169
|
* Merge pull request #410 from tstorch/docker_mix_match无闻2014-09-0125-40/+373
|\ | | | | Docker mix and match setup
| * Docker mix and match setupTristan Storch2014-08-3125-40/+373
| | | | | | | | | | | | Rewrite of the docker setup. Now uses fig to manage containers and container linkage. The base is a block based mix and match, which will give you the possibility to easily test all configurations.
* | Merge pull request #409 from tstorch/translation-03无闻2014-09-011-92/+80
|\ \ | |/ |/| German laguage update
| * German laguage updateTristan Storch2014-08-311-92/+80
|/ | | | | | | | What has been done: - standardized expressions - shorter and clearer - minor corrections (orthography)
* Merge pull request #408 from fanningert/patch-1无闻2014-09-011-0/+5
|\ | | | | Add new translation keys
| * Add new translation keysfanningert2014-08-311-0/+5
|/
* Merge pull request #407 from fanningert/patch-3无闻2014-09-011-1/+1
|\ | | | | Update locale_de-DE.ini and correct a wrong translation
| * Update locale_de-DE.inifanningert2014-08-311-3/+3
| |
| * Update locale_de-DE.inifanningert2014-08-311-1/+1
| |
| * Update locale_de-DE.inifanningert2014-08-311-3/+3
| |
| * Change "Repositories" to "Repositorys"fanningert2014-08-311-15/+15
| |
| * Update locale_de-DE.ini and correct a wrong translationfanningert2014-08-311-15/+15
| |
* | Merge pull request #402 from fanningert/patch-2无闻2014-09-011-0/+4
|\ \ | | | | | | Add missing dependencies
| * | Removed not needed depsfanningert2014-08-311-2/+0
| | | | | | | | | | | | | | | Removed * github.com/gogits/cache * github.com/gogits/session
| * | Add missing dependenciesfanningert2014-08-311-0/+6
| | |
* | | Mirror fix and hide missing pages for 0.5 releaseUnknwon2014-09-019-26/+33
| | |
* | | Merge branch 'dev' of github.com:gogits/gogs into devUnknwon2014-09-0117-253/+665
|\ \ \
| * \ \ Merge pull request #379 from compressed/slack无闻2014-09-0115-79/+485
| |\ \ \ | | |_|/ | |/| | Slack Support
| | * | add Slack API webhook supportChristopher Brickley2014-08-3115-79/+485
| |/ /
| * | Merge pull request #405 from fanningert/patch-1无闻2014-08-311-172/+172
| |\ \ | | | | | | | | Update german translation with PR #404
| | * | Update german translation with PR #404fanningert2014-08-311-172/+172
| |/ /
| * | Merge pull request #401 from fanningert/patch-1无闻2014-08-311-7/+12
| |\ \ | | |/ | |/| Update locale_de-DE.ini
| | * Update locale_de-DE.inifanningert2014-08-311-7/+12
| |/
| * Merge pull request #400 from deringer/dev无闻2014-08-311-1/+2
| |\ | | | | | | Add missing 'new migration' link
| | * Add missing 'new migration' linkMichael Dyrynda2014-08-311-1/+2
| | | | | | | | | | | | Addresses issue #399
* | | Update depsUnknwon2014-09-014-3/+5
|/ /
* / UI: SSH/HTTPS address switch and copyUnknwon2014-08-316-14/+87
|/
* Merge branch 'master' of github.com:gogits/gogs into devUnknwon2014-08-317-7/+47
|\ | | | | | | | | Conflicts: dockerfiles/README.md
| * Merge pull request #365 from choas/patch-1Lunny Xiao2014-08-241-1/+1
| |\ | | | | | | update dockerfiles README.md
| | * update dockerfiles README.mdLars Gregori2014-08-241-1/+1
| |/ | | | | typo
| * Merge pull request #338 from gogits/revert-335-patch-1无闻2014-07-281-1/+1
| |\ | | | | | | Revert "actually use SshPort variable"
| | * Revert "actually use SshPort variable"无闻2014-07-281-1/+1
| |/
| * Merge pull request #335 from taziden/patch-1无闻2014-07-271-1/+1
| |\ | | | | | | actually use SshPort variable
| | * actually use SshPort variabletaziden2014-07-271-1/+1
| |/ | | | | SshPort is defined (SSH_PORT) but the value is not actually used (just compared to default port 22).
| * Merge pull request #294 from ecnahc515/patch-2无闻2014-07-211-3/+0
| |\ | | | | | | Remove apt-get cleanup from Dockerfile
| | * Remove apt-get cleanup from DockerfileChance Zibolski2014-07-211-3/+0
| |/ | | | | Purging/cleaning packages using apt doesn't actually reduce image size, and only creates additional layers, which doesn't add any benefit to the overall image.
* | Merge pull request #396 from fanningert/patch-1无闻2014-08-311-1/+0
|\ \ | | | | | | Update locale_zh-CN.ini
| * | Update locale_zh-CN.inifanningert2014-08-301-1/+0
| | | | | | | | | Double entry of "config.log_config"
* | | Merge pull request #397 from fanningert/patch-2无闻2014-08-311-1/+0
|\ \ \ | | | | | | | | Update locale_en-US.ini
| * | | Update locale_en-US.inifanningert2014-08-301-1/+0
| |/ / | | | | | | Double entry of "config.log_config"
* | | Merge pull request #398 from fanningert/patch-3无闻2014-08-311-10/+87
|\ \ \ | |/ / |/| | Update locale_de-DE.ini
| * | Update locale_de-DE.inifanningert2014-08-301-10/+87
|/ /
* | Merge pull request #394 from tstorch/trailing_white_spaces无闻2014-08-3033-99/+99
|\ \ | | | | | | Removed trailing white spaces
| * | Removed trailing white spacesTristan Storch2014-08-3033-99/+99
|/ / | | | | | | | | | | | | | | | | | | Removed trailing whitespaces with ```sh for file in `grep -r " $" * | cut -d : -f 1 | sort | uniq | grep -v " "`; do sed -i 's/[ \t]*$//' $file; done ``` and some handwork.
* | Finish all new admin pages.Unknwon2014-08-3012-331/+469
| |
* | Merge pull request #391 from fanningert/patch-1无闻2014-08-301-1/+1
|\ \ | | | | | | Update locale_en-US.ini
| * | Update locale_en-US.inifanningert2014-08-301-1/+1
| | |
* | | Merge pull request #392 from fanningert/patch-2无闻2014-08-301-28/+73
|\ \ \ | |/ / |/| | Update locale_de-DE.ini
| * | Update locale_de-DE.inifanningert2014-08-301-28/+73
|/ /