Commit Graph

321 Commits

Author SHA1 Message Date
kolaente
2f136fcedc
Merge branch 'master' of https://github.com/go-gitea/gitea
# Conflicts:
#	public/js/index.js
2018-04-13 15:11:47 +02:00
Lunny Xiao
bec69f702b
Add topic support (#3711)
* add topic models and unit tests

* fix comments

* fix comment

* add the UI to show or add topics for a repo

* show topics on repositories list

* fix test

* don't show manage topics link when no permission

* use green basic as topic label

* fix topic label color

* remove trace content

* remove debug function
2018-04-11 10:51:44 +08:00
kolaente
7b26e2c92e
merge into master 2018-04-10 15:46:43 +02:00
GiteaBot
1946ce2954 [skip ci] Updated translations via Crowdin 2018-04-10 12:40:23 +00:00
Bwko
8ee45eb614 Add EnableTimetracking option to app settings (#3719) 2018-04-09 23:15:32 +08:00
GiteaBot
7000b41851 [skip ci] Updated translations via Crowdin 2018-04-04 21:09:19 +00:00
GiteaBot
5512ed3699 [skip ci] Updated translations via Crowdin 2018-04-04 12:01:02 +00:00
kolaente
a25e1dd0cf
Merge branch 'master' of https://github.com/go-gitea/gitea
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v59.go
#	modules/auth/repo_form.go
2018-04-03 11:16:37 +02:00
GiteaBot
36ea53332d [skip ci] Updated translations via Crowdin 2018-03-29 13:34:02 +00:00
GiteaBot
a8beef890d [skip ci] Updated translations via Crowdin 2018-03-29 01:41:06 +00:00
GiteaBot
4c6e170ceb [skip ci] Updated translations via Crowdin 2018-03-27 14:14:57 +00:00
Allen Wild
15c6bb500b Add repository setting to enable/disable health checks (#3607)
New Feature:
  * Repository struct field for IsFsckEnabled (default true of course)
  * Admin Settings section on repo options page, accessible only by
    admin users

Possible Enhancements:
  * There's no way to force running health checks on all repos
    regardless of their IsFsckEnabled setting. This would be useful if
    there were an admin API or dashboard button to run fsck immediately.

Issue: https://github.com/go-gitea/gitea/issues/1712
Signed-off-by: Allen Wild <allenwild93@gmail.com>
2018-03-27 22:13:20 +08:00
Chri-s
9350ba7947 Add protected branch whitelists for merging (#3689)
* Add database migrations for merge whitelist

* Add merge whitelist settings for protected branches

* Add checks for merge whitelists
2018-03-25 13:01:32 +03:00
GiteaBot
04b7fd87b9 [skip ci] Updated translations via Crowdin 2018-03-23 14:12:13 +00:00
GiteaBot
05abd03011 [skip ci] Updated translations via Crowdin 2018-03-20 21:40:24 +00:00
kolaente
7a57b6d979
Merge remote-tracking branch 'upstream/master' 2018-03-20 19:42:52 +01:00
GiteaBot
47422c2635 [skip ci] Updated translations via Crowdin 2018-03-19 14:30:44 +00:00
kolaente
2950021ddf
Merge branch 'master' of https://github.com/go-gitea/gitea
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v58.go
2018-03-18 15:23:32 +01:00
GiteaBot
c28bf94252 [skip ci] Updated translations via Crowdin 2018-03-18 01:33:53 +00:00
kolaente
88aef6eea9 Codesearch message fix (#3684) 2018-03-18 03:32:36 +02:00
GiteaBot
86bf3704ea [skip ci] Updated translations via Crowdin 2018-03-17 03:55:24 +00:00
GiteaBot
1324d62cd3 [skip ci] Updated translations via Crowdin 2018-03-16 14:05:58 +00:00
Lunny Xiao
9e5d0a09eb
Global code search support (#3664)
* add global code search on explore

* fix bug when no anyone public repos

* change the icon

* fix typo and add UnitTypeCode check for login non-admin user

* fix ui description when no match
2018-03-16 22:04:33 +08:00
GiteaBot
4163cdf3ea [skip ci] Updated translations via Crowdin 2018-03-15 21:14:38 +00:00
Lauris BH
c0d41b1b77 Add label descriptions (#3662)
* Add label descriptions

* Add default descriptions to label template
2018-03-13 10:03:55 +08:00
GiteaBot
575c109a02 [skip ci] Updated translations via Crowdin 2018-03-12 10:00:16 +00:00
kolaente
4f94a01b15
Merge branch 'master' of https://github.com/go-gitea/gitea 2018-03-11 16:17:47 +01:00
bugreport0
b333e7129d Add separate string for the 'Create Team' button. (#3647)
* Add separate string for the 'Create Team' button.

* Add separate string for the 'Create Team' button.
2018-03-09 19:37:24 +02:00
GiteaBot
f0aee3c467 [skip ci] Updated translations via Crowdin 2018-03-09 01:22:23 +00:00
Lunny Xiao
20ed1e949e
Merge branch 'master' into master 2018-03-07 23:57:36 +08:00
GiteaBot
d71f510c62 [skip ci] Updated translations via Crowdin 2018-03-07 06:45:23 +00:00
bugreport0
9fc418a652 Add string to confirm wiki data erasure (#3629)
* Add a string to confirm wiki data erasure.

* Add a string to confirm wiki data erasure.
2018-03-06 15:25:21 +08:00
GiteaBot
7ea7c57406 [skip ci] Updated translations via Crowdin 2018-03-04 02:46:24 +00:00
GiteaBot
990709da8f [skip ci] Updated translations via Crowdin 2018-03-02 20:32:20 +00:00
GiteaBot
f44c31f869 [skip ci] Updated translations via Crowdin 2018-03-02 09:11:11 +00:00
Allen Wild
8606d9f5bc Add admin dashboard option to run health checks (#3606)
There's one for git gc, why not git fsck too?

Also add a couple more trace logs to GitFsck to see progress
2018-03-02 11:09:43 +02:00
kolaente
5852b7c9f3
Merge branch 'master' into master 2018-02-27 20:06:12 +01:00
kolaente
b4f406c8cf Fixed lang 2018-02-27 18:27:35 +01:00
GiteaBot
2cd3622ddc [skip ci] Updated translations via Crowdin 2018-02-27 07:10:26 +00:00
kolaente
32db1b36f5
Merge branch 'master' of https://github.com/go-gitea/gitea
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v57.go
2018-02-19 08:33:31 +01:00
GiteaBot
fb2c176491 [skip ci] Updated translations via Crowdin 2018-02-18 21:20:48 +00:00
GiteaBot
e59fe7c8d9 [skip ci] Updated translations via Crowdin 2018-02-18 14:39:52 +00:00
GiteaBot
b29c358315 [skip ci] Updated translations via Crowdin 2018-02-16 14:03:54 +00:00
bugreport0
9303fc2015 Fix ellipses, 'a[n]' and 'username' (issue #3512). (#3518) 2018-02-16 08:02:40 -06:00
GiteaBot
4b48a45bac [skip ci] Updated translations via Crowdin 2018-02-16 01:57:33 +00:00
Konrad
64e61d6aa5 Merge branch 'master' of https://github.com/go-gitea/gitea 2018-02-15 20:03:44 +01:00
Jonas Franz
e87c063c90 Add missing licenses (#3497)
Signed-off-by:  Jonas Franz <info@jonasfranz.de>
2018-02-13 07:10:40 +02:00
Jonas Franz
421c9fa4a5
Merge branch 'master' into master 2018-02-12 20:39:38 +01:00
Jonas Franz
fbdc00f464 Updating generate-licenses.go to fetch licenses from maintained repository. (#3484)
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-02-12 20:20:30 +02:00
Konrad
16b1636043
Merge branch 'master' of https://github.com/go-gitea/gitea 2018-02-12 17:20:47 +01:00