Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use REGEX_TICKET_MENTION instead of hardcoded regular expression | Glenn Matthys | 2016-12-10 | 3 | -3/+6 |
| | |||||
* | Introduce new constant REGEX_TICKET_MENTION | Glenn Matthys | 2016-12-10 | 1 | -0/+6 |
| | |||||
* | Prepare 1.8.0 releasev1.8.0 | James Moger | 2016-06-22 | 2 | -10/+10 |
| | |||||
* | Update documentation for 1.8.0 release | James Moger | 2016-06-22 | 2 | -96/+37 |
| | |||||
* | Merge pull request #1087 from ↵ | Paul Martin | 2016-06-19 | 1 | -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 session | mereth | 2016-06-15 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #1055 from gitblit/1048-TicketReferences | Paul Martin | 2016-06-18 | 14 | -201/+1926 |
|\ \ | |/ |/| | Ticket Reference handling #1048 | ||||
| * | TicketReference Testing #1048 | Paul Martin | 2016-06-18 | 1 | -4/+36 |
| | | | | | | | | + Multiple commits in a single push | ||||
| * | Ticket Reference handling #1048 | Paul Martin | 2016-04-27 | 14 | -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-hook | James Moger | 2016-06-13 | 2 | -0/+254 |
|\ \ | | | | | | | Initial implementation of a JetBrains YouTrack hook for GitBlit. | ||||
| * | | Initial implementation of a JetBrains YouTrack hook for GitBlit. | Simeon H.K. Fitch | 2016-06-03 | 2 | -0/+254 |
| | | | |||||
* | | | Merge pull request #1086 from dsteinkopf/master | James Moger | 2016-06-13 | 1 | -2/+14 |
|\ \ \ | | | | | | | | | fix baseURL handling in HttpUtils, fixes #1083 | ||||
| * | | | fix baseURL handling in HttpUtils, fixes #1083 | Dirk Steinkopf | 2016-06-12 | 1 | -2/+14 |
|/ / / | |||||
* | | | Merge pull request #1073 from gitblit/1062-DocEditorUpdates | Paul Martin | 2016-04-30 | 4 | -29/+36 |
|\ \ \ | | | | | | | | | Fixes #1062 - Upgraded to Prosemirror 0.6.1 | ||||
| * | | | Fixes #1062 - Upgraded to Prosemirror 0.6.1 | Paul Martin | 2016-04-29 | 4 | -29/+36 |
|/ / / | |||||
* | | | Merge pull request #1070 from gitblit/1061-filestoreSortByDate | Paul Martin | 2016-04-28 | 2 | -3/+48 |
|\ \ \ | | | | | | | | | Fixes #1061 - Most recent first on filestore page | ||||
| * | | | Fixes #1061 - Most recent first on filestore page | Paul Martin | 2016-04-28 | 2 | -3/+48 |
| | |/ | |/| | |||||
* / | | Use getInteger not getFilesize, fixes #1049 | James Moger | 2016-04-20 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1047 from yyjdelete/patch-1 | Paul Martin | 2016-04-16 | 1 | -1/+1 |
|\ \ | | | | | | | Use utf-8 for Javadoc | ||||
| * | | Specify encoding of javadoc to "utf-8" | SilverFox | 2016-04-08 | 1 | -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-Repositories | Paul Martin | 2016-04-16 | 1 | -3/+6 |
|\ \ \ | | | | | | | | | fixes #966 to prevent always searching all repos | ||||
| * | | | fixes #966 to prevent always searching all repos | Paul Martin | 2016-04-16 | 1 | -3/+6 |
|/ / / | |||||
* | | | Merge pull request #1046 from gitblit/1028-FilterAndPagingForFilestorePage | Paul Martin | 2016-04-11 | 4 | -20/+207 |
|\ \ \ | |/ / |/| | | Fixes #1028 - FilestorePage now pages and filters | ||||
| * | | Fixes #1028 - FilestorePage now pages and filters | Paul Martin | 2016-04-08 | 4 | -20/+207 |
|/ / | |||||
* | | Merge pull request #1039 from gitblit/962-Patchset-Revision-Delete | Paul Martin | 2016-04-06 | 7 | -9/+187 |
|\ \ | | | | | | | Fix for #962 - Delete patchset ability | ||||
| * | | Fix for #962 - Delete patchset ability | Paul Martin | 2016-04-06 | 7 | -9/+187 |
|/ / | |||||
* | | Merge pull request #1044 from gitblit/1042-IntrusiveFilestoreLozenge | Paul Martin | 2016-04-06 | 8 | -48/+17 |
|\ \ | | | | | | | Fix for #1042 - Filestore items now shown as icons | ||||
| * | | Fix for #1042 - Filestore items now shown as icons | Paul Martin | 2016-04-06 | 8 | -48/+17 |
|/ / | |||||
* | | Merge pull request #1045 from gitblit/882-HonourAllowNewTicketSetting | Paul Martin | 2016-04-06 | 1 | -1/+1 |
|\ \ | | | | | | | Fixes #882 Honour allow new ticket setting | ||||
| * | | Fixes #882 Honour allow new ticket setting | Paul Martin | 2016-04-06 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1040 from gitblit/1037-EnforcePermissionsForTickets | Paul Martin | 2016-04-05 | 1 | -5/+13 |
|\ \ | | | | | | | Fix for #1037 myTickets now honours permissions | ||||
| * | | Fix for #1037 myTickets now honours permissions | Paul Martin | 2016-04-04 | 1 | -5/+13 |
|/ / | |||||
* | | Merge pull request #1035 from gitblit/1034-RepositoryPageLifecycle | Paul Martin | 2016-04-01 | 1 | -8/+10 |
|\ \ | | | | | | | Fix for #1034 Ticket Page Error | ||||
| * | | Fix for #1034 Ticket Page Error | Paul Martin | 2016-03-31 | 1 | -8/+10 |
|/ / | |||||
* | | Merge pull request #1022 from gitblit/974-in-browser-doc-editor | Paul Martin | 2016-03-28 | 27 | -153/+1148 |
|\ \ | | | | | | | Support for editing documents in the browser #974 | ||||
| * | | Friendly URL for EditFile Page #974 | Paul Martin | 2016-03-27 | 5 | -13/+37 |
| | | | | | | | | | | | | + Prevent Edit of old doc version | ||||
| * | | Disable edit links in read only mode #974 | Paul Martin | 2016-03-27 | 2 | -5/+21 |
| | | | |||||
| * | | Updating ProseMirror to 0.4.0 | Paul Martin | 2016-03-27 | 2 | -10/+10 |
| | | | |||||
| * | | Document edit capability via ProseMirror submodule #974 | Paul Martin | 2016-03-27 | 25 | -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-FixForRepositoryPage | Paul Martin | 2016-03-27 | 1 | -2/+10 |
|\ \ | | | | | | | Fix for #1031 to display error message | ||||
| * | | Fix for #1031 to display error message | Paul Martin | 2016-03-26 | 1 | -2/+10 |
| | | | |||||
* | | | Merge pull request #1027 from gitblit/1018-Filestore-downloads-filename | Paul Martin | 2016-03-23 | 4 | -12/+279 |
|\ \ \ | |/ / |/| | | Links to filestore items now download file with correct filename and extension | ||||
| * | | Fix for #1018 and #1025 browser LFS links | Paul Martin | 2016-03-21 | 4 | -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-item | James Moger | 2016-01-25 | 24 | -131/+468 |
|\ \ | | | | | | | Fix for #976 - Filestore links via browser | ||||
| * | | Fix for #976 - Filestore links via browser | Paul Martin | 2015-12-25 | 24 | -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-keysize | James Moger | 2016-01-17 | 1 | -1/+11 |
|\ \ \ | | | | | | | | | Ticket #998 document dh keysize | ||||
| * | | | Typo in setup_transport_http.mkd | Glenn Matthys | 2016-01-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Describe how DH key bitlength can be influenced | Glenn Matthys | 2016-01-17 | 1 | -0/+10 |
| | | | | |||||
* | | | | Merge pull request #1003 from RedShift1/ticket-#997-doc-char-encoding | James Moger | 2016-01-17 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Fix char encoding in setup_proxy.mkd | ||||
| * | | | Fix char encoding in setup_proxy.mkd | Glenn Matthys | 2016-01-17 | 1 | -1/+1 |
|/ / / |