summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1055 from gitblit/1048-TicketReferencesPaul Martin2016-06-1814-201/+1926
|\ | | | | Ticket Reference handling #1048
| * TicketReference Testing #1048Paul Martin2016-06-181-4/+36
| | | | | | | | + Multiple commits in a single push
| * Ticket Reference handling #1048Paul Martin2016-04-2714-201/+1894
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 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
* | Merge pull request #1084 from metasim/youtrack-hookJames Moger2016-06-132-0/+254
|\ \ | | | | | | Initial implementation of a JetBrains YouTrack hook for GitBlit.
| * | Initial implementation of a JetBrains YouTrack hook for GitBlit.Simeon H.K. Fitch2016-06-032-0/+254
| | |
* | | Merge pull request #1086 from dsteinkopf/masterJames Moger2016-06-131-2/+14
|\ \ \ | | | | | | | | fix baseURL handling in HttpUtils, fixes #1083
| * | | fix baseURL handling in HttpUtils, fixes #1083Dirk Steinkopf2016-06-121-2/+14
|/ / /
* | | Merge pull request #1073 from gitblit/1062-DocEditorUpdatesPaul Martin2016-04-304-29/+36
|\ \ \ | | | | | | | | Fixes #1062 - Upgraded to Prosemirror 0.6.1
| * | | Fixes #1062 - Upgraded to Prosemirror 0.6.1Paul Martin2016-04-294-29/+36
|/ / /
* | | Merge pull request #1070 from gitblit/1061-filestoreSortByDatePaul Martin2016-04-282-3/+48
|\ \ \ | | | | | | | | Fixes #1061 - Most recent first on filestore page
| * | | Fixes #1061 - Most recent first on filestore pagePaul Martin2016-04-282-3/+48
| | |/ | |/|
* / | Use getInteger not getFilesize, fixes #1049James Moger2016-04-201-1/+1
|/ /
* | Merge pull request #1047 from yyjdelete/patch-1Paul Martin2016-04-161-1/+1
|\ \ | | | | | | Use utf-8 for Javadoc
| * | Specify encoding of javadoc to "utf-8"SilverFox2016-04-081-1/+1
| | | | | | | | | | | | That will fix build of javadoc in Windows zh-cn (and maybe some other locale). Unknown why javac works well.
* | | Merge pull request #1060 from gitblit/966-Searching-Always-Over-All-RepositoriesPaul Martin2016-04-161-3/+6
|\ \ \ | | | | | | | | fixes #966 to prevent always searching all repos
| * | | fixes #966 to prevent always searching all reposPaul Martin2016-04-161-3/+6
|/ / /
* | | Merge pull request #1046 from gitblit/1028-FilterAndPagingForFilestorePagePaul Martin2016-04-114-20/+207
|\ \ \ | |/ / |/| | Fixes #1028 - FilestorePage now pages and filters
| * | Fixes #1028 - FilestorePage now pages and filtersPaul Martin2016-04-084-20/+207
|/ /
* | Merge pull request #1039 from gitblit/962-Patchset-Revision-DeletePaul Martin2016-04-067-9/+187
|\ \ | | | | | | Fix for #962 - Delete patchset ability
| * | Fix for #962 - Delete patchset abilityPaul Martin2016-04-067-9/+187
|/ /
* | Merge pull request #1044 from gitblit/1042-IntrusiveFilestoreLozengePaul Martin2016-04-068-48/+17
|\ \ | | | | | | Fix for #1042 - Filestore items now shown as icons
| * | Fix for #1042 - Filestore items now shown as iconsPaul Martin2016-04-068-48/+17
|/ /
* | Merge pull request #1045 from gitblit/882-HonourAllowNewTicketSettingPaul Martin2016-04-061-1/+1
|\ \ | | | | | | Fixes #882 Honour allow new ticket setting
| * | Fixes #882 Honour allow new ticket settingPaul Martin2016-04-061-1/+1
|/ /
* | Merge pull request #1040 from gitblit/1037-EnforcePermissionsForTicketsPaul Martin2016-04-051-5/+13
|\ \ | | | | | | Fix for #1037 myTickets now honours permissions
| * | Fix for #1037 myTickets now honours permissionsPaul Martin2016-04-041-5/+13
|/ /
* | Merge pull request #1035 from gitblit/1034-RepositoryPageLifecyclePaul Martin2016-04-011-8/+10
|\ \ | | | | | | Fix for #1034 Ticket Page Error
| * | Fix for #1034 Ticket Page ErrorPaul Martin2016-03-311-8/+10
|/ /
* | Merge pull request #1022 from gitblit/974-in-browser-doc-editorPaul Martin2016-03-2827-153/+1148
|\ \ | | | | | | Support for editing documents in the browser #974
| * | Friendly URL for EditFile Page #974Paul Martin2016-03-275-13/+37
| | | | | | | | | | | | + Prevent Edit of old doc version
| * | Disable edit links in read only mode #974Paul Martin2016-03-272-5/+21
| | |
| * | Updating ProseMirror to 0.4.0Paul Martin2016-03-272-10/+10
| | |
| * | Document edit capability via ProseMirror submodule #974Paul Martin2016-03-2725-150/+1105
|/ / | | | | | | | | | | | | | | | | | | | | | | + 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
| | |
* | | Merge pull request #1027 from gitblit/1018-Filestore-downloads-filenamePaul Martin2016-03-234-12/+279
|\ \ \ | |/ / |/| | Links to filestore items now download file with correct filename and extension
| * | 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
* | Merge pull request #988 from gitblit/976-raw-download-filestore-itemJames Moger2016-01-2524-131/+468
|\ \ | | | | | | Fix for #976 - Filestore links via browser
| * | Fix for #976 - Filestore links via browserPaul Martin2015-12-2524-131/+468
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 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
* | | Merge pull request #1004 from RedShift1/ticket-#998-document-DH-keysizeJames Moger2016-01-171-1/+11
|\ \ \ | | | | | | | | Ticket #998 document dh keysize
| * | | Typo in setup_transport_http.mkdGlenn Matthys2016-01-171-1/+1
| | | |
| * | | Describe how DH key bitlength can be influencedGlenn Matthys2016-01-171-0/+10
| | | |
* | | | Merge pull request #1003 from RedShift1/ticket-#997-doc-char-encodingJames Moger2016-01-171-1/+1
|\ \ \ \ | |/ / / |/| | | Fix char encoding in setup_proxy.mkd
| * | | Fix char encoding in setup_proxy.mkdGlenn Matthys2016-01-171-1/+1
|/ / /
* | | Merge pull request #990 from dbywalec/authenthication-of-federation-userJames Moger2016-01-161-0/+6
|\ \ \ | | | | | | | | Fix authentication failure warning log messages for FEDERATION_USER
| * | | Fix authentication failure warning log messages for FEDERATION_USERDariusz Bywalec2016-01-041-0/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The AuthenticationManager did not encounter for FEDERATION_USER and would unnecessarily generate a lot of failure warning log messages, e.g: Failed login attempt for $gitblit, invalid credentials from XXX.XX.XX.XX A simple condition will prematurely return null bypassing the regular authentication path and immediately make the authentication be routed via FederationManager.
* | | Merge pull request #991 from ↵James Moger2016-01-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | dbywalec/authentication-of-already-authenticated-user Lower log level of servlet authenticate when request is already authenticated
| * | | Lower log level of servlet authenticate when request is already authenticatedDariusz Bywalec2016-01-041-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | When calling a servlet which has already been authenticated, the server would produce a lot of superfluous log entries, e.g: Called servlet authenticate when request is already authenticated. The log level for this log entry has been lowered down to DEBUG.
* | | Merge pull request #994 from KeDevServices/masterJames Moger2016-01-161-13/+2
|\ \ \ | |/ / |/| | Fix for #993 LIST_BRANCHES without admin
| * | Fix for #993 LIST_BRANCHES without adminBoris Stumm2016-01-061-13/+2
|/ / | | | | | | | | Replaced the canAccess() method in RpcFilter with !adminRequest, that should solve the problem.
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 12:42:04 +0000