summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * sort projects displayed on projects pageJoel Johnson2015-07-021-0/+2
| |
* | Merge pull request #284 from mrjoel/mrjoel-useshortrefsJames Moger2015-07-042-18/+14
|\ \ | | | | | | prefer shortened refs for cleaner/shorter URLs
| * | prefer shortened refs for cleaner/shorter URLsJoel Johnson2015-07-012-18/+14
| |/
* | Merge pull request #281 from mrjoel/mrjoel-ticketswithexternalurlJames Moger2015-07-045-30/+63
|\ \ | | | | | | allow internal privilege evaluation external URLs
| * | allow advertising gitblit privileges for external URLsJoel Johnson2015-07-015-30/+63
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit c20191fc0931a19bec0df1ab2b56f287e5d8b7c7 enabled support for hiding internal URLs, but didn't consider that it broke the evaluation of permissions (used for tickets, etc.), and caused a NPE on repoUrl.permission when trying to view the TicketPage. With all internal mechanisms disabled, it would result in the first URL being external with unknown permissions. This adds an option to use internal permissions even for external URLs. Note that this does not grant any additional permissions, but does offer the option to have gitblit advertise the full set of what is allowed, even if the external URL imposes additional restrictions.
* | Merge pull request #286 from mrjoel/mrjoel-projectlistcssJames Moger2015-07-042-2/+6
|\ \ | | | | | | provide spacing on the projects page listing
| * | provide spacing on the projects page listingJoel Johnson2015-07-022-2/+6
| |/ | | | | | | | | | | | | | | | | | | The projects page was showing the project listing directly under the navbar with no spacing. This adds spacing to have the elements offset. The table is showing using the common "repositories" class, however it can't be changed directly since several other table displays use the same class, and have adequate top margin spacing. We create a new class for the one-off use on the projects page.
* | Merge pull request #289 from mrjoel/mrjoel-typosJames Moger2015-07-041-1/+1
|\ \ | |/ |/| fix comment typo
| * fix comment typoJoel Johnson2015-07-011-1/+1
|/
* Merge pull request #282 from mrjoel/mrjoel-fixhttpurlpermsJames Moger2015-06-301-2/+3
|\ | | | | fix permission capping for HTTP/HTTPS
| * fix permission capping for HTTP/HTTPSJoel Johnson2015-06-301-2/+3
| | | | | | | | | | | | Previously used request scheme, but request scheme is unrelated to the URL being generated. Instead, base the permission capping on the scheme of the URL itself.
* | Merge pull request #278 from mrjoel/mrjoel-addversiontojarfilenameJames Moger2015-06-301-1/+1
|\ \ | | | | | | Add version number to WAR jar filename
| * | add version number to built jar filesJoel Johnson2015-06-291-1/+1
| |/
* | Merge pull request #277 from mrjoel/mrjoel-serverNPEfixJames Moger2015-06-301-16/+19
|\ \ | | | | | | NPE server fix
| * | if failed to bind to port, don't use socketJoel Johnson2015-06-291-16/+19
| |/
* | Merge pull request #276 from mrjoel/mrjoel-typofixesJames Moger2015-06-302-2/+2
|\ \ | | | | | | typo fixes
| * | typo: instantiate log messageJoel Johnson2015-06-291-1/+1
| | |
| * | typo: site ticket documentationJoel Johnson2015-06-291-1/+1
| |/
* | Merge pull request #275 from mrjoel/mrjoel-cookiesession3.0James Moger2015-06-301-2/+5
|\ \ | |/ |/| use JEE 3.0 to allow cookie session tracking
| * use JEE 3.0 to allow cookie session trackingJoel Johnson2015-06-291-2/+5
|/
* Update to JGit 4.0.1James Moger2015-06-281-1/+1
|
* Merged #259 "Allow custom host & port specification for advertised SSH urls"James Moger2015-06-155-20/+57
|\
| * Renamed ssh.Display(Host|Port) to ssh.Advertised(Host|Port)James Moger2015-06-155-19/+19
| |
| * Added git.sshDisplay{Port|Host} to hide port forward.Morten Bøgeskov2015-06-155-12/+49
|/ | | | | | Running gitblit in a container it's easy to expose the ssh on the default port. Using git.sshDisplayPort/git.sshDisplayHost you can expose the forwarded address as the official location.
* Merged #258 "Create an avatar provider that defaults to Gravatar"James Moger2015-06-1523-40/+247
|\
| * Revised AvatarGenerator to be injectableJames Moger2015-06-1511-108/+142
| |
| * First draft for a customized avatar imageFabrice Bacchella2015-06-1521-40/+213
| |
* | Merge pull request #263 from jeyoung/netbeans_supportJames Moger2015-06-151-135/+0
|\ \ | | | | | | Reworked NetBeans project to be based on the pom.xml rather than the …
| * | Reworked NetBeans project to be based on the pom.xml rather than the build.xml.Eddy Young2015-05-241-135/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Maven pom.xml is the new default for organising NetBeans projects, but the structure of the gitblit source folder is unusual because of the placement of the bugtraq source in the tree and Maven does not support this by default. This change introduces Maven Build Helper plugin to integrate the additional source locations. This is preferable to using nbproject\project.xml because 1) there is no need to generate the classpath for that file from build.moxie and 2) the POM generated by build.moxie can be re-used almost as-is, with the following additional configuration. Additional Maven Build Helper (add under build/plugins): <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions> <execution> <id>add-source-bugtraq</id> <phase>generate-sources</phase> <goals> <goal>add-source</goal> </goals> <configuration> <sources> <source>src/main/bugtraq</source> </sources> </configuration> </execution> <execution> <id>add-test-source-bugtraq</id> <phase>generate-test-sources</phase> <goals> <goal>add-test-source</goal> </goals> <configuration> <sources> <source>src/test/bugtraq</source> </sources> </configuration> </execution> <execution> <id>add-resources</id> <phase>generate-resources</phase> <goals> <goal>add-resource</goal> </goals> <configuration> <resources> <resource> <directory>src/main/resources</directory> <targetPath>resources</targetPath> <excludes> <exclude>**/junk/**</exclude> </excludes> </resource> </resources> </configuration> </execution> <execution> <id>add-test-resources</id> <phase>generate-test-resources</phase> <goals> <goal>add-test-resource</goal> </goals> <configuration> <resources> <resource> <directory>src/test/resources</directory> <targetPath>resources</targetPath> <excludes> <exclude>**/junk/**</exclude> </excludes> </resource> </resources> </configuration> </execution> </executions> </plugin> Source configuration (add at the end of pom.xml): <properties> <maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.target>1.7</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties>
* | | Merged #257 "Bump to JGit 4.0.0"James Moger2015-06-1513-46/+70
|\ \ \
| * | | Bump to JGit 4.0.0Luca Milanesio2015-06-1213-46/+70
| | |/ | |/| | | | | | | | | | JGit 4.0.0 fixes a memory leak but introduces a non-compatible change for closing the RevWalk: before it was release() but now is close()
* | | Merged #256 "allow configuring of internal URLs offered"James Moger2015-06-152-3/+24
|\ \ \ | |/ / |/| |
| * | allow configuring of internal URLs offeredJoel Johnson2015-06-122-3/+24
|/ /
* | Merged #57 "My Tickets needs a repository filter"James Moger2015-05-273-352/+447
|\ \
| * | Applied changes according to code review comments.Eddy Young2015-05-231-15/+10
| | | | | | | | | | | | Removed default "watchedby" filter so that the default now includes "createdby", "responsible", watchedby" and "mention"
| * | Changed the repository filter options to those related to the tickets owned ↵Eddy Young2015-05-221-378/+418
| | | | | | | | | | | | | | | | | | by the user. Also, minor refactoring to avoid code duplication.
| * | Replaced repository name as search criterion with repository idEddy Young2015-05-221-30/+29
| | |
| * | Merge branch 'develop' into ticket-57_developEddy Young2015-05-2211-18/+1023
| |\ \
| * \ \ Implemented ticket-57Eddy Young2015-05-193-10/+71
| |\ \ \
| | * | | Implemented filtering by repository for the My Tickets pageEddy Young2015-05-191-9/+12
| | | | |
| | * | | More changesEddy Young2015-05-192-5/+7
| | | | |
| | * | | Initial changes for ticket-57Eddy Young2015-05-186-15/+71
| | | | | | | | | | | | | | | | | | | | Added tags to .gitignore
| | * | | Merged #245 "Strip line breaks from pasted SSH keys"James Moger2015-03-071-1/+3
| | |\ \ \
* | | \ \ \ Merged #255 "Invalid kerberos patches, works now and with a test."James Moger2015-05-278-2/+175
|\ \ \ \ \ \
| * | | | | | Invalid kerberos patches, works now and with a test.Fabrice Bacchella2015-05-268-2/+175
| | | | | | |
* | | | | | | Merged #254 "Two slight improvement for custom UserService"James Moger2015-05-261-2/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Two slight improvement for custom UserService:Fabrice Bacchella2015-05-261-2/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | - try userRealm as a file only if class is not found, other exeptions are real error - log userService only after setup, for better logging, as it can use gitblit.properties for custom .toString
* | | | | | Merge pull request #262 from fbacchella/keepsessionJames Moger2015-05-241-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Do not replace session when authentication type is CONTAINER
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-02 04:52:46 +0000