1
0
mirror of https://github.com/go-gitea/gitea.git synced 2024-12-04 14:46:57 -05:00
Commit Graph

1381 Commits

Author SHA1 Message Date
Lunny Xiao
2d71cdb668
Add pull request manually merge instruction (#13840)
* add pull request command line instructions

* Add pull request manually merge instuction

* Fix styles

* Fix lint

* Move inline style to class file

* add space between merge button and hint text

* Add sentence end charcter

* Change the language file

* adjust secondary bg

* further adjustment

Co-authored-by: silverwind <me@silverwind.io>
2020-12-10 03:59:05 +01:00
GiteaBot
b830eca720 [skip ci] Updated translations via Crowdin 2020-12-07 12:09:02 +00:00
GiteaBot
654c480c99 [skip ci] Updated translations via Crowdin 2020-12-04 11:19:46 +00:00
GiteaBot
557479642d [skip ci] Updated translations via Crowdin 2020-12-04 07:34:40 +00:00
6543
48a3bb7a32
User Settings: Ignore empty language codes & validate (#13755) 2020-12-04 08:20:30 +02:00
GiteaBot
5d43d2965a [skip ci] Updated translations via Crowdin 2020-12-03 18:47:16 +00:00
GiteaBot
c2ac1c73f2 [skip ci] Updated translations via Crowdin 2020-11-29 15:53:10 +00:00
GiteaBot
4f82a0b12e [skip ci] Updated translations via Crowdin 2020-11-28 21:01:53 +00:00
a1012112796
9c26dc1f3a
Add block on official review requests branch protection (#13705)
Signed-off-by: a1012112796 <1012112796@qq.com>

Co-authored-by: Lauris BH <lauris@nix.lv>
2020-11-28 21:30:46 +02:00
GiteaBot
72e62ac12b [skip ci] Updated translations via Crowdin 2020-11-25 11:21:50 +00:00
GiteaBot
de1e4b2da9 [skip ci] Updated translations via Crowdin 2020-11-21 22:42:26 +00:00
Norwin
b651409c0a
Improve strings (#13548)
* Correct oauth signup title

When linking accounts, a password is not required anymore,
so this string becomes confusing

* string "remenber me": be more precise

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
2020-11-20 22:32:27 -05:00
GiteaBot
6626a048df [skip ci] Updated translations via Crowdin 2020-11-18 22:01:29 +00:00
GiteaBot
859e3d3db6 [skip ci] Updated translations via Crowdin 2020-11-16 19:23:56 +00:00
GiteaBot
f0ed71251e [skip ci] Updated translations via Crowdin 2020-11-15 16:29:08 +00:00
Chris Shyi
d025d84d91
Add email validity check (#13475)
* Improve error feedback for duplicate deploy keys

Instead of a generic HTTP 500 error page, a flash message is rendered
with the deploy key page template so inform the user that a key with the
intended title already exists.

* API returns 422 error when key with name exists

* Add email validity checking

Add email validity checking for the following routes:
[Web interface]
1. User registration
2. User creation by admin
3. Adding an email through user settings
[API]
1. POST /admin/users
2. PATCH /admin/users/:username
3. POST /user/emails

* Add further tests

* Add signup email tests

* Add email validity check for linking existing account

* Address PR comments

* Remove unneeded DB session

* Move email check to updateUser

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
2020-11-14 11:53:43 -05:00
GiteaBot
d0a676c8ff [skip ci] Updated translations via Crowdin 2020-11-13 17:24:39 +00:00
GiteaBot
ee7133d135 [skip ci] Updated translations via Crowdin 2020-11-12 16:00:39 +00:00
GiteaBot
6838bacc4c [skip ci] Updated translations via Crowdin 2020-11-11 20:35:20 +00:00
GiteaBot
9155f13bf8 [skip ci] Updated translations via Crowdin 2020-11-10 11:45:51 +00:00
GiteaBot
ffa712e783 [skip ci] Updated translations via Crowdin 2020-11-09 18:22:53 +00:00
GiteaBot
ef2ffc6aed [skip ci] Updated translations via Crowdin 2020-11-09 06:16:15 +00:00
GiteaBot
004b40dad0 [skip ci] Updated translations via Crowdin 2020-11-08 18:03:03 +00:00
zeripath
c05a8abc76
Multiple GitGraph improvements: Exclude PR heads, Add branch/PR links, Show only certain branches, (#12766)
* Multiple GitGraph improvements.

Add backend support for excluding PRs, selecting branches and files.

Fix #10327

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

* as per @silverwind

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

* as per @silverwind

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

* Only show refs in dropdown we display on the graph

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

* as per @silverwind

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

* use flexbox for ui header

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

* Move Hide Pull Request button to the dropdown

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

* Add SHA and user pictures

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

* fix test

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

* fix test 2

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

* fixes

* async

* more tweaks

* use tabs in tmpl

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

* remove commented thing

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

* fix linting

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

* Update web_src/js/features/gitgraph.js

Co-authored-by: silverwind <me@silverwind.io>

* graph tweaks

* more tweaks

* add title

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

* fix loading indicator z-index and position

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: Lauris BH <lauris@nix.lv>
2020-11-08 12:21:54 -05:00
GiteaBot
d4e0b28655 [skip ci] Updated translations via Crowdin 2020-11-08 16:30:44 +00:00
GiteaBot
ed47da2e29 [skip ci] Updated translations via Crowdin 2020-11-07 12:55:59 +00:00
GiteaBot
3c7908b51c [skip ci] Updated translations via Crowdin 2020-11-05 19:35:13 +00:00
GiteaBot
5b636bdec7 [skip ci] Updated translations via Crowdin 2020-11-05 14:21:49 +00:00
John Olheiser
7c68ac8f7d
Tags cleanup (#13428)
* Tags cleanup

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

* fmt

Signed-off-by: jolheiser <john.olheiser@gmail.com>
2020-11-05 08:20:42 -06:00
GiteaBot
dd882f6a69 [skip ci] Updated translations via Crowdin 2020-11-04 22:56:17 +00:00
GiteaBot
59c3cf6388 [skip ci] Updated translations via Crowdin 2020-11-04 07:15:15 +00:00
GiteaBot
951a333733 [skip ci] Updated translations via Crowdin 2020-11-03 15:49:01 +00:00
GiteaBot
fa8492fb70 [skip ci] Updated translations via Crowdin 2020-11-03 11:36:19 +00:00
GiteaBot
be880d4063 [skip ci] Updated translations via Crowdin 2020-11-03 06:05:23 +00:00
a1012112796
b687707014
Add the tag list page to the release page (#12096)
* Add the tag list page to the release page

* Add the tags list view
* Add the delete tag way on ui
* Not delete tag and clear message when delete a release

Signed-off-by: a1012112796 <1012112796@qq.com>

* Apply suggestions from code review

Co-authored-by: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: zeripath <art27@cantab.net>

* fix ui

* Add to header

* ui

* permission

* ui

* Update options/locale/locale_en-US.ini

Co-authored-by: Lauris BH <lauris@nix.lv>

* tweaks

* monospace commit hashes

* Add read permission check

* fix permission

* fix nit

* Update web_src/less/_base.less

Co-authored-by: silverwind <me@silverwind.io>

* ui fixes

* title tweaks

* fix lint

* fix test

* fix test and some ui nits

* Apply suggestions from code review

Co-authored-by: silverwind <me@silverwind.io>

Co-authored-by: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: silverwind <me@silverwind.io>
2020-11-02 18:10:22 -05:00
GiteaBot
fc40cdfa89 [skip ci] Updated translations via Crowdin 2020-11-02 15:59:27 +00:00
GiteaBot
8176ba6573 [skip ci] Updated translations via Crowdin 2020-11-01 20:05:29 +00:00
GiteaBot
e7750e0f6a [skip ci] Updated translations via Crowdin 2020-10-31 17:25:33 +00:00
GiteaBot
d01d39d6cf [skip ci] Updated translations via Crowdin 2020-10-31 12:18:38 +00:00
GiteaBot
e16a5bb634 [skip ci] Updated translations via Crowdin 2020-10-30 22:00:02 +00:00
GiteaBot
764237e78c [skip ci] Updated translations via Crowdin 2020-10-30 16:28:07 +00:00
GiteaBot
643a0a691a [skip ci] Updated translations via Crowdin 2020-10-29 21:42:52 +00:00
GiteaBot
bb89fa1aaa [skip ci] Updated translations via Crowdin 2020-10-27 20:07:43 +00:00
GiteaBot
afe9d79104 [skip ci] Updated translations via Crowdin 2020-10-26 16:43:30 +00:00
GiteaBot
dbebc6b0e3 [skip ci] Updated translations via Crowdin 2020-10-26 09:06:29 +00:00
Pedro Alves
c40df54e28
Group Label Changed Comments in timeline (#13304)
* Create function to group label comments

* Combine multiple label additions into one

* Group removed and added labels in the same comment

* Fix indentation on comments.tmpl

Co-authored-by: zeripath <art27@cantab.net>

Co-authored-by: zeripath <art27@cantab.net>
2020-10-25 17:49:48 -04:00
GiteaBot
756c090dbe [skip ci] Updated translations via Crowdin 2020-10-25 20:57:54 +00:00
Divyam Bhasin
7974b34183
#12897 - add mastodon provider (#13293)
* added mastodon provider to oauth code

* changed go.mod and vendor/modules.txt to add updated goth

* vendored mastodon and new goth

* committing result of go mod tidy && go mod vendor

* added pic and mastodon to oauth models

* handled instance url

* applied lafriks suggestion

* Update web_src/js/index.js

Co-authored-by: techknowlogick <matti@mdranta.net>

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: techknowlogick <matti@mdranta.net>
2020-10-25 14:21:49 -04:00
GiteaBot
f565cf5dcf [skip ci] Updated translations via Crowdin 2020-10-25 17:20:28 +00:00
GiteaBot
65dc4d0410 [skip ci] Updated translations via Crowdin 2020-10-24 17:50:51 +00:00