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

156 Commits

Author SHA1 Message Date
kolaente
77cf3dbf72
Merge branch 'master' into master 2018-02-17 11:50:57 +01:00
bugreport0
9303fc2015 Fix ellipses, 'a[n]' and 'username' (issue #3512). (#3518) 2018-02-16 08:02:40 -06:00
Konrad
647296ce63
Merge branch 'master' of https://github.com/go-gitea/gitea 2018-01-21 16:23:15 +01:00
Ethan Koenig
d29aa76777 Fix en-US locale (#3371) 2018-01-15 00:27:57 +02: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
Antoine GIRARD
079273e2ff Add MSSQL to supported database list of intall page (#3359) 2018-01-12 19:23:28 +02: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
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
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
12c0093e40
Merge branch 'master' into master 2018-01-02 13:24:14 +01:00
Piotr Orzechowski
50b7ba1b70 Fix MS AD Search Attributes English translation (#3282) 2018-01-02 10:37:16 +08: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
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
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
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
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
Ethan Koenig
b7ebaf6d20 Various wiki bug fixes (#2996) 
* Update macaron

* Various wiki bug fixes
 2017-11-28 17:43:51 +08:00
Konrad
fc35252f68
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-11-26 18:41:38 +01:00
kolaente
a57bcf1103
Added more specific error when creating a new dependency if it already exists 2017-11-26 18:41:23 +01:00
Lunny Xiao
10b54df2b2 Add dingtalk webhook (#2777) 
* add dingtalk webhook type

* add vendor

* some fixes

* fix name check

* fix name check & improvment
 2017-11-21 06:26:43 +02:00
Michael Kuhn
420fc8efc2 Disable add key button if SSH is disabled (#2873) 2017-11-21 11:49:33 +08:00
Lauris BH
a6f337046f Update go-ini dependency and remove semicolon hack in translations (#2913) 2017-11-15 11:34:42 +08:00
Ethan Koenig
bd23e36bec Add owner to delete repo message (#2886) 2017-11-15 09:37:16 +08:00
Konrad
f38b3b4ce5
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-11-13 18:12:06 +01:00
Lauris BH
134958fd9f
Fix localization texts that contain semicolon (#2900) 2017-11-13 09:56:10 +02:00
Konrad
9e9d8b9b71
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-11-06 21:25:46 +01:00
Lauris BH
266ebf8200 Revert en-US locale (#2821) 2017-11-02 00:03:10 +08:00
Konrad
d1df4ec2b0
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-11-01 15:09:43 +01:00
lunny
1ccaddcfbb '[skip ci] Updated translations via Crowdin' 2017-11-01 12:53:57 +00:00
Konrad
6b3a51abaa
Removed unrelated changes in locales 2017-11-01 11:41:47 +01:00
Konrad
5e4b6fc00c
Removed unrelated changes in locales 2017-11-01 11:23:56 +01:00
Konrad Langenberg
30fe97a55e Merge branch 'master' of https://github.com/go-gitea/gitea 
Signed-off-by: Konrad <konrad@kola-entertainments.de>

# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v46.go
#	models/repo.go
#	public/js/index.js
 2017-10-30 21:17:36 +01:00
Konrad Langenberg
c5992f51c3 Fixed translation issue 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
 2017-10-28 18:13:44 +02:00
Omar Assadi
1da17db717 Fix Various Grammar Issues and Adjust Unnatural Wording (#2737) 
* Fix Comma Splices

Replace comma splices with more fitting punctuation—usually semicolons.

Signed-off-by: Omar Assadi <omar@assadi.ru>

* Turn Some Conjunctions into Sentences

Turn conjunctions—which are capable of standing on their own—into their standalone sentences.

Signed-off-by: Omar Assadi <omar@assadi.ru>

* Reword Sections and Fix Issues in Docs

Reword sections of the contributing docs and readme file to be more
natural and clear. Additionally, fix the majority of the grammar
mistakes.

Signed-off-by: Omar Assadi <omar@assadi.co.il>
 2017-10-28 18:22:44 +03:00
Ethan Koenig
5866eb2321 Code/repo search (#2582) 
Indexed search of repository contents (for default branch only)
 2017-10-27 09:10:54 +03:00
Jonas Bröms
4d01ecaef3 Show Sendmail settings on admin config page (#2782) 
* Show Sendmail settings on admin config page

* Remove unecessary if statement
 2017-10-26 16:47:16 +08:00
Bwko
3ab580c8d6 Add branch overiew page (#2108) 
* Add branch overiew page

* fix changed method name on sub menu

* remove unused code
 2017-10-26 08:49:16 +08:00
Patrick G
bc8d72666c Admin grammar fixes and improvements (#2056) 2017-10-21 16:30:21 +03:00
Lunny Xiao
9e865cee67 Merge password and 2fa page on user settings (#2695) 
* merge password and 2fa page on user settings
 2017-10-16 11:14:12 +02:00
Lauris BH
f3833b7ce4 Create new branch from branch selection dropdown (#2130) 
* Create new branch from branch selection dropdown and rewrite it to VueJS

* Make updateLocalCopyToCommit as not exported

* Move branch name validation to model

* Fix possible race condition
 2017-10-15 22:59:24 +03:00
Ethan Koenig
c25303b11c Fix activity locale (#2709) 2017-10-15 21:30:26 +03:00
Lauris BH
32ca299650 Remove direct user adding to organization members (#2641) 2017-10-15 10:24:24 +08:00
Lauris BH
f42dbdbae5 Add Activity page to repository (#2674) 
* Add Activity page to repository

* Add request data for activity

* Add issue data for activity

* Add user unit right checks

* Add releases to activity

* Log repository unit loading error
 2017-10-15 02:17:39 +03:00