2
0
Commit Graph

592 Commits

Author SHA1 Message Date
GiteaBot
cfa20809f4 [skip ci] Updated translations via Crowdin 2019-02-26 23:10:22 +00:00
GiteaBot
194b1e4841 [skip ci] Updated translations via Crowdin 2019-02-25 10:39:39 +00:00
GiteaBot
cf192b4531 [skip ci] Updated translations via Crowdin 2019-02-19 23:12:29 +00:00
GiteaBot
fad6cb4bc5 [skip ci] Updated translations via Crowdin 2019-02-19 19:28:43 +00:00
GiteaBot
b4f63a7876 [skip ci] Updated translations via Crowdin 2019-02-18 20:57:13 +00:00
Lanre Adelowo
9fe3ab1e74 Implement "conversation lock" for issue comments (#5073) 2019-02-18 22:55:04 +02:00
Rémy Boulanouar
dd49ae1b07 Allow to set organization visibility (public, internal, private) (#1763) 2019-02-18 18:00:27 +02:00
GiteaBot
1e033a8270 [skip ci] Updated translations via Crowdin 2019-02-18 12:37:04 +00:00
GiteaBot
bd9ff6af58 [skip ci] Updated translations via Crowdin 2019-02-17 05:46:51 +00:00
John Olheiser
2a2d8441ba Allow labels to contain emoji (#6063)
* Add emoji to labels
Minor cleanup of tribute code in footer.tmpl

Signed-off-by: jolheiser <john.olheiser@gmail.com>

* Quick find/replace in other i18n files containing label translations

Signed-off-by: jolheiser <john.olheiser@gmail.com>

* Revert "Quick find/replace in other i18n files containing label translations"

This reverts commit ec3e1a3a1775989301bb2c1cd08e8871b317688d.

* Add style to overwrite emoji height in labels

* Revert Makefile change that makes Windows work
2019-02-16 19:33:09 +02:00
GiteaBot
66e634c9fd [skip ci] Updated translations via Crowdin 2019-02-14 18:23:25 +00:00
GiteaBot
66ff39ac4c [skip ci] Updated translations via Crowdin 2019-02-13 15:47:39 +00:00
zeripath
88fc317892 Allow markdown files to read from the LFS (#5787)
This PR makes it possible for the markdown renderer to render images and media straight from the LFS.

Fix #5746

Signed-off-by: Andrew Thornton [art27@cantab.net](mailto:art27@cantab.net)
2019-02-12 15:09:43 +00:00
GiteaBot
6b2cd45967 [skip ci] Updated translations via Crowdin 2019-02-12 08:40:40 +00:00
GiteaBot
8865c75394 [skip ci] Updated translations via Crowdin 2019-02-11 17:12:45 +00:00
Lanre Adelowo
54e1cf08f2 Add option to close issues via commit on a non master branch (#5992)
* fixes #5957

* add tests to make sure config option is respected

* use already defined struct

* - use migration to make the flag repo wide not for the entire gitea instance
Also note that the config value can still be set so as to be able to control the value for new repositories that are to be created

- fix copy/paste error in copyright header year and rearrange import

- use repo config instead of server config value to determine if a commit should close an issue

- update testsuite

* use global config only when creating a new repository

* allow repo admin toggle feature via UI

* fix typo and improve testcase

* fix fixtures

* add DEFAULT prefix to config value

* fix test
2019-02-10 21:27:19 +02:00
GiteaBot
e50febbb69 [skip ci] Updated translations via Crowdin 2019-02-08 16:48:45 +00:00
Lanre Adelowo
bd2f56cb9d Enhance closed PR and Issue status in the list (#6000)
* working version

* Update options/locale/locale_en-US.ini

Co-Authored-By: adelowo <adelowomailbox@gmail.com>

* update templates
2019-02-08 07:53:58 +00:00
GiteaBot
4302e761ac [skip ci] Updated translations via Crowdin 2019-02-08 07:21:32 +00:00
GiteaBot
465da6fa6f [skip ci] Updated translations via Crowdin 2019-02-06 16:20:58 +00:00
GiteaBot
9b59a4fa98 [skip ci] Updated translations via Crowdin 2019-02-05 16:55:17 +00:00
Lunny Xiao
2e9bdfcb89 Pull request conflict files detection (#5951)
* add conflict detection

* test pull request conflict files

* fix detection files number

* fix comments
2019-02-05 06:54:49 -05:00
GiteaBot
4a9e9444b8 [skip ci] Updated translations via Crowdin 2019-02-05 11:40:36 +00:00
Lanre Adelowo
455ba5e5d0 Automatically clear stopwatch on merging a PR (#4327)
* Don't display buttons if there are no notices

* clear stopwatch on merging a PR

* remove redundant gt check

* use ctx.Flash as per @bkcsoft comment

* stop timer on closing issues/PRs too

* updated translation as per review

* redirect to login page after successfully activating account

* remove unrelated changes

* stop timer for issues that are closed via commits too..Not just the 'close' UI button
2019-02-05 13:38:11 +02:00
GiteaBot
d6d5dc4986 [skip ci] Updated translations via Crowdin 2019-02-04 15:23:15 +00:00
GiteaBot
4cc9d07aa9 [skip ci] Updated translations via Crowdin 2019-02-04 00:59:52 +00:00
zeripath
396b45f25c Fix ssh deploy and user key constraints (#1357) (#5939)
1. A key can either be an ssh user key or a deploy key. It cannot be both.
2. If a key is a user key - it can only be associated with one user.
3. If a key is a deploy key - it can be used in multiple repositories and the permissions it has on those repositories can be different.
4. If a repository is deleted, its deploy keys must be deleted too.

We currently don't enforce any of this and multiple repositories access with different permissions doesn't work at all. This PR enforces the following constraints:

- [x] You should not be able to add the same user key as another user
- [x] You should not be able to add a ssh user key which is being used as a deploy key
- [x] You should not be able to add a ssh deploy key which is being used as a user key
- [x] If you add an ssh deploy key to another repository you should be able to use it in different modes without losing the ability to use it in the other mode.
- [x] If you delete a repository you must delete all its deploy keys.

Fix #1357
2019-02-03 23:56:53 +00:00
GiteaBot
19f3bb4a29 [skip ci] Updated translations via Crowdin 2019-01-31 13:39:54 +00:00
GiteaBot
8d1a7abe1a [skip ci] Updated translations via Crowdin 2019-01-29 21:28:45 +00:00
GiteaBot
f5908ba482 [skip ci] Updated translations via Crowdin 2019-01-28 15:55:40 +00:00
Lanre Adelowo
fefa5b5887 Fix "pulls.blocked_by_approvals" text (#5879) 2019-01-28 10:05:20 -05:00
GiteaBot
25396ad679 [skip ci] Updated translations via Crowdin 2019-01-28 14:16:11 +00:00
zeripath
78d440dbf5 Fix wording of #5858 issue.review.reject string (#5869)
As per @lafriks comment this should be: requested changes

Signed-off-by: Andrew Thornton <art27@cantab.net>
2019-01-27 19:39:49 +02:00
GiteaBot
0dd4338c58 [skip ci] Updated translations via Crowdin 2019-01-27 11:31:56 +00:00
GiteaBot
5b147436dd [skip ci] Updated translations via Crowdin 2019-01-27 09:27:05 +00:00
Lanre Adelowo
a8e8bb039d Rename reject to 'request changes' (#5858)
* remame reject to 'request changes

* make usee of requested changes in issue's view content
2019-01-26 12:20:56 -05:00
GiteaBot
2b2f0d444d [skip ci] Updated translations via Crowdin 2019-01-26 00:17:00 +00:00
GiteaBot
81304b4915 [skip ci] Updated translations via Crowdin 2019-01-24 15:23:19 +00:00
GiteaBot
8eb1aad231 [skip ci] Updated translations via Crowdin 2019-01-24 14:22:36 +00:00
GiteaBot
abde31d361 [skip ci] Updated translations via Crowdin 2019-01-23 20:11:56 +00:00
kolaente
12c54a0405 Feature: Archive repos (#5009) 2019-01-23 13:58:38 -05:00
GiteaBot
91300ab0ee [skip ci] Updated translations via Crowdin 2019-01-22 20:31:11 +00:00
GiteaBot
64e61a72b3 [skip ci] Updated translations via Crowdin 2019-01-21 17:53:09 +00:00
Lanre Adelowo
df5dae2dc6 Disallow empty titles (#5785)
* add util method and tests

* make sure the title of an issue cannot be empty

* wiki title cannot be empty

* pull request title cannot be empty

* update to make use of the new util methof
2019-01-21 13:45:32 +02:00
GiteaBot
d6b342f302 [skip ci] Updated translations via Crowdin 2019-01-21 10:14:44 +00:00
GiteaBot
c2e4d94f58 [skip ci] Updated translations via Crowdin 2019-01-19 21:19:01 +00:00
GiteaBot
97c9936673 [skip ci] Updated translations via Crowdin 2019-01-19 20:41:54 +00:00
Lanre Adelowo
4998941cda Fix wording when user is unassigned from an issue (#5769)
Previous Gitea would display that the user had unassigned themselves even if the actor
was not the user. Fixes #4418
2019-01-19 19:16:46 +00:00
GiteaBot
4cd84df8f8 [skip ci] Updated translations via Crowdin 2019-01-19 16:31:25 +00:00
GiteaBot
ee4609175d [skip ci] Updated translations via Crowdin 2019-01-18 14:52:26 +00:00