peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,311 Commits 12 Branches 32 Tags 139 MiB
cd734a3b31
Commit Graph

261 Commits

Author SHA1 Message Date
Konrad
647296ce63
Merge branch 'master' of https://github.com/go-gitea/gitea 2018-01-21 16:23:15 +01:00
GiteaBot
a880b17296 [skip ci] Updated translations via Crowdin 2018-01-16 21:27:57 +00:00
GiteaBot
cc0c4a30a7 [skip ci] Updated translations via Crowdin 2018-01-15 22:45:41 +00:00
GiteaBot
e2bb7933e8 [skip ci] Updated translations via Crowdin 2018-01-15 06:04:51 +00:00
Ethan Koenig
d29aa76777 Fix en-US locale (#3371) 2018-01-15 00:27:57 +02:00
GiteaBot
6b9073b3a4 [skip ci] Updated translations via Crowdin 2018-01-14 22:10:15 +00:00
viktike
18bf6be398 Add myself as a translator (#3370) 2018-01-15 00:09:30 +02:00
Konrad
fdabcf1a25
Merge branch 'master' of https://github.com/go-gitea/gitea 2018-01-14 21:13:16 +01:00
GiteaBot
6da5ed2594 [skip ci] Updated translations via Crowdin 2018-01-14 17:35:34 +00:00
kolaente
31eff2f88b
Added displaying if dependencies are enabled by default or not on config overview (admin) 2018-01-13 21:57:33 +01:00
kolaente
cf1b573c35
Merge branch 'master' into master 2018-01-13 11:20:57 +01:00
GiteaBot
a8325dd1cb [skip ci] Updated translations via Crowdin 2018-01-13 09:46:18 +00:00
GiteaBot
f7088292bb [skip ci] Updated translations via Crowdin 2018-01-12 22:17:50 +00:00
Antoine GIRARD
079273e2ff Add MSSQL to supported database list of intall page (#3359) 2018-01-12 19:23:28 +02:00
GiteaBot
51a18f7e54 [skip ci] Updated translations via Crowdin 2018-01-11 22:20:44 +00:00
kolaente
d5b1c33f73
Merge branch 'master' into master 2018-01-11 21:09:56 +01:00
GiteaBot
9aed18073d [skip ci] Updated translations via Crowdin 2018-01-11 19:57:53 +00:00
GiteaBot
6070c9a5b8 [skip ci] Updated translations via Crowdin 2018-01-09 18:41:13 +00:00
kolaente
4d15f28e04
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v56.go
 2018-01-08 19:08:13 +01:00
GiteaBot
9d8260b3d6 [skip ci] Updated translations via Crowdin 2018-01-07 09:42:08 +00:00
GiteaBot
87f67fd392 [skip ci] Updated translations via Crowdin 2018-01-07 09:14:19 +00:00
kolaente
eb295f40c0
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v55.go
 2018-01-07 00:05:43 +01:00
GiteaBot
4002328179 [skip ci] Updated translations via Crowdin 2018-01-06 22:56:53 +00:00
Vlad Temian
e78786ef39 Writable deploy keys (closes #671) (#3225) 
* Add is_writable checkbox to deploy keys interface

* Add writable key option to deploy key form

* Add support for writable ssh keys in the interface

* Rename IsWritable to ReadOnly

* Test: create read-only and read-write deploy keys via api

* Add DeployKey access mode migration

* Update gitea sdk via govendor

* Fix deploykey migration

* Add unittests for writable deploy keys

* Move template text to locale

* Remove implicit column update

* Remove duplicate locales

* Replace ReadOnly field with IsReadOnly method

* Fix deploy_keys related integration test

* Rename v54 migration with v55

* Fix migration hell
 2018-01-07 00:55:53 +02:00
kolaente
86be828148
Added more specific locale 2018-01-06 23:04:43 +01:00
kolaente
8bc0947cbd
Added more specific locale 2018-01-06 23:02:04 +01:00
kolaente
37dc550bc8
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	docs/content/doc/advanced/config-cheat-sheet.en-us.md
#	models/migrations/migrations.go
#	models/migrations/v54.go
#	routers/repo/pull.go
 2018-01-06 22:41:44 +01:00
GiteaBot
52d93f7c31 [skip ci] Updated translations via Crowdin 2018-01-06 19:53:48 +00:00
GiteaBot
2d31986236 [skip ci] Updated translations via Crowdin 2018-01-06 11:29:31 +00:00
GiteaBot
15b8720c5d [skip ci] Updated translations via Crowdin 2018-01-05 18:57:58 +00:00
Lauris BH
8ac1501ad7
Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) 
* Pull request options migration and UI in settings

* Add ignore whitespace functionality

* Fix settings if pull requests are disabled

* Fix migration transaction

* Merge with Rebase functionality

* UI changes and related functionality for pull request merging button

* Implement squash functionality

* Fix rebase merging

* Fix pull request merge tests

* Add squash and rebase tests

* Fix API method to reuse default message functions

* Some refactoring and small fixes

* Remove more hardcoded values from tests

* Remove unneeded check from API method

* Fix variable name and comment typo

* Fix reset commit count after PR merge
 2018-01-05 20:56:50 +02:00
kolaente
0016a3e1a7
Merge branch 'master' into master 2018-01-03 16:26:09 +01:00
GiteaBot
daf08aeacd [skip ci] Updated translations via Crowdin 2018-01-03 08:35:03 +00:00
kolaente
12c0093e40
Merge branch 'master' into master 2018-01-02 13:24:14 +01:00
GiteaBot
de9e36e90e [skip ci] Updated translations via Crowdin 2018-01-02 12:14:47 +00:00
GiteaBot
274241c044 [skip ci] Updated translations via Crowdin 2018-01-02 10:33:40 +00:00
GiteaBot
a22037713e [skip ci] Updated translations via Crowdin 2018-01-02 02:38:10 +00:00
Piotr Orzechowski
50b7ba1b70 Fix MS AD Search Attributes English translation (#3282) 2018-01-02 10:37:16 +08:00
kolaente
632cca5558
Merge branch 'master' into master 2018-01-01 20:51:23 +01:00
GiteaBot
7944ff7e71 [skip ci] Updated translations via Crowdin 2018-01-01 13:39:43 +00:00
kolaente
436ea162bb
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	public/js/index.js
 2018-01-01 14:20:42 +01:00
GiteaBot
b05a17249b [skip ci] Updated translations via Crowdin 2017-12-31 14:47:00 +00:00
GiteaBot
ae9cc8f972 [skip ci] Updated translations via Crowdin 2017-12-31 03:09:06 +00:00
kolaente
f48d6cdecd
Error messages moved to locale file 2017-12-29 15:43:12 +01:00
kolaente
c176353d60
fixed typos 2017-12-29 15:34:24 +01:00
Konrad
ed4a47dcc8
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-12-29 14:27:23 +01:00
GiteaBot
a995ad90e1 [skip ci] Updated translations via Crowdin 2017-12-22 07:01:25 +00:00
GiteaBot
7cf17e376b [skip ci] Updated translations via Crowdin 2017-12-20 03:42:21 +00:00
kolaente
172b1f054a
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	models/migrations/v51.go
 2017-12-19 19:07:30 +01:00
GiteaBot
e693fda325 [skip ci] Updated translations via Crowdin 2017-12-12 22:27:18 +00:00