summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add merge type setting to repository page.merged--merge-strategyFlorian Zschocke2016-10-283-1/+10
* Add integration strategy to merge tickes fast-forward or with commit.Florian Zschocke2016-10-287-69/+341
* Prepare 1.8.0 releasev1.8.0James Moger2016-06-222-10/+10
* Update documentation for 1.8.0 releaseJames Moger2016-06-222-96/+37
* Merge pull request #1087 from mereth/issues/964-session-loss-redirects-to-sta...Paul Martin2016-06-191-0/+1
|\
| * add missing redirect after restoring user in new sessionmereth2016-06-151-0/+1
* | Merge pull request #1055 from gitblit/1048-TicketReferencesPaul Martin2016-06-1814-201/+1926
|\ \ | |/ |/|
| * TicketReference Testing #1048Paul Martin2016-06-181-4/+36
| * Ticket Reference handling #1048Paul Martin2016-04-2714-201/+1894
* | Merge pull request #1084 from metasim/youtrack-hookJames Moger2016-06-132-0/+254
|\ \
| * | 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 #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.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 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
|\ \
| * | Specify encoding of javadoc to "utf-8"SilverFox2016-04-081-1/+1
* | | Merge pull request #1060 from gitblit/966-Searching-Always-Over-All-RepositoriesPaul Martin2016-04-161-3/+6
|\ \ \
| * | | 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 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 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 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 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 permissionsPaul Martin2016-04-041-5/+13
|/ /
* | Merge pull request #1035 from gitblit/1034-RepositoryPageLifecyclePaul Martin2016-04-011-8/+10
|\ \
| * | 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
|\ \
| * | Friendly URL for EditFile Page #974Paul Martin2016-03-275-13/+37
| * | 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
|/ /
* | Merge pull request #1032 from gitblit/1031-FixForRepositoryPagePaul Martin2016-03-271-2/+10
|\ \
| * | 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
|\ \ \ | |/ / |/| |
| * | Fix for #1018 and #1025 browser LFS linksPaul Martin2016-03-214-12/+279
|/ /
* | Merge pull request #988 from gitblit/976-raw-download-filestore-itemJames Moger2016-01-2524-131/+468
|\ \
| * | Fix for #976 - Filestore links via browserPaul Martin2015-12-2524-131/+468
* | | Merge pull request #1004 from RedShift1/ticket-#998-document-DH-keysizeJames Moger2016-01-171-1/+11
|\ \ \
| * | | 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.mkdGlenn Matthys2016-01-171-1/+1
|/ / /