summaryrefslogtreecommitdiffstats
path: root/templates/repo/diff
Commit message (Collapse)AuthorAgeFilesLines
* Fix previous/next button size (#16284)Jimmy Praet2021-06-281-2/+2
|
* Add previous/next buttons to review comments (#16273)Jimmy Praet2021-06-271-0/+8
| | | | | | Co-authored-by: Norwin <noerw@users.noreply.github.com> Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: zeripath <art27@cantab.net>
* Fix spelling (#16179)Jonathan Tran2021-06-161-1/+1
| | | Co-authored-by: Jonathan Tran <jon@allspice.io>
* Add attachments for PR reviews (#16075)KN4CK3R2021-06-141-0/+5
| | | | | | | | | | | | | * First step for multiple dropzones per page. * Allow attachments on review comments. * Lint. * Fixed accidental initialize of the review textarea. * Initialize SimpleMDE textarea. Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Add Image Diff for SVG files (#14867)KN4CK3R2021-06-052-135/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added type sniffer. * Switched content detection from base to typesniffer. * Added GuessContentType to Blob. * Moved image info logic to client. Added support for SVG images in diff. * Restore old blocked svg behaviour. * Added missing image formats. * Execute image diff only when container is visible. * add margin to spinner * improve BIN tag on image diffs * Default to render view. * Show image diff on incomplete diff. Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: Lauris BH <lauris@nix.lv>
* Fixed unknown translation key. (#16057)KN4CK3R2021-06-031-1/+1
|
* Make tasklist checkboxes clickable (#15791)KN4CK3R2021-05-231-1/+1
| | | | Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: Lauris BH <lauris@nix.lv>
* fix default avatar url (#15938)Norwin2021-05-211-1/+1
|
* Fix and restyle menu on code line (#15913)silverwind2021-05-181-2/+2
| | | | | | | | | | | | | * Fix and restyle menu on code line * fix multiline and more tweaks * move to separate files * remove has-context-menu class Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Code comments improvements (#15722)silverwind2021-05-082-15/+18
| | | | | | | | | - Right-align the Reply and Resolve buttons - Center Resolved text and add some padding - Add padding to inline comments - Indent the comment content to align with author name - Re-parent form to allow better button layout space. Co-authored-by: zeripath <art27@cantab.net>
* Add selecting tags on the compare page (#15723)Jonathan Tran2021-05-071-77/+147
| | | | | | | | | | | * Add selecting tags on the compare page * Remove unused condition and change indentation * Fix tag tab in dropdown to be black * Add compare tag integration test Co-authored-by: Jonathan Tran <jon@allspice.io>
* Use a generic markup class to display externally rendered files and diffs ↵65432021-05-073-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#15735) * creates and implements generic markup less class * How to give custom CSS to externally rendered html * Clarifies sources of CSS styling of markup * further clarification of sources of markup styling * rename _markdown to _markup * remove defunct import * fix orphaned reference * Update docs/content/doc/advanced/external-renderers.en-us.md * more renames markdown -> markup * do not suggest less customization * add back tokens * fix class whitespace, remove useless if-clause * remove unused csv-data rules * use named exports and rename functions * sort imports Co-authored-by: HarvsG <11440490+HarvsG@users.noreply.github.com> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: silverwind <me@silverwind.io>
* Display specific message if diff is not displayed because of too long line ↵Loutro2021-05-041-1/+7
| | | | | | | | | | | | | | | | (#15611) * 7184- message if line too long * Update options/locale/locale_en-US.ini Co-authored-by: silverwind <me@silverwind.io> * add flag on missing cases Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: Andrew Thornton <art27@cantab.net>
* Enforce tab indentation in templates (#15289)silverwind2021-04-104-13/+9
| | | | | | | | | | | | | | | | | | * Enforce tab indendation in templates This adds editorconfig-checker [1] to lint the template files so they conform the editorconfig files. I fixed all current identation issues using the fix mode of eclint [2] and some manual corrections. We can extend this linting to other files later, for now I'd like this PR to focus on HTML template files only. [1] https://github.com/editorconfig-checker/editorconfig-checker [2] https://github.com/jedmao/eclint * fix indendation Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Remove usage of JS globals (#15378)silverwind2021-04-091-1/+1
| | | | | | Refactor the exported globals in index.js to JS-initialized event handlers. Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Show diff on rename with diff changes (#15338)zeripath2021-04-081-12/+8
| | | | | | | | | | | | | More recent versions of git have increased support for detection of renames meaning that a rename with diff changes is now supported. Although ParsePatch supports this - our templates do not and the simplest solution is simply to show the diff. Fix #15335 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: 6543 <6543@obermui.de>
* Prepend AppSubUrl to links for default avatar (#15341)zeripath2021-04-081-1/+1
| | | | | Fix #15334 Signed-off-by: Andrew Thornton <art27@cantab.net>
* Diff box fixes (#15214)silverwind2021-03-312-14/+18
| | | | | | | | | | | | | - Fix misaligned "Show Outdated" buttons via flexbox - Add hover effect to "Show Outdated" buttons - Remove overreaching margin from selector .diff-file-box and handle cases individually. Fixes: https://github.com/go-gitea/gitea/issues/15097 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Add Tabular Diff for CSV files (#14661)KN4CK3R2021-03-292-13/+76
| | | | | | | | | | | | | | | | | | | | | | | Implements request #14320 The rendering of CSV files does match the diff style. * Moved CSV logic into base package. * Added method to create a tabular diff. * Added CSV compare context. * Added CSV diff template. * Use new table style in CSV markup. * Added file size limit for CSV rendering. * Display CSV parser errors in diff. * Lazy read single file. * Lazy read rows for full diff. * Added unit tests for various CSV changes.
* Ensure that new pull request button works on forked forks owned by owner of ↵zeripath2021-03-161-10/+31
| | | | | | | | the root (#14932) Prevent 404 on new pull request button on forked fork owned by the owner of the root repository. Also ensure that the names make sense. Signed-off-by: Andrew Thornton <art27@cantab.net>
* Make manual merge autodetection optional and add manual merge as merge ↵a10121127962021-03-031-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Add Image Diff options in Pull Request Diff view (#14450)KN4CK3R2021-02-271-74/+104
| | | Implemented GitHub style image diff
* Whitespace in commits (#14650)vnkmpf2021-02-131-10/+2
| | | | | | | | | * Add whitespace to commit view * Add whitespace to /compare/a...b * Move repeated whitespaceFlags to gitdiff * Add whitespace for wiki pages
* Make fileheader sticky in diffs (#14616)vnkmpf2021-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | * Make fileheader sticky #12552 * Remove sticky filenames when width is 480px or less On mobile phone sticky filename is hidden due to the combination of many possible widths and lengths. * Fix text color for .markdown-info * Fix visual of sticky diff box on 480px or less - Hide arrow for select buttons. - Fix changes, additions and deletions. With flexbox they look very broken. This commit hides some words to, so the result is: "123 changed files 987 additions 456 deletions" - center text in buttons Co-authored-by: zeripath <art27@cantab.net>
* Comment - Reference in new issue (#14366)KN4CK3R2021-01-211-0/+2
| | | | | | | | | | | | | | | | | | * 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>
* Add edit, delete and reaction support to code review comments on issue page ↵Lauris BH2021-01-171-1/+1
| | | | (#14339)
* Do not reload page after adding comments in Pull Request reviews (#13877)Jimmy Praet2021-01-086-32/+32
| | | | | | | | | | | | | | | | 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>
* Search and Diff CSS enhancements (#14050)silverwind2020-12-203-31/+33
| | | | | | | | | | | | | | | | | | | * Search and Diff CSS enhancements - Use flexbox for language stats - Improve labels and code boxes on repo and code search - Use flexbox on diff header and improve suppressed diff text - Add dedicated color for diff expander * more diff tweaks, less vertical padding on header * more minor tweaks * always show fold icon, image diff improvments * remove margin Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Diff stat improvements (#13954)silverwind2020-12-122-11/+9
| | | | | | | | | | | | * Diff stat improvements - Combine number to just total number of changes - Add tooltip over stats bar - Increase contrast on file name - Refactor classes and CSS to be more reusable * misc tweaks * make count bold
* Move diff split code into own template file (#13919)mrsdizzie2020-12-092-51/+53
| | | | | | | | | * Move diff split code into own template file Separate split diff view same as unified already is. Mainly because I'm working on a separate PR with this change and merge conflicts for each change to box.tmpl are annoying and I'm worried about breaking something subtle while trying to resolve them. * Fix error Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Replace more icons with SVG, repo search tweaks (#13860)silverwind2020-12-091-4/+4
| | | | | | | | | | | | | | | | * 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>
* Direct avatar rendering (#13649)silverwind2020-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* Reply button is not removed when deleting a code review comment (#13774)Jimmy Praet2020-12-033-97/+39
| | | Co-authored-by: mrsdizzie <info@mrsdizzie.com>
* Add class to page content to unify top margin (#13766)silverwind2020-11-301-1/+1
| | | | | | | | | | | | | | | | | | | * 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>
* Enable linting of JS inside templates (#13708)silverwind2020-11-281-5/+5
| | | | | | | | | | Indentation-related rules are disabled because indent templates with tabs but our lint rules expect spaces. Also had to exclude a few files where using template variables in the JS is causing syntax errors for the JS parser. I don't think there's a way to solve this otherwise. Co-authored-by: Lauris BH <lauris@nix.lv>
* Render diff stats server-side (#13579)silverwind2020-11-152-18/+9
| | | Eliminates a flash on page load on the diff stat bars.
* Change search and filter icons to SVG (#13473)silverwind2020-11-091-2/+2
| | | | | | 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.
* Fix double border introduced by #13434 (#13457)Cirno the Strongest2020-11-071-1/+1
| | | | Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: zeripath <art27@cantab.net>
* Rework focused comment styling (#13434)silverwind2020-11-051-1/+1
| | | | Had to tweak a few borders to make it work properly in all cases, also added .comment-body class to specifically target that body.
* Various style tweaks (#13418)silverwind2020-11-042-3/+3
| | | | | | | - Change code review '+' to SVG and increase size slightly - Set placeholder color in both themes - Set proper font for textareas - Fix black code in arc-green - Various arc-green fixes
* Fix whitespace rendering in diff (#13415)silverwind2020-11-043-9/+9
| | | | | | | | | | - Introduce new .code-inner class that sets the CSS attributes on rendered code lines like view,blame and diff. - Rename .wrap class to .word-break to reflect what it actually does - Remove .raw which was only used on webhook page - Set white-space: pre-wrap except on blame where it can break the layout Fixes: https://github.com/go-gitea/gitea/issues/13406
* Fix reactions on code comments (#13390)Cirno the Strongest2020-11-021-2/+2
| | | Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
* Misc UI fixes, add secondary color (#13378)silverwind2020-11-014-11/+13
| | | | | | | | | | | | | | | | | | | | | | * Misc UI fixes, add secondary color - Add secondary color, primarily used in arc-green currently - Convert icons on release page to SVG - Improve resolved conversation placeholder - Diff fixes on arc-green - Misc color tweaks * fix comment header, adjust arc-green dropzone * label margin, sidebar margin * flexbox commits table and add primary button styles * tooltip styles * file header fixes Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: zeripath <art27@cantab.net>
* Comment box tweaks and SVG dropdown triangles (#13376)silverwind2020-10-316-57/+77
| | | | | | | | | | | | | | | | | | | | * Comment box tweaks and SVG dropdown triangles - Change all dropdown triangles to SVG - Bring inline review comment box closer to regular comment boxes - Enhance arc-green checkbox contrast - Minor reaction tweaks - Flexbox the diff file header * remove a border * fix type marker in arc-green * add small code padding * fix position regression and remove useless rules Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Various style fixes (#13372)silverwind2020-10-311-3/+5
| | | | | | | - Add alpha variants for primary color - Make timeline items solid background color - Fix reaction styles recently regressed - Fix diff header and make it flexbox - Numerous smaller fixes for arc green
* Update outdated label to use Fomantic UI style (#13181)Iván Valdés2020-10-211-2/+2
| | | | | | | | | * Update outdated label to use Fomantic UI style * Use native labels rather than custom style * Remove leading zero Co-authored-by: zeripath <art27@cantab.net>
* [Enhancement] Allow admin to merge pr with protected file changes (#12078)赵智超2020-10-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Enhancement] Allow admin to merge pr with protected file changes As tilte, show protected message in diff page and merge box. Signed-off-by: a1012112796 <1012112796@qq.com> * remove unused ver * Update options/locale/locale_en-US.ini Co-authored-by: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> * Add TrN * Apply suggestions from code review * fix lint * Update options/locale/locale_en-US.ini Co-authored-by: zeripath <art27@cantab.net> * Apply suggestions from code review * move pr proteced files check to TestPatch * Call TestPatch when protected branches settings changed * Apply review suggestion @CirnoT * move to service @lunny * slightly restructure routers/private/hook.go Adds a lot of comments and simplifies the logic Signed-off-by: Andrew Thornton <art27@cantab.net> * placate lint Signed-off-by: Andrew Thornton <art27@cantab.net> * skip duplicate protected files check * fix check logic * slight refactor of TestPatch Signed-off-by: Andrew Thornton <art27@cantab.net> * When checking for protected files changes in TestPatch use the temporary repository Signed-off-by: Andrew Thornton <art27@cantab.net> * fix introduced issue with hook Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove the check on PR index being greater than 0 as it unnecessary Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <matti@mdranta.net> Co-authored-by: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Remove code-view class from diff view (#13011)mrsdizzie2020-10-021-1/+1
| | | | | | | | code-view class seems unecessary here as everything needed style wise comes from various diff classes. This allows comments and comment editor to be styled properly and fixes linked bug. Fixes #13010 Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Make SVG size argument optional (#12814)silverwind2020-09-115-21/+21
| | | | | Now defaults to 16 on both frontend and backend. Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Do not show arrows on comment diffs on pull comment pages (#12434)zeripath2020-08-081-66/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Do not show arrows on comment diffs on pull comment pages Prior to this PR it was possible that an expansion arrow could be displayed on comment diffs displayed on the comments pages of pulls These arrows would not successfully work because they were not attached to a commit id - nor can they necessarily be. This PR prevents these from being shown. Fix #10851 Signed-off-by: Andrew Thornton <art27@cantab.net> * as per @silverwind Signed-off-by: Andrew Thornton <art27@cantab.net> * one more indentation fix Signed-off-by: Andrew Thornton <art27@cantab.net> * one more indentation fix Signed-off-by: Andrew Thornton <art27@cantab.net>
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-27 17:10:03 +0000