summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* Merge pull request #986 from rgroux/jenkins-groovy-all-protoJames Moger2015-12-231-1/+4
|\ | | | | Change Jenkins groovy script for any protocol (git/http/ssh)
| * Change Jenkins groovy script for any protocol (git/http/ssh)rgroux2015-12-161-1/+4
|/ | | | | groovy.jenkinsGitbaseurl in gitblit.properties or web.xml can override the http default protocol
* Merge pull request #980 from mrjoel/mrjoel-httpheadersJames Moger2015-12-107-12/+280
|\ | | | | Refactor authentication for servlet HTTP header handler
| * remove external account type in lieu of specific typeJoel Johnson2015-12-092-4/+1
| | | | | | | | | | | | | | This was unused and causing provider lookup to fail in AuthenticationManager.findProvider() by changing it out from underneath. As a result, the supportXChanges methods weren't being reported correctly.
| * add site documentation for HTTP header authenticationJoel Johnson2015-12-091-0/+12
| |
| * implement an HTTP header AuthenticationProviderJoel Johnson2015-12-095-9/+268
| |
* | Merge pull request #981 from mrjoel/mrjoel-loguseraccessJames Moger2015-12-101-2/+2
|\ \ | | | | | | Log username with access logging
| * | log authenticated usernameJoel Johnson2015-12-091-2/+2
| |/
* | Merge pull request #982 from gitblit/978-milestone-date-selectorJames Moger2015-12-106-9/+181
|\ \ | | | | | | fix for #978 - HTML5 date input support
| * | 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
* | Merge pull request #983 from mrjoel/mrjoel-dotfiledetectionJames Moger2015-12-091-1/+8
|\ \ | |/ |/| revise logic for forcing dotfile to text
| * revise logic for forcing dotfile to textJoel Johnson2015-12-091-1/+8
|/
* Merge pull request #979 from pingunaut/masterJames Moger2015-12-081-31/+12
|\ | | | | Remove empty catch blocks to stop swallowing exceptions. #498
| * Remove empty catch blocks to stop swallowing exceptions. #498 Martin Spielmann2015-12-081-31/+12
| |
* | Merge pull request #973 from paulsputer/967-Filestore-HelpJames Moger2015-12-0810-38/+126
|\ \ | | | | | | fix for #967 filestore menu and help
| * | fix for #967 filestore menu for all usersPaul Martin2015-12-0710-38/+126
|/ / | | | | | | | | | | + Filestore listing filtered by user view permissions + Configuration help for filestore relocated to website files + Added migration example
* | Merge pull request #969 from paulsputer/968-GitLFS-Extract-URI-From-RepositoryJames Moger2015-12-031-1/+1
|\ \ | |/ |/| fix for #968 extracting repository from URI
| * fix for #968 extracting repository from URIPaul Martin2015-12-031-1/+1
| | | | | | | | + Allows using lfs when `server.contextPath = /git`
* | Handle possible NPE when extracting WAR resources into a new directoryJames Moger2015-11-251-1/+7
| |
* | Fix 2 possible NullPointer occurencesmarco2015-11-232-1/+14
| |
* | Raw servlet now assumes text/plain for dot filesJames Moger2015-11-232-7/+102
| |
* | Simplify build and contribution process back to master/trunk developmentJames Moger2015-11-232-38/+4
| |
* | Match longest repository path towards the shortest pr-950paladox2015-11-231-15/+6
| | | | | | | | This was originally from https://github.com/gitblit/gitblit/pull/950 but seems to have been reverted when develop branch was merged with master.
* | Reset build identifiers for next point release cycleJames Moger2015-11-232-2/+20
| |
* | Prepare 1.7.1 releasev1.7.1James Moger2015-11-232-10/+10
| |
* | DocumentationJames Moger2015-11-231-6/+99
| |
* | Fix failure to start WAR variantsJames Moger2015-11-231-88/+88
| |
* | Reset build identifiers for next point release cycleJames Moger2015-11-222-2/+20
| |
* | Prepare 1.7.0 releasev1.7.0James Moger2015-11-222-10/+10
| |
* | Merge branch 'develop'James Moger2015-11-22263-5869/+14517
|\ \
| * | Create filestore directory on startupJames Moger2015-11-191-2/+4
| | |
| * | DocumentationJames Moger2015-11-185-24/+4
| | |