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

240 Commits

Author SHA1 Message Date
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
GiteaBot
2ad633344e [skip ci] Updated translations via Crowdin 2017-12-12 06:46:42 +00:00
GiteaBot
eb6cbedcc0 [skip ci] Updated translations via Crowdin 2017-12-10 02:52:04 +00:00
GiteaBot
5b30964e54 [skip ci] Updated translations via Crowdin 2017-12-08 17:21:10 +00:00
GiteaBot
f8967fc638 [skip ci] Updated translations via Crowdin 2017-12-08 12:23:00 +00:00
GiteaBot
aecfc56156 [skip ci] Updated translations via Crowdin 2017-12-08 05:23:04 +00:00
Sasha Varlamov
7ec6cddd27 Add 'mark all read' option to notifications (#3097) 
* Add 'mark all read' option to notifications

Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>

* Fix exported comment

Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>

* Format method comments

Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>

* Fix exported comment

Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>

Format method comments

Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>

Tests for reactions (#3083)

* Unit tests for reactions

* Fix import order

Signed-off-by: Lauris Bukšis-Haberkorns <lauris@nix.lv>

Fix reaction possition when there is attachments (#3099)

Refactor notifications swap function

* Accept change to drop beforeupdate call

* Update purge notifications error message for consistency

* Drop unnecessary check for mark all as read button

* Remove debugging comment
 2017-12-07 13:52:57 +08:00
Konrad
e98f92d676
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-12-06 18:51:18 +01:00
GiteaBot
0332b8fb18 [skip ci] Updated translations via Crowdin 2017-12-04 14:06:04 +00:00
kolaente
fae44666ec
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v50.go
 2017-12-04 10:48:37 +01:00
Lauris BH
5dc37b187c
Add reactions to issues/PR and comments (#2856) 2017-12-04 01:14:26 +02:00
techknowlogick
993b86628b Minor copy changes (#3074) 
* Minor copy changes
Fixes #3058

* Use TrN for translations that depend on count
Fix minor type with branches count
 2017-12-03 22:52:30 +02:00
Konrad
9af3aae2f3
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-12-03 17:45:55 +01:00
GiteaBot
6d99840d1f [skip ci] Updated translations via Crowdin 2017-12-03 05:31:04 +00:00
kolaente
1fded52044
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	public/js/index.js
 2017-12-02 18:29:32 +01:00
GiteaBot
4cf90aa865 [skip ci] Updated translations via Crowdin 2017-11-29 20:53:22 +00:00
kolaente
6eea6c686f
Merge branch 'master' of https://github.com/go-gitea/gitea 
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v49.go
#	models/models.go
 2017-11-29 20:55:20 +01:00
GiteaBot
033ad9a79f [skip ci] Updated translations via Crowdin 2017-11-29 12:50:43 +00:00
GiteaBot
b9452c48ac [skip ci] Updated translations via Crowdin 2017-11-29 09:11:10 +00:00
GiteaBot
cbc6bbfbeb [skip ci] Updated translations via Crowdin 2017-11-29 01:52:11 +00:00
GiteaBot
0c69b768b9 [skip ci] Updated translations via Crowdin 2017-11-28 09:44:21 +00:00
Ethan Koenig
b7ebaf6d20 Various wiki bug fixes (#2996) 
* Update macaron

* Various wiki bug fixes
 2017-11-28 17:43:51 +08:00