wanderer/gitea
1
0
Fork 0
forked from mirror/gitea
Code Issues Pull Requests Releases Activity
11,145 Commits 2 Branches 0 Tags 167 MiB
855a4f476e
Commit Graph

432 Commits

Author SHA1 Message Date
Norwin
855a4f476e
don't show project cog in issue sidebar if no permission (#14953) 2021-03-12 16:14:02 +01:00
zeripath
beed5476e2
Prevent panic when empty MilestoneID in repo/issue/list (#14911) 
This PR adds a simple check to only test the MilestoneID if it is not empty.

Fix #14906

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

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2021-03-07 10:25:54 +08:00
a1012112796
a5279b74b6
Make manual merge autodetection optional and add manual merge as merge method (#12543) 
* Make auto check manual merge as a chooseable mod and add manual merge way on ui

as title, Before this pr, we use same way with GH to check manually merge.
It good, but in some special cases, misjudgments can occur. and it's hard
to fix this bug. So I add option to allow repo manager block "auto check manual merge"
function, Then it will have same style like gitlab(allow empty pr). and to compensate for
not being able to detect THE PR merge automatically, I added a manual approach.

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

* make swager

* api support

* ping ci

* fix TestPullCreate_EmptyChangesWithCommits

* Apply suggestions from code review

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

* Apply review suggestions and add test

* Apply suggestions from code review

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

* fix build

* test error message

* make fmt

* Fix indentation issues identified by @silverwind

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

* Fix tests and make manually merged disabled error on API the same

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

* a small nit

* fix wrong commit id error

* fix bug

* simple test

* fix test

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2021-03-03 22:41:23 -05:00
6543
dc081959db
Fix issue/pul sidebar (#14826) 2021-02-28 15:05:55 +01:00
Norwin
d38ae597e1
Add UI to delete tracked times (#14100) 
Co-authored-by: 6543 <6543@obermui.de>
 2021-02-19 12:52:11 +02:00
Jimmy Praet
4c82485424
#14699 Make branch names in PR description clickable (#14716) 2021-02-18 03:45:49 +01:00
a1012112796
ac701637b4
Add dismiss review feature (#12674) 
* Add dismiss review feature

refs:
    https://github.blog/2016-10-12-dismissing-reviews-on-pull-requests/
    https://developer.github.com/v3/pulls/reviews/#dismiss-a-review-for-a-pull-request

* change modal ui and error message

* Add unDismissReview api

Signed-off-by: a1012112796 <1012112796@qq.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: 6543 <6543@obermui.de>
 2021-02-11 18:32:25 +01:00
zeripath
378acc9d96
Use OldRef instead of CommitSHA for DeleteBranch comments (#14604) 
Fix #14545

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

Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
 2021-02-08 11:09:14 +08:00
Lunny Xiao
cfa57dde66
Fix bug that username missed on issue list assignee filter (#14481) 
Co-authored-by: 6543 <6543@obermui.de>
 2021-01-27 20:47:00 +08:00
Jimmy Praet
91e59a6690
Don't show "Reference in new issue" when issues unit is globally disabled (#14437) 
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
 2021-01-23 11:58:22 +08:00
Norwin
b5570d3e68
Display current stopwatch in navbar (#14122) 
* add notification about running stopwatch to header

* serialize seconds, duration in stopwatches api

* ajax update stopwatch

i should get my testenv working locally...

* new variant: hover dialog

* noscript compatibility

* js: live-update stopwatch time

* js live update robustness
 2021-01-21 15:51:52 +01:00
KN4CK3R
56a8929605
Comment - Reference in new issue (#14366) 
* Implemented "Reference in new issue"

* Fixed menu style on "pulls/x/files" because "button" has a style.

* Added context menu for PR file comments.

* Use only a single modal for every comment.

* Use current repository as default. Added search filter.

* Added suggested changes.

* Fixed assignment.

Co-authored-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: 6543 <6543@obermui.de>
 2021-01-21 14:51:17 +01:00
Kyle D
41e19b93a2
Align dropdown right (#14406) 2021-01-20 02:08:21 +01:00
KN4CK3R
8d0e331c0a
Removed invalid form tag (#14391) 
introduced by #5073
 2021-01-19 04:02:47 +01:00
Lauris BH
ca63a9d3f1
Add edit, delete and reaction support to code review comments on issue page (#14339) 2021-01-17 19:29:10 +02:00
Jimmy Praet
acb1ceb1f4
Add review requested filter on pull request overview (#13701) 
* Add review requested filter on pull request overview #13682

fix formatting

* add review_requested filter to /repos/issues/search API endpoint

* only Approve and Reject status should supersede Request status

* add support for team reviews

* refactor: remove duplication of issue filtering conditions
 2021-01-17 17:34:19 +01:00
Norwin
a21adf92ec
restrict query selector to edit form (#14307) 
Co-authored-by: Lauris BH <lauris@nix.lv>
 2021-01-15 06:55:51 +02:00
Jimmy Praet
bcb7f35221
Do not reload page after adding comments in Pull Request reviews (#13877) 
Fixed #8861 
* use ajax on PR review page

* handle review comments

* extract duplicate code

FetchCodeCommentsByLine was initially more or less copied from fetchCodeCommentsByReview. Now they both use a common findCodeComments function instead

* use the Engine that was passed into the method

Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
 2021-01-08 23:49:55 +02:00
a1012112796
b003116fca
fix branch selector on new issue page (#14194) 
fix #14185

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

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
 2020-12-31 13:32:11 -05:00
silverwind
8e5aea88c7
Improve label and text wrapping (#14113) 
* Improve label wrapping

- Adjust issue list styles so labels can wrap on the same line as the
  text. This relies on `display: inline` with the HTML whitespace being
  used as the separator.
- Add global word-break: break-word. This should generally avoid text
  overflows in various places.

* add whitespace to history labels

* use overflow-wrap

* restore word-break rules

* use correct pre

* use better selector for middle align

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
 2020-12-29 18:48:28 -05:00
silverwind
4aabbacdfe
Fix merge button dropdown triangle alignment (#14041) 
https://github.com/go-gitea/gitea/pull/14028 had improved dropdown
triangle display for buttons with text but had regressed it for buttons
without. Fix this by adding a class to prevent horizontal margin adjustment.

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
 2020-12-18 22:57:25 -05:00
silverwind
8af9df0036
Diff and code review refactors and improvements (#13922) 
* Diff CSS refactors and misc tweaks

- Simplify Diff CSS styling
- Add color variables for diff
- Fix vertical centering of inline comment button
- Slightly adjust text colors, e.g. in comment header

* Code review improvments

* selector tweak

* fix diff issues, add inactive bg color

Co-authored-by: 6543 <6543@obermui.de>
 2020-12-17 23:52:58 +08:00
Cirno the Strongest
27d0a5554f
Hide command line instructions when merge form is visible (#13956) 
* Hide commandline instructions when merge form is visible

* As per @silverwind

Co-authored-by: zeripath <art27@cantab.net>
 2020-12-15 01:09:24 -05:00
bobemoe
b35c1b5784
add thumbnail preview section to issue attachments (#13826) 
* add thumbnail preview section to attachments

* dont show thumbnail if the image is already shown inline

* update router to pass the `content` to the attachemnts template

* limit attachment preview height to 150px (same as width)

* remove unused css (referance removed in https://github.com/go-gitea/gitea/pull/11141/files#diff-9faae32445ed9673de2830c9fc35e93f44487f0a0068202988adaf00a5bac850L66 )

* dont show divider after edit if no attachemnts

Co-authored-by: James <inbox.dev@jhodges.co.uk>
Co-authored-by: 6543 <6543@obermui.de>
 2020-12-13 21:12:27 +02:00
silverwind
1cb1fb8a2e
Remove JS globals related to timetracking and due date (#13921) 
Refactor to avoid these globals. Should work exactly as before.
 2020-12-10 17:19:18 +01:00
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
silverwind
c85bb62635
Replace more icons with SVG, repo search tweaks (#13860) 
* Replace more icons with SVG

- Replace remaining icons on admin page with SVG
- Fix vertical menu background on arc-green
- Minor improvments to frontpage repo search
- More icon replacements here and there

* fix integration

* whitespace tweak

* add comment

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-12-09 14:03:19 -05:00
silverwind
b7b5c3368d
Fix issue participants (#13893) 
* Fix issue participants

* use list class for margin

* remove wrapper and don't render on zero participants

* keep whitespace

* remove participants class

* add some margin for timetracking stuff

Co-authored-by: 6543 <6543@obermui.de>
 2020-12-07 22:20:12 -05:00
silverwind
bb50ab2861
Style and template tweaks (#13828) 
* Style and template tweaks

- Get red and green buttons on arc green closer to base theme
- EasyMDE adjustments, toolbar and focus border
- Fix header on 404 repo page
- Tweaks to frontpage search, add 'Create Repo' button
- Fix misaligned box headers
- Fix pagination on arc-green
- Fix background and footer on explore and repo search

* better fix for header button alignment

* add label hover for reactions
 2020-12-04 12:18:37 +01:00
silverwind
9269a038a4
Direct avatar rendering (#13649) 
* Direct avatar rendering

This adds new template helpers for avatar rendering which output image
elements with direct links to avatars which makes them cacheable by the
browsers.

This should be a major performance improvment for pages with many avatars.

* fix avatars of other user's profile pages

* fix top border on user avatar name

* uncircle avatars

* remove old incomplete avatar selector

* use title attribute for name and add it back on blame

* minor refactor

* tweak comments

* fix url path join and adjust test to new result

* dedupe functions
 2020-12-03 19:46:11 +01:00
Jimmy Praet
056b8f5b52
Clickable links in pull request (and issue) titles (#13695) 
* clickable links in pull request (and issue) titles #13658

reuses the existing logic to render clickable links in commit messages

* dedicated RenderIssueTitle function

applied patch from @mrsdizzie
 2020-12-03 11:50:47 +01:00
silverwind
b1cf7f4df1
Add class to page content to unify top margin (#13766) 
* Add class to page content to unify top margin

Previously pages would individually set this margin but some didn't so
content would stick to the header without any space. Resolve this by
adding a new class that is added on all pages. The only place where we
remove this margin again is on the pages with menu or wrapper in the
header.

* fix admin notices

* fix team pages

* fix loading segment on gitgraph for arc-green

* fix last missing case

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-11-30 23:00:14 -05:00
silverwind
295fc99607
Markdown and Repo header tweaks (#13744) 
* Markdown and Repo header tweaks

- Use CSS vars for all markdown colors
- Tweak repo header, removing double borders and adjust sizes
- Use menu instead of buttons for issue open/close switcher
- Add emoji inversion for select emoji glyphs in arc-green
- Use border over box-shadow for all buttons
- Add spacing element to login form without openid

* repo settings navbar fix

* use shared template in more places and adjust dashboard

* fix remaining open/close combos
 2020-11-29 17:52:11 +02:00
silverwind
e00a355427
Dropdowns, Labels fixes and more CSS tweaks (#13733) 
* Dropdowns and Labels fixes

- Rework dropdown, menu and label styles
- Improve issue sidebar milestone and label sections
- Fix archived repo and private org badge
- Move more colors to CSS vars
- Move issue number to end of title on issue page

* more dropdown fixes

* fix basic blue labels - fixes #13731

* improve class setting on svg

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-11-29 01:22:04 -05:00
silverwind
da4bb6fc4e
Fix label styles affecting shabox (#13734) 
* Fix label styles affecting shabox

Add common parent .labels-list to issue labels lists to prevent
affecting other elements.

Fixes: https://github.com/go-gitea/gitea/issues/13704

* Update templates/shared/issuelist.tmpl

* Update templates/shared/issuelist.tmpl

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
 2020-11-28 22:26:03 -05: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
a1012112796
1e5247d424
ui: show 'owner' tag for real owner (#13689) 
* ui: show 'owner' tag for real owner

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

* Update custom/conf/app.example.ini

* simplify logic

fix logic
fix a small bug about original author

* remove system manager tag

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-11-28 17:52:29 +02:00
Jimmy Praet
3f13e07849
Use trashcan icon for remove review request (#13722) 2020-11-27 22:55:59 +02:00
silverwind
b2de034278
CSS navbar and color tweaks (#13609) 
* CSS and color tweaks

- Unify navbar-style menus
- Fix admin bar overlapping menu bar
- Fixes file edit comment box
- Fix double border on review box
- Fix review timeline icons

* Many fixes to new-menu and navbar layout enhancements

* misc settings fixes

* navbar tweak

* fix pr tabs

* branch tag and arc color tweaks
 2020-11-26 19:33:28 +00:00
silverwind
6d93a3ab18
Issue and Pulls lists rework (#13594) 
* Issue and Pulls lists rework

Reorganized and restyled the issue and pull request lists.

* color and layout tweaks

* use new issue list on dashboard as well

* move pagination into template

* misc tweaks

* fix label hover

* fix milestone list

* fix discrepancies between issue and milestone list, add new 'merge' helper

* fmt

* simplify merge helper

* remove whitespace

* fix startIndex

* further simplify dict merging

* rename helper to 'mergeinto' for clarity

* allow bottom-row to wrap

Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-11-25 13:20:40 +02:00
Jimmy Praet
2791cc139e
Don't show a dropdown menu when only 1 merge option is available (#13660) (#13670) 2020-11-22 15:58:12 +02:00
Karl Heinz Marbaise
702e82d162
Fix issue/pull request list assignee filter (#13647) 
* Fixes #13641 - Filtering in Pull Request kept all the time.
 - The URL contains all the time the assignee in cases
   where once a type has been selected.

Signed-off-by: Karl Heinz Marbaise <kama@soebes.de>

* Followup Fixes #13641 - Filtering in Pull Request kept all the time.
 - The URL contains all the time the assignee in cases
   where once a type has been selected.
 - The same behaviour was observed issues viewed via milestones.

Signed-off-by: Karl Heinz Marbaise <kama@soebes.de>
 2020-11-19 15:39:55 -06:00
silverwind
b83825253e
Fix label display on new issues (#13590) 
* Fix label display on new issues

PR #13570 broke label rendering for new issues and pulls because
missed the fact that the code was relying on the DOM elements being
toggled by JavaScript.

On top of that, the label rendering for new issues and pull was using
an outdated template which I consolidated in a new shared template.

* remove wrapper element and style tweaks

* style tweaks

* use shared template for whole label list

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-11-17 07:02:41 +02:00
silverwind
0de546009e
CSS color variables, less bold font weight and more (#13567) 
* CSS color variables, less bold font weight

- Define color variables for fully saturated colors and apply them where
  it made sense
- Add background color helper classes
- Globally reduce bold font weight from 700 to 500
- Remove border from timeline icons
- Unify dropzone styling
- Various border style consolidations

* attempt to fix test

* another attempt at tests

* fix contains
 2020-11-15 15:58:16 -05:00
silverwind
50cbb20481
Fix issue label rendering (#13570) 
* Fix issue label rendering

Prevent rendering of inactive labels and make them wrap inline.

Fixes: https://github.com/go-gitea/gitea/issues/13566

* also don't render the placeholder

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-11-15 13:11:58 -05:00
silverwind
5c76c5ce44
Fix issue label spacing and hover (#13553) 
Fixes: https://github.com/go-gitea/gitea/issues/13545
Regressed by: https://github.com/go-gitea/gitea/pull/13458
 2020-11-13 20:16:46 -05:00
silverwind
4117a443c2
Lazy-load issue reviewers and assignees avatars (#13526) 
The avatars inside the dropdowns were previously fetched every time a
Pull Request was opened resulting in potential unnecessary downloads.
This lazy-loads through the newish loading=lazy attribute.

Also did a few minor adjustments on the file.
 2020-11-12 07:55:34 +02:00
silverwind
21d496364a
Fix tooltips and issue dependency styles (#13458) 
- Convert all tooltips to JS-based ones, fixing overflow issues
- Restyle issue dependencies/dependants
- Move popup styles to base style
- CSS Helper tweaks
- Unify pseudo element selectors and lint for it

Fixes: https://github.com/go-gitea/gitea/issues/13400
 2020-11-10 20:28:07 +02:00
silverwind
8bae34c4b2
Change search and filter icons to SVG (#13473) 
Unfortunately, the Fomantic CSS relies on i.icon instead of .icon so a
wrapper is necessary for these with an accompanying class to center the
icon.
 2020-11-09 18:21:47 +00:00
Cirno the Strongest
f719e2e806
Fix double border introduced by #13434 (#13457) 
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: zeripath <art27@cantab.net>
 2020-11-07 18:15:09 -05:00