summaryrefslogtreecommitdiffstats
path: root/templates
Commit message (Collapse)AuthorAgeFilesLines
* Prevent empty div when editing comment (#12404) (#12991)techknowlogick2020-10-011-2/+2
| | | | | | | | | * Prevent empty div when editing comment The template for attachments needs to remove whitespace and return empty when there are no attachments. Fix #10220 Co-authored-by: zeripath <art27@cantab.net>
* Escape more things that are passed through str2html (#12622) (#12850)zeripath2020-09-156-15/+15
| | | | | | | | | | | | | Backport #12622 * Escape more things that are passed through str2html Signed-off-by: Andrew Thornton <art27@cantab.net> * Bloody editors! Co-authored-by: mrsdizzie <info@mrsdizzie.com> * Update routers/user/oauth.go
* Remove double escape on labels addition in comments (#12809) (#12810)techknowlogick2020-09-111-1/+1
| | | | | | | | Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
* Escape Email in forgot_password.tmpl (#12610) (#12612)John Olheiser2020-08-261-1/+1
| | | | | Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: zeripath <art27@cantab.net>
* Prevent NPE on commenting on lines with invalidated comments (#12549) (#12550)zeripath2020-08-213-2/+124
| | | | | | | | | | | | | | | | * Prevent NPE on commenting on lines with invalidated comments Only check for a review if we are replying to a previous review. Prevent the NPE in #12239 by assuming that a comment without a Review is non-pending. Fix #12239 Signed-off-by: Andrew Thornton <art27@cantab.net> * Add hack around to show the broken comments Signed-off-by: Andrew Thornton <art27@cantab.net>
* Fix bug preventing transfer to private organization (#12497) (#12501)techknowlogick2020-08-171-1/+1
| | | | | | | | | | | | | | | | | | | * Fix bug preventing transfer to private organization The code assessing whether a private organization was visible to a user before allowing transfer was incorrect due to testing membership the wrong way round This PR fixes this issue and renames the function performing the test to be clearer. Further looking at the API for transfer repository - no testing was performed to ensure that the acting user could actually see the new owning organization. Signed-off-by: Andrew Thornton <art27@cantab.net> * change IsUserPartOfOrg everywhere Co-authored-by: zeripath <art27@cantab.net>
* Match GH with Commit page (#12425) (#12431)techknowlogick2020-08-051-5/+5
| | | | | Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: zeripath <art27@cantab.net>
* Rendoer emoji's of Commit message on feed-page (#12373)65432020-07-291-1/+1
|
* [ui] Link to pr list page on sidebar when view pr (#12256) (#12263)techknowlogick2020-07-161-3/+3
| | | | | | | Fix #12254 Signed-off-by: a1012112796 <1012112796@qq.com> Co-authored-by: 赵智超 <1012112796@qq.com>
* Extend Notifications API and return pinned notifications by default (#12164) ↵zeripath2020-07-131-2/+73
| | | | | | | | | | | | | (#12232) Backport #12164 This PR extends the notifications API to allow specific notification statuses to be searched for and to allow setting of notifications to statuses other than read. By default unread and pinned statuses will be returned when querying for notifications - however pinned statuses will not be marked as read. Close #12152 Signed-off-by: Andrew Thornton art27@cantab.net
* Multiple small admin dashboard fixes (#12153) (#12156)zeripath2020-07-051-0/+1
| | | | | | | | * Prevent (EXTRA string) comments in Task headers * Redirect tasks started from monitor page back to monitor * Fix #12107 - redirects from process cancel should use AppSubUrl * When wrapping queues set the name correctly Signed-off-by: Andrew Thornton <art27@cantab.net>
* templates/repo/empty.tmpl : fix repo setup instructions (#12147)Andreas Shimokawa2020-07-051-1/+1
| | | | Co-authored-by: codeberg <codeberg@codeberg.org> Co-authored-by: zeripath <art27@cantab.net>
* Handle multiple merges in gitgraph.js (#11996) (#12000)zeripath2020-06-211-33/+31
| | | | | | | | | | | | Backport #11996 There is a bug in web_src/js/vendor/gitgraph.js whereby it fails to handle multiple merges in a single commit correctly. This PR adds changes to make this work. Fix #11981 Signed-off-by: Andrew Thornton <art27@cantab.net>
* Global default branch setting (#11918) (#11937)techknowlogick2020-06-172-2/+3
| | | | | | | | | | | | | | | * Global default branch setting (#11918) * Global default branch setting * add to app.ini example per @silverwind * update per @lunny Co-authored-by: John Olheiser <john.olheiser@gmail.com> * Update modules/setting/repository.go Co-authored-by: John Olheiser <john.olheiser@gmail.com>
* Fix search form button overlap (#11840) (#11864)Cirno the Strongest2020-06-122-10/+6
| | | | Co-authored-by: techknowlogick <techknowlogick@gitea.io> (cherry picked from commit 8770bceafa3844a97f35d3f8a35089438bf2f33b)
* Fix reply octicon (#11821) (#11822)John Olheiser2020-06-091-1/+1
| | | Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Add option to API to update PullRequest base branch (#11666) (#11796)65432020-06-071-0/+7
| | | | | | | * EditPull: add option to change base Close #11552 Co-authored-by: Lauris BH <lauris@nix.lv>
* Fix to allow comment poster to edit or delete his own comments (#11671) (#11774)赵智超2020-06-064-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | * bug: fix comment update permision check No the ui only allow poster to update or delet comment, which is not reasonable and different with handle logic, this pr change it to allow poster of comment do it ref code: https://github.com/go-gitea/gitea/blob/e8955173a9be1acaa9a3755c37b6059422acda20/routers/repo/issue.go#L1636 https://github.com/go-gitea/gitea/blob/e8955173a9be1acaa9a3755c37b6059422acda20/routers/repo/issue.go#L1681 fix #11663 Signed-off-by: a1012112796 <1012112796@qq.com> * simplify code * fix sign in Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv>
* Fix timezone on issue deadline (#11697) (#11784)Cirno the Strongest2020-06-061-2/+2
| | | | | | | | * Fix timezone on issue deadline * FormatDate Co-authored-by: zeripath <art27@cantab.net> (cherry picked from commit bbe13b60cdf93d8296f4c6dab624df2b571db234)
* Add missing templates (#11729) (#11748)S7evinK2020-06-032-0/+6
| | | | Signed-off-by: Till Faelligen <tfaelligen@gmail.com>
* Fix styling for commiter on diff view (#11715) (#11744)Cirno the Strongest2020-06-031-11/+14
| | | | | | | | | | | | | | | | | | | | | * Fix styling for commiter on diff view * Update options/locale/locale_en-US.ini * Update templates/repo/commit_page.tmpl Co-authored-by: silverwind <me@silverwind.io> * Update templates/repo/commit_page.tmpl Co-authored-by: silverwind <me@silverwind.io> * Apply suggestions from code review Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: techknowlogick <techknowlogick@gitea.io> (cherry picked from commit 8e035f81c01ba6c1ccf8952ffad37bef063aad2d)
* Properly truncate system notices (#11714) (#11742)zeripath2020-06-031-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | Backport #11714 * Properly truncate system notices As noted in #11658 the system notifications list will always suffix system notices with ... even when the notice is longer than 120 characters. Instead we should use .text.truncate to auto truncate and make the notices clickable to view their details. Signed-off-by: Andrew Thornton <art27@cantab.net> * As per @CirnoT make table cell clickable * ensure that pre wraps Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Handle expected errors in FileCreate & FileUpdate API (#11643) (#11718)65432020-06-011-0/+18
| | | | | as title needed for #11641
* Handle expected errors in AddGPGkey API (#11644) (#11661)65432020-05-281-0/+6
| | | | | | | | | * handle GPG Parse & Email Errors * correct TEST * update Swagger * more Docu
* When must change password only show Signout (#11600) (#11637)guillep2k2020-05-271-5/+27
| | | | | | | | | | | | | | When "Must Change Password" simplify the navbar header to only show the signout button as all other links will redirect back. This prevents the notifications icon from showing preventing initialization of the event-source and hence preventing redirect_to being set, however in addition do not set the redirect_to cookie if we are looking at the /user/events page. Fix #11554 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: zeripath <art27@cantab.net>
* Backport various styling fixes (#11619)Cirno the Strongest2020-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | * Fix inconsistent font size for markdown preview on new PR view (#11565) We use same method for new issue form and issue view, but was missing from new PR view making it one place where markdown preview is inconsistent in font size. (cherry picked from commit 04afd9d1e2399d61978fdeeab7e7ac8ff9057a93) * Fix margin on PR form (#11566) (cherry picked from commit f2a0be1683daf3330a7c94fa65300e7056e9bc98) * Fix margin for attached top header on code review (#11571) Introduced naively by #11463 The margin was being applied too widely. (cherry picked from commit e682a922957ebb1d40843be4da902fe13b15adde) * Fix styling for PR merge section when no checks (#11609) Makes styling consistent between two cases. Also removed unnecessary double border. * Normalize avatar radius
* Fix serviceworker output file and misc improvements (#11562) (#11610)silverwind2020-05-251-2/+0
| | | | | | | | | | | | | * Fix serviceworker output file and misc improvements - Fix output file location for production build - Cache more asset types: fonts and worker variants - Parallelize a few tasks during initalization - Only invalidate caches starting with our prefix - Remove public/serviceworker.js before building - Remove font preloads, they cause strange cors issues - Misc eslint config adjustments * remove webpack output files on watch-frontend
* Fix images in wiki edit preview (#11546) (#11602)mrsdizzie2020-05-241-1/+1
| | | | | | | Make sure wiki editor sets wiki to true so gitea renders it as a wiki page. Also change the context data attr for edit form. This looks wrong but everywhere else in our code assumes the urlPrefix to be just the repo url when rendering and manually adds /wiki to the rendered url regardless. Fixes #11540
* Allow different HardBreaks settings for documents and comments (#11515) (#11599)zeripath2020-05-241-1/+1
| | | | | | | | | | | | | | | GH has different HardBreaks behaviour for markdown comments and documents. Comments have hard breaks and documents have soft breaks - therefore Gitea's rendering will always be different from GH's if we only provide one setting. Here we split the setting in to two - one for documents and one for comments and other things. Signed-off-by: Andrew Thornton art27@cantab.net Changes to index.js as per @silverwind Co-authored-by: silverwind <me@silverwind.io> Changes to docs as per @guillep2k Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
* Move serviceworker to workbox and fix SSE interference (#11538) (#11547)silverwind2020-05-222-107/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move serviceworker to workbox and fix SSE interference Instead of statically hardcoding every frontend asset, this uses a type-based approach to cache all js,css and manifest.json requests. This also fixes the issue that the service worker was interfering with EventSource because it was unconditionally handling all requests which this new implementation doesn't. Fixes: https://github.com/go-gitea/gitea/issues/11092 Fixes: https://github.com/go-gitea/gitea/issues/7372 * rethrow error instead of logging * await .register * Revert "rethrow error instead of logging" This reverts commit 043162ba1f18b98a4bf9635959fd28d16e839fc5. * improve comment * remove JSRenderer * add version-based cache invalidation * refactor * more refactor * remove comment * rename item to fit cache name Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
* Fix form action template substitutions on admin pages (backport #11519) (#11531)Matthew R. McDougal2020-05-212-2/+2
| | | | | | | | * Fix form action template substitution on admin dashboard * Fix form action template substitution on admin monitoring page Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv>
* Fix repo-list private and total count bugs (#11500) (#11532)zeripath2020-05-212-3/+3
| | | | | | | | | | | | | | | | | | | | | * Fix repo-list private and total count bugs Signed-off-by: Andrew Thornton <art27@cantab.net> * Ensure limited and private org public repos are displayed on "private" Signed-off-by: Andrew Thornton <art27@cantab.net> * switch from onlyPrivate to is_private Signed-off-by: Andrew Thornton <art27@cantab.net> * Generate swagger Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com> Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
* Fix comment box styling and cancelling (#11463) (#11464) (#11469) (#11467)Lauris BH2020-05-181-1/+1
| | | | | | | | | | | * Fix styling of resolved code comment box (#11463) Co-authored-by: Lauris BH <lauris@nix.lv> * Fix .comment-code-cloud not being removed when cancelling new code comment (#11464) * Fix footer padding for comment code reply form on issue event view (#11469) Co-authored-by: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com>
* Fix "Unknown task: git_fsck" error on admin dashboard (#11468) (#11471)65432020-05-181-2/+2
| | | | | | | * Fix "Unknown task: git_fsck" error on admin dashboard (#11468) * Update .drone.yml Co-authored-by: zeripath <art27@cantab.net>
* Increase width for authors on commit view (#11441)Cirno the Strongest2020-05-171-3/+3
| | | | | Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv>
* Refactor Cron and merge dashboard tasks (#10745)zeripath2020-05-162-33/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Refactor Cron and merge dashboard tasks * Merge Cron and Dashboard tasks * Make every cron task report a system notice on completion * Refactor the creation of these tasks * Ensure that execution counts of tasks is correct * Allow cron tasks to be started from the cron page * golangci-lint fixes * Enforce that only one task with the same name can be registered Signed-off-by: Andrew Thornton <art27@cantab.net> * fix name check Signed-off-by: Andrew Thornton <art27@cantab.net> * as per @guillep2k * as per @lafriks Signed-off-by: Andrew Thornton <art27@cantab.net> * Add git.CommandContext variants Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Add paging and archive/private repository filtering to dashboard list (#11321)zeripath2020-05-162-3/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Add archived options to SearchRepository Signed-off-by: Andrew Thornton <art27@cantab.net> * Add only-private search Signed-off-by: Andrew Thornton <art27@cantab.net> * Add filter options and paging to dashboard repository page Signed-off-by: Andrew Thornton <art27@cantab.net> * swagger generate Signed-off-by: Andrew Thornton <art27@cantab.net> * fix-swagger-again Signed-off-by: Andrew Thornton <art27@cantab.net> * as per @mrsdizzie also remember state Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv>
* Support view individual commit for wiki pages (#11415)mrsdizzie2020-05-164-4/+15
| | | | | | | | Currently you can see a list of commit history for wiki pages but aren't able to view the commit diff itself. This adds the feature to view an individual commit to a wiki repo. Closes #8999 Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
* Fix margin on attached segment headers when they are separated by other ↵Cirno the Strongest2020-05-151-1/+0
| | | | | | element (#11425) Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Better styling for code review comment form (#11413)Cirno the Strongest2020-05-151-2/+1
| | | Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Fix webhook template when validation errors occur (#11421)kolaente2020-05-151-1/+1
| | | Signed-off-by: kolaente <k@knt.li>
* Fix ref links in issue overviews for tags (#8742)Sijmen Schoon2020-05-144-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Properly generate ref URLs Tags used to not generate correct URLs (src/branch/tags/1.0.0 instead of src/tags/1.0.0). Also cleans up some code around it with the created helper functions. * Fix formatting and create migration * Add copyright head to utils_test * Use a raw query for the ref migration * Remove semicolon * Quote column and table names in migration SQL * Change || to CONCAT, since MSSQL does not support || * Make migration engine aware * Add missing import * Move ref EndName and URL to the issue service * Fix tests * Add test for commit refs * Update issue.go * Use the right command for building JavaScript bundles * Prepare for merge * Check for refs/* before prepending in migration * Update services/issue/issue_test.go * Update modules/git/utils_test.go Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: techknowlogick <matti@mdranta.net>
* Prettify timeline 3 (#11139)Sorien2020-05-149-62/+76
| | | | | | | | | | | | | | | | | | | | | | | | * Fix timeline comments sections borders * Fix files dropzone right alignment * Update review comment form and controls * Clear segment style from comment form tabs * Remove segment class from pulls tab * Fix Time Tracker - Add Time button border * Fix buttons right alignment * Markdown tab minimal height * Fix DropZone hover effect * Fix Lint + remove unused controls class Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: zeripath <art27@cantab.net>
* Fix svg octicon-key placement (#11410)Cirno the Strongest2020-05-143-13/+19
|
* Switch code editor to Monaco (#11366)silverwind2020-05-144-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Switch code editor to Monaco This switches out CodeMirror for Monaco which is based on the same code base as VS code and should work pretty similar to it. It does add a few async chunks, totalling around 10MB to our build. It currently supports around 65 languages and in the default configuration, each language would emit one ugly [number].js chunk, so I opted to combine them all into a single file for now. CodeMirror is still being used under the hood by SimpleMDE so it can not be removed yet. * inline editorconfig, fix diff, use for markdown, remove more dead code * refactors, remove jquery usage * use tab_width * fix intellisense * rename function for clarity * misc tweaks, enable webpack progress display * only use --progress on dev build * remove useless borders in arc-green * fix typo * remove obsolete comment * small refactor * fix file creation and various refactors * unset useTabStops too when no editorconfig * small refactor * disable webpack's [big] warnings * remove useless await * fix dark theme check * rename chunk to 'monaco' * add to .gitignore and delete webpack dest before build * increase editor height * support more editorconfig properties * remove empty element filter * rename Co-authored-by: John Olheiser <john.olheiser@gmail.com>
* Unfortunately go template if does not shortcut (#11392)zeripath2020-05-121-2/+4
| | | | | | | | Go template's `{{if ...}}` does not shortcut its tests therefore it is possible to cause a NPE unless you separate ifs into two. Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
* Ensure search action button coalesced to adjacent input (#11385)zeripath2020-05-126-8/+8
| | | | | | | | | | | Fomantic-ui's action button syntax requires that the button is the next sibling of the input it is attached to and that they are both children of a div.action. Fix #11375 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv>
* Allow compare page to look up base, head, own-fork, forkbase-of-head (#11327)zeripath2020-05-121-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow compare page to look up base, head, own-fork, forkbase-of-head Signed-off-by: Andrew Thornton <art27@cantab.net> * as per @guillep2k Signed-off-by: Andrew Thornton <art27@cantab.net> * Update routers/repo/compare.go * as per @guillep2k Signed-off-by: Andrew Thornton <art27@cantab.net> * Rationalise the names a little Signed-off-by: Andrew Thornton <art27@cantab.net> * Rationalise the names a little (2) Signed-off-by: Andrew Thornton <art27@cantab.net> * Fix 500 with fork of fork Signed-off-by: Andrew Thornton <art27@cantab.net> * Prevent 500 on compare different trees Signed-off-by: Andrew Thornton <art27@cantab.net> * dotdotdot is perfectly valid in both usernames and repo names Signed-off-by: Andrew Thornton <art27@cantab.net> * ensure we can set the head and base repos too Signed-off-by: Andrew Thornton <art27@cantab.net> * ensure we can set the head and base repos too (2) Signed-off-by: Andrew Thornton <art27@cantab.net> * fix lint Signed-off-by: Andrew Thornton <art27@cantab.net> * only set headRepo == baseRepo if isSameRepo Signed-off-by: Andrew Thornton <art27@cantab.net>
* Consolidate API for getting single commit (#11368)Cirno the Strongest2020-05-111-48/+2
| | | | | | | | | * Allow Git ref for /repos/{owner}/{repo}/git/commits/{sha} * Consolidate API for getting single commit * Fix tests and do it differently Co-authored-by: zeripath <art27@cantab.net>
* Split some words from template to improve translation. (#11221)L0veSunshine2020-05-081-6/+6
| | | | | | | | | | | | * split some words from template * split some words from template * add " " to mustache expression * split some words from template Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>