summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/wicket
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'rcaa-master' into master.Florian Zschocke2016-12-131-1/+1
|\ \
| * | removing duplicated code for cookie genaration and adding random bytes to ↵Rodrigo Andrade2016-08-151-1/+1
| | | | | | | | | | | | generate user cookies
* | | Fix disabled links in PagerPanelTom2016-10-312-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabled links in the PagerPanel (used on the LuceneSearchPage to page through search results) were only rendered as "disabled". The links themselves remained active, which gives strange effects when clicked. For instance it was possible to move to result pages -1, -2, and so on. Really disable the links. Add missing CSS rules to have correct styling as Wicket renders disabled links as spans, not anchors. Include the new CSS file in BasePage.html. And add the left/right arrows only if not on the first/last page.
* | | Merge pull request #1142 from fzs/merge-strategyJames Moger2016-10-284-4/+13
|\ \ \ | | | | | | | | Merge strategy
| * | | Add merge type setting to repository page.merged--merge-strategyFlorian Zschocke2016-10-283-1/+10
| | | | | | | | | | | | | | | | The merge type is a per repository setting. Add it to the edit page.
| * | | Add integration strategy to merge tickes fast-forward or with commit.Florian Zschocke2016-10-281-3/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the option to merge a ticket branch to the integration branch only when it can be fast-forwarded, or always with a merge commit, or by fast-foward if possible, otherwise with a merge commit. Adds a new property ticket.mergeType with the valid values FAST_FOWARD_ONLY, MERGE_ALWAYS and MERGE_IF_NECESSARY. Merging and canMerge were refactored to make use of a new IntegrationStrategy class for each type of strategy.
* | | Spelling mistake fixlarsmaes2016-09-161-1/+1
| |/ |/| | | pushedNewBranch was wrongly spelled
* | 1.8.x tranditional chinese translationwilliam2016-08-041-27/+21
| |
* | 1.8.x tranditional chinese translation after user experiencewilliam2016-08-041-711/+728
|/
* Merge pull request #1087 from ↵Paul Martin2016-06-191-0/+1
|\ | | | | | | | | mereth/issues/964-session-loss-redirects-to-start-page Fixes #964 - add missing redirect after restoring user in new session
| * add missing redirect after restoring user in new sessionmereth2016-06-151-0/+1
| |
* | Merge pull request #1055 from gitblit/1048-TicketReferencesPaul Martin2016-06-183-8/+41
|\ \ | |/ |/| Ticket Reference handling #1048
| * Ticket Reference handling #1048Paul Martin2016-04-273-8/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Supports referencing: + Tickets from other tickets via comments + Tickets from commits on any branch + Common TicketLink class used for both commits and tickets + TicketLink is temporary and persisted to ticket as a Reference + Support deletion of ticket references + Rebasing patchsets/branches will generate new references + Deleting old patchsets/branches will remove the relevant references + Substantial testing of use cases + With and without patchsets, deleting, amending + BranchTicketService used during testing to allow end-to-end ref testing + Relocated common git helper functions to JGitUtils
* | Fixes #1062 - Upgraded to Prosemirror 0.6.1Paul Martin2016-04-291-3/+2
| |
* | Fixes #1061 - Most recent first on filestore pagePaul Martin2016-04-281-2/+42
|/
* fixes #966 to prevent always searching all reposPaul Martin2016-04-161-3/+6
|
* Fixes #1028 - FilestorePage now pages and filtersPaul Martin2016-04-083-20/+180
|
* Fix for #962 - Delete patchset abilityPaul Martin2016-04-063-1/+110
|
* Fix for #1042 - Filestore items now shown as iconsPaul Martin2016-04-067-48/+13
|
* Fixes #882 Honour allow new ticket settingPaul Martin2016-04-061-1/+1
|
* Fix for #1037 myTickets now honours permissionsPaul Martin2016-04-041-5/+13
|
* Fix for #1034 Ticket Page ErrorPaul Martin2016-03-311-8/+10
|
* Friendly URL for EditFile Page #974Paul Martin2016-03-274-13/+20
| | | | + Prevent Edit of old doc version
* Disable edit links in read only mode #974Paul Martin2016-03-272-5/+21
|
* Document edit capability via ProseMirror submodule #974Paul Martin2016-03-276-4/+290
| | | | | | | | | | | | + New docEdit page with links from docPage and docList + Bespoke menu system with full screen edit mode + npm required for building client side scripts + Ant script added for BuildUI which performs npm commands + Update font-awesome to 4.5.0 + Factor out to JGitUtils common code in BranchTicketService for EditFilePage + getTreeEntries + commitIndex + Merge capability for document editing
* Merge pull request #1032 from gitblit/1031-FixForRepositoryPagePaul Martin2016-03-271-2/+10
|\ | | | | Fix for #1031 to display error message
| * Fix for #1031 to display error messagePaul Martin2016-03-261-2/+10
| |
* | Fix for #1018 and #1025 browser LFS linksPaul Martin2016-03-214-12/+279
|/ | | | | + View and Raw both download the actual file + Blame will show the metafile
* Fix for #976 - Filestore links via browserPaul Martin2015-12-259-49/+122
| | | | | | | | | | | | | + GitLFS client support + FilestoreModel now parses meta file + Read meta heading from cache if available + Authentication based on accept headers for browser view filestore login + PathModel & PathChangeModel now understands filestore items + Zip & Rar downloads contain include filestore items + Filestore servlet returns LFS JSON error only if accepted by client + DiffStat now knows repository to allow identification of filestore items + Filestore items identified and returned via view, raw & blob links on blame, commitDiff, commit and Tree pages
* fix for #978 - HTML5 date input supportPaul Martin2015-12-096-9/+181
| | | | | | | | + JS patch/hack to coerce legacy wicket into talking to a HTML5 input type + JS script to hide inline help on date format when using HTML5 date picker + Date picker shown in user locale and standard does not support custom format. + Always sent in ISO8601 format
* fix for #967 filestore menu for all usersPaul Martin2015-12-073-32/+22
| | | | | | + Filestore listing filtered by user view permissions + Configuration help for filestore relocated to website files + Added migration example
* Catch some potential NPEsJames Moger2015-11-181-0/+3
|
* Require admin permissions to view the filestore pageJames Moger2015-11-182-34/+26
|
* Do not display fork button if target repo already exists (fixes #944)James Moger2015-11-101-1/+4
|
* Declare top and bottom page links on reflog page (fixes #761)James Moger2015-11-102-5/+16
|
* Log update for Fail2Ban usagePaul Martin2015-10-251-1/+4
| | | | | + Adds standard logging for all authentication providers + Updates help page to use default GitBlit SSH port
* Git-LFS supportPaul Martin2015-10-109-2/+333
| | | | | | | | | | | | | | + Metadata maintained in append-only JSON file providing complete audit history. + Filestore menu item + Lists filestore items + Current size and availability + Link to GitBlit Filestore help page (top right) + Hooks into existing repository permissions + Uses default repository path for out-of-box operation with Git-LFS client + accessRestrictionFilter now has access to http method and auth header + Testing for servlet and manager
* #932 do not trim passwords anywhere in the uiRainerW2015-10-084-8/+54
|
* Ensure a repository is only searched onceJames Moger2015-10-051-3/+6
|
* Tweak search page translation resourceJames Moger2015-10-052-3/+3
|
* Add "all repositories" parameterVitaliy Filippov2015-10-013-9/+20
|
* redefine some traditional chinese translation after user's feedback since ↵william2015-09-301-60/+66
| | | | from 2015/08/05
* Merge pull request #908 from mrjoel/mrjoel-authrequestnotsessionJames Moger2015-09-182-32/+44
|\ | | | | prevent session fixation for external authentication
| * prevent session fixation for external authenticationJoel Johnson2015-07-142-32/+44
| | | | | | | | | | + use request instead of session to flag authentication status and user, for external authentication types
* | Use author date to be consistent with other tools (fixes #919)James Moger2015-09-184-5/+5
| |
* | Add traditional Chinese language choiceJames Moger2015-08-071-1/+2
| |
* | minor translationwilliam2015-08-051-702/+702
| |
* | trandition chinese translationwilliam2015-08-051-0/+766
| | | | | | | | it's for zh_TW(Taiwan)
* | fix feed link from user's repository pageJoel Johnson2015-07-141-1/+2
|/
* Merge pull request #287 from mrjoel/mrjoel-sortprojectlistJames Moger2015-07-081-0/+2
|\ | | | | sort projects displayed on projects page
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-29 01:44:33 +0000