Commit Graph

614 Commits

Author SHA1 Message Date
GiteaBot 0c840a924a [skip ci] Updated translations via Crowdin 2019-02-06 16:20:58 +00:00
GiteaBot 1772893505 [skip ci] Updated translations via Crowdin 2019-02-05 16:55:17 +00:00
Lunny Xiao bf4badad1d 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 680a57ce92 [skip ci] Updated translations via Crowdin 2019-02-05 11:40:36 +00:00
Lanre Adelowo 5390791224 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 5bd594c858 [skip ci] Updated translations via Crowdin 2019-02-04 15:23:15 +00:00
GiteaBot f21ae12abb [skip ci] Updated translations via Crowdin 2019-02-04 00:59:52 +00:00
zeripath 01c10a951b
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 98feb0ef4d [skip ci] Updated translations via Crowdin 2019-01-31 13:39:54 +00:00
GiteaBot 002e898bcf [skip ci] Updated translations via Crowdin 2019-01-29 21:28:45 +00:00
GiteaBot bc748f205a [skip ci] Updated translations via Crowdin 2019-01-28 15:55:40 +00:00
Lanre Adelowo 7461c5a75f Fix "pulls.blocked_by_approvals" text (#5879) 2019-01-28 10:05:20 -05:00
GiteaBot 56415fa2fc [skip ci] Updated translations via Crowdin 2019-01-28 14:16:11 +00:00
zeripath 182a6d6885 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 34a1c4c514 [skip ci] Updated translations via Crowdin 2019-01-27 11:31:56 +00:00
GiteaBot 2d8520d039 [skip ci] Updated translations via Crowdin 2019-01-27 09:27:05 +00:00
Lanre Adelowo b8a81cb1b8 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 ac766fe3de [skip ci] Updated translations via Crowdin 2019-01-26 00:17:00 +00:00
GiteaBot 62da3bee1a [skip ci] Updated translations via Crowdin 2019-01-24 15:23:19 +00:00
GiteaBot 4aa2f4f45f [skip ci] Updated translations via Crowdin 2019-01-24 14:22:36 +00:00
GiteaBot b9f87376a2 [skip ci] Updated translations via Crowdin 2019-01-23 20:11:56 +00:00
kolaente 0b510725c9 Feature: Archive repos (#5009) 2019-01-23 13:58:38 -05:00
GiteaBot 6a949af8ca [skip ci] Updated translations via Crowdin 2019-01-22 20:31:11 +00:00
GiteaBot 2d9456137e [skip ci] Updated translations via Crowdin 2019-01-21 17:53:09 +00:00
Lanre Adelowo e1fcd6b742 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 8a92544a3e [skip ci] Updated translations via Crowdin 2019-01-21 10:14:44 +00:00
GiteaBot fba1f14779 [skip ci] Updated translations via Crowdin 2019-01-19 21:19:01 +00:00
GiteaBot f54e0d2f16 [skip ci] Updated translations via Crowdin 2019-01-19 20:41:54 +00:00
Lanre Adelowo c212c98463 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 ac0d5517f4 [skip ci] Updated translations via Crowdin 2019-01-19 16:31:25 +00:00
GiteaBot af45648e26 [skip ci] Updated translations via Crowdin 2019-01-18 14:52:26 +00:00
GiteaBot b0478f1c42 [skip ci] Updated translations via Crowdin 2019-01-18 03:32:53 +00:00
GiteaBot 7d65ddf5e1 [skip ci] Updated translations via Crowdin 2019-01-18 00:01:50 +00:00
zeripath 07802a2bc5 Refactor repo.isBare to repo.isEmpty #5629 (#5714)
* Refactor repo.isBare to repo.isEmpty #5629

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Remove Sync call
2019-01-17 19:01:04 -05:00
GiteaBot ca3b9aa6a3 [skip ci] Updated translations via Crowdin 2019-01-15 21:33:19 +00:00
GiteaBot 5a081c7a80 [skip ci] Updated translations via Crowdin 2019-01-14 19:17:19 +00:00
techknowlogick 5c44f751a3
Discord Oauth2 support (#4476)
* add discord auth

* add vendor for discord

* fix syntax error

* make fmt

* update version of goth in use

* update markbates/goth
2019-01-13 14:06:22 -05:00
GiteaBot bf7a11254d [skip ci] Updated translations via Crowdin 2019-01-12 16:15:40 +00:00
Lanre Adelowo abb364f442 allow user fork repo even when as a guest.. This will prompt the user to login and if authentication was successful, the user will be redirected to fork the repo (#5690) 2019-01-10 23:25:14 -05:00
GiteaBot 6630a33ec1 [skip ci] Updated translations via Crowdin 2019-01-11 04:00:31 +00:00
GiteaBot c04fc677b5 [skip ci] Updated translations via Crowdin 2019-01-09 17:24:47 +00:00
Lanre Adelowo 8d2c24f7f9 Allow for user specific themes (#5668)
* add migration and basic UI for changing a user's theme

* update user themem

* use right text on button

* load theme based on users' selection

* load theme based on users' selection in pwa too

* update sample config

* delete older theme loading

* implement AfterLoad to set users' theme properly

* set up default theme when creating a user. This uses the installation wide theme

* use flash messages for error

* set default theme when creating a user from the cli

* fix @lunny review
2019-01-09 12:22:57 -05:00
GiteaBot 405414d14e [skip ci] Updated translations via Crowdin 2019-01-04 16:16:40 +00:00
GiteaBot 5a1ea37f57 [skip ci] Updated translations via Crowdin 2019-01-04 09:23:34 +00:00
GiteaBot 9863591dca [skip ci] Updated translations via Crowdin 2019-01-03 10:19:43 +00:00
GiteaBot f5be13efb6 [skip ci] Updated translations via Crowdin 2019-01-02 12:59:14 +00:00
GiteaBot 64995bae0f [skip ci] Updated translations via Crowdin 2018-12-31 12:03:07 +00:00
Lanre Adelowo 945804f800 Webhook for Pull Request approval/rejection (#5027) 2018-12-27 13:04:30 -05:00
Julian 4a685f8b87 Add rebase with merge commit merge style (#3844) (#4052)
Signed-off-by: Julian Tölle <julian.toelle97@gmail.com>
2018-12-27 12:27:08 +02:00
GiteaBot b0b35493ec [skip ci] Updated translations via Crowdin 2018-12-26 19:16:27 +00:00
GiteaBot 4586ae390f [skip ci] Updated translations via Crowdin 2018-12-24 11:12:56 +00:00
GiteaBot 8dc09edb04 [skip ci] Updated translations via Crowdin 2018-12-19 13:00:35 +00:00
GiteaBot 8730ee0e45 [skip ci] Updated translations via Crowdin 2018-12-17 14:08:30 +00:00
GiteaBot 49ea6e0deb [skip ci] Updated translations via Crowdin 2018-12-12 21:02:34 +00:00
GiteaBot 0bd802e3e1 [skip ci] Updated translations via Crowdin 2018-12-12 15:19:11 +00:00
Jonas Franz 9681c83734 Approvals at Branch Protection (#5350)
* Add branch protection for approvals

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Add required approvals

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Add missing comments and fmt

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Add type = approval and group by reviewer_id to review

* Prevent users from adding negative review limits

* Add migration for approval whitelists

Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-12-11 19:28:37 +08:00
GiteaBot 205a533645 [skip ci] Updated translations via Crowdin 2018-12-11 01:12:24 +00:00
GiteaBot 8a64e67456 [skip ci] Updated translations via Crowdin 2018-12-10 20:03:39 +00:00
Lunny Xiao 7c0c965532 Improve team members and repositories settings UI (#5457)
* improve team members and repositories settings UI

* use tab on team pages

* add default description on team members and repos

* add blank on numbers and texts

* improve translation
2018-12-09 08:42:11 +02:00
GiteaBot fdec258c8d [skip ci] Updated translations via Crowdin 2018-12-04 22:42:54 +00:00
GiteaBot ce4885f761 [skip ci] Updated translations via Crowdin 2018-12-02 16:10:08 +00:00
GiteaBot bc42b3ab6c [skip ci] Updated translations via Crowdin 2018-12-01 06:07:46 +00:00
GiteaBot c761625c69 [skip ci] Updated translations via Crowdin 2018-11-30 13:01:54 +00:00
GiteaBot c8a9384a70 [skip ci] Updated translations via Crowdin 2018-11-30 08:51:59 +00:00
Lanre Adelowo 0787056e07 Allow to add organization members as collaborators on organization owned repositories (#4748)
repository... Fixes #4507
2018-11-30 10:49:55 +02:00
GiteaBot a7ee4a6e95 [skip ci] Updated translations via Crowdin 2018-11-29 16:49:36 +00:00
Lunny Xiao 2dc805c0c6
Milestone issues and pull requests (#5293)
* add milestone issues and pulls page instead of redirecting issues page

* add milestone when creating issue from milestone page

* refactor to merge similiar codes as a new function issues

* remove milestone info on milestone issues list

* fix missing params
2018-11-29 09:46:30 +08:00
GiteaBot c03a9b3e42 [skip ci] Updated translations via Crowdin 2018-11-26 19:24:15 +00:00
GiteaBot 6467934d29 [skip ci] Updated translations via Crowdin 2018-11-23 07:16:27 +00:00
kolaente 0dcf31ae49 Show review summary in pull requests (#5132) 2018-11-22 15:17:36 +02:00
GiteaBot 4651ba06c1 [skip ci] Updated translations via Crowdin 2018-11-18 18:27:47 +00:00
GiteaBot e033d217e9 [skip ci] Updated translations via Crowdin 2018-11-16 11:14:34 +00:00
GiteaBot e110943562 [skip ci] Updated translations via Crowdin 2018-11-15 01:01:52 +00:00
Lanre Adelowo b97af15de6 Block registration based on email domain (#5157)
* implement email domain whitelist
2018-11-14 20:00:04 -05:00
GiteaBot d487a76ee2 [skip ci] Updated translations via Crowdin 2018-11-09 12:07:58 +00:00
GiteaBot 2852c3576a [skip ci] Updated translations via Crowdin 2018-11-09 06:18:32 +00:00
Jonas Bröms 599adde1bc Add option to disable automatic mirror syncing. (#5242)
Setting the interval to 0 will disable to automatic syncing.
2018-11-08 18:58:02 -05:00
GiteaBot e8b197d6f6 [skip ci] Updated translations via Crowdin 2018-11-07 04:50:40 +00:00
GiteaBot 4b84928874 [skip ci] Updated translations via Crowdin 2018-11-01 13:42:58 +00:00
GiteaBot c8b4c7af65 [skip ci] Updated translations via Crowdin 2018-10-31 20:58:56 +00:00
GiteaBot 98ea1a5143 [skip ci] Updated translations via Crowdin 2018-10-30 15:20:31 +00:00
GiteaBot 5fc0a12627 [skip ci] Updated translations via Crowdin 2018-10-30 06:22:29 +00:00
GiteaBot aefeb8c465 [skip ci] Updated translations via Crowdin 2018-10-30 03:08:04 +00:00
Jonas Bröms db30d6d791 Serve audio files using HTML5 audio tag (#5221)
* Serve audio files using HTML5 audio tag

* Correct copy paste error
2018-10-30 10:17:26 +08:00
GiteaBot d4e6278764 [skip ci] Updated translations via Crowdin 2018-10-29 13:50:58 +00:00
GiteaBot abf6e0d90b [skip ci] Updated translations via Crowdin 2018-10-29 01:31:15 +00:00
AJ ONeal b8451190d8 UX of link account (Step 1) (#5006)
* Show either sign up OR sign in

* disambiguate fresh start from adding recovery options

* use tabs to switch between account link flows

* add active to tab body as well

* changes as per discussion

* handle specific error; fix missing err typo
2018-10-28 18:46:16 -04:00
briolantonio f887085ee0 Update TRANSLATORS (#5194)
Hi,
I'm the guy who translated gitea during June in Italian.
I would like to have my name added to the translators list.
I translated nearly a thousand and a half words.
Thank you.
2018-10-26 13:37:36 -04:00
GiteaBot e500b82c2c [skip ci] Updated translations via Crowdin 2018-10-26 09:40:17 +00:00
GiteaBot 890a0c3cee [skip ci] Updated translations via Crowdin 2018-10-25 08:52:17 +00:00
GiteaBot 7e5eec430d [skip ci] Updated translations via Crowdin 2018-10-24 13:17:43 +00:00
kolaente 6759237eda User action heatmap (#5131)
* Added basic heatmap data

* Added extra case for sqlite

* Built basic heatmap into user profile

* Get contribution data from api & styling

* Fixed lint & added extra group by statements for all database types

* generated swagger spec

* generated swagger spec

* generated swagger spec

* fixed swagger spec

* fmt

* Added tests

* Added setting to enable/disable user heatmap

* Added locale for loading text

* Removed UseTiDB

* Updated librejs & moment.js

* Fixed import order

* Fixed heatmap in postgresql

* Update docs/content/doc/advanced/config-cheat-sheet.en-us.md

Co-Authored-By: kolaente <konrad@kola-entertainments.de>

* Added copyright header

* Fixed a bug to show the heatmap for the actual user instead of the currently logged in

* Added integration test for heatmaps

* Added a heatmap on the dashboard

* Fixed timestamp parsing

* Hide heatmap on mobile

* optimized postgresql group by query

* Improved sqlite group by statement
2018-10-23 10:57:42 +08:00
GiteaBot 47e4efe0c5 [skip ci] Updated translations via Crowdin 2018-10-19 13:38:43 +00:00
GiteaBot 384ef124e7 [skip ci] Updated translations via Crowdin 2018-10-18 00:02:30 +00:00
GiteaBot 25def0a808 [skip ci] Updated translations via Crowdin 2018-10-17 17:07:45 +00:00
GiteaBot 8683c72483 [skip ci] Updated translations via Crowdin 2018-10-17 11:23:21 +00:00
GiteaBot 2e2eacf62a [skip ci] Updated translations via Crowdin 2018-10-02 19:22:42 +00:00
GiteaBot b8d048fa0d [skip ci] Updated translations via Crowdin 2018-09-29 22:45:10 +00:00
GiteaBot 39735723f5 [skip ci] Updated translations via Crowdin 2018-09-27 00:51:27 +00:00
GiteaBot 79b4d4729c [skip ci] Updated translations via Crowdin 2018-09-25 12:37:54 +00:00