Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ticket/245' into develop | James Moger | 2015-03-07 | 1 | -1/+3 |
|\ | |||||
| * | Strip line breaks from pasted SSH keys | James Moger | 2015-03-07 | 1 | -1/+3 |
| | | |||||
| * | Merged #244 "Implement user/team difference detection" | James Moger | 2015-03-07 | 2 | -11/+57 |
| |\ | |||||
* | \ | Merge branch 'ticket/244' into develop | James Moger | 2015-03-07 | 2 | -11/+57 |
|\ \ \ | | |/ | |/| | |||||
| * | | Minor refactoring of user/team checksumming | James Moger | 2015-03-07 | 2 | -60/+55 |
| | | | |||||
| * | | Setting up a checksum on user and team instances to lower connection delay | Pierre-yves Baloche | 2015-03-06 | 1 | -14/+65 |
| |/ | |||||
| * | Merged #242 "issue-545: Enforce repository permissions in patch page" | James Moger | 2015-02-26 | 1 | -4/+17 |
| |\ | |||||
* | \ | Merged #243 "Allow Forks is not saved on repository edit" | James Moger | 2015-03-05 | 1 | -7/+3 |
|\ \ \ | |||||
| * | | | Fix failure to save Allow Forks repository setting | James Moger | 2015-03-05 | 1 | -7/+3 |
|/ / / | |||||
* | | | Update SLF4j, JGit, Groovy, BouncyCastle, Mina, Gson, Freemarker, libpam4j, ↵ | James Moger | 2015-03-05 | 6 | -105/+131 |
| | | | | | | | | | | | | args4j, Jedis, waffle-jna, Unboundid | ||||
* | | | Merge branch 'ticket/242' into develop | James Moger | 2015-02-26 | 1 | -4/+17 |
|\ \ \ | | |/ | |/| | |||||
| * | | issue-545: Enforce repository permissions in patch page | James Moger | 2015-02-26 | 1 | -4/+17 |
| |/ | |||||
| * | Merged #241 "issue-527: Synchronize changes from upstream Bugtraq" | James Moger | 2015-02-26 | 1 | -12/+44 |
| |\ | |||||
* | \ | Merge branch 'ticket/241' into develop | James Moger | 2015-02-26 | 1 | -12/+44 |
|\ \ \ | | |/ | |/| | |||||
| * | | issue-527: Synchronize changes from upstream Bugtraq | James Moger | 2015-02-26 | 1 | -12/+44 |
| |/ | |||||
| * | Fix spelling mistake | Southparkfan | 2015-02-26 | 1 | -1/+1 |
| | | |||||
| * | Merged #239 "Remote Leakage Of Shared Buffers In Jetty Web Server ↵ | James Moger | 2015-02-26 | 1 | -1/+1 |
| |\ | | | | | | | | | | [CVE-2015-2080]" | ||||
* | \ | Merged #240 "Fix spelling mistake" | James Moger | 2015-02-26 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix spelling mistake | Southparkfan | 2015-02-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'ticket/239' into develop | James Moger | 2015-02-26 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | issue-566: Udpate to Jetty 9.2.9 for CVE-2015-2080 | James Moger | 2015-02-26 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | Merged #238 "issue 564: enable ticket page update on tomcat with redirects" | James Moger | 2015-02-26 | 2 | -9/+30 |
| |\ \ | | |/ | |/| | |||||
* | | | Merge branch 'ticket/238' into develop | James Moger | 2015-02-26 | 2 | -9/+30 |
|\ \ \ | | |/ | |/| | |||||
| * | | issue 564: enable ticket page update on tomcat with redirects | krulls | 2015-02-26 | 2 | -9/+30 |
| |/ | | | | | | | | | | | issue 564: fix imports issue 564 | ||||
| * | Merged #237 "Add 'UTF8' encoding alias" | James Moger | 2015-02-11 | 1 | -1/+3 |
| |\ | |||||
* | \ | Merge branch 'ticket/237' into develop | James Moger | 2015-02-11 | 1 | -1/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | Add 'UTF8' encoding alias | James Moger | 2015-02-11 | 1 | -1/+3 |
| |/ | |||||
| * | Merged #221 "Update GitBlitWebApp_nl.properties" | James Moger | 2014-11-10 | 1 | -1/+1 |
| |\ | |||||
* | \ | Merged #234 "#230 - Improve empty folder navigation." | James Moger | 2015-01-13 | 6 | -210/+475 |
|\ \ \ | |||||
| * | | | #230 - Improve empty folder navigation. | Milos Cubrilo | 2015-01-11 | 6 | -210/+475 |
|/ / / | | | | | | | | | | Empty folders are automatically skipped when browsing repository tree (similar to github "folder jumping" feature). | ||||
* | | | Merge pull request #240 from steveno/develop | James Moger | 2015-01-03 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | GitBlit no longer uses Google charts | ||||
| * | | | GitBlit no longer uses Google charts | Steven Oliver | 2015-01-02 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merged #228 "Add support for configurable HTTP proxy host/port in ↵ | James Moger | 2014-12-03 | 2 | -2/+26 |
|\ \ \ | | | | | | | | | | | | | PluginManager.java" | ||||
| * | | | Add support for specifying the `Proxy-Authorization` header for the ↵ | James Moger | 2014-12-03 | 2 | -2/+8 |
| | | | | | | | | | | | | | | | | PluginManager | ||||
| * | | | Add support for configurable HTTP proxy host/port in PluginManager.java | Dariusz Bywalec | 2014-12-02 | 2 | -1/+19 |
| | | | | | | | | | | | | | | | | | | | | Formerly by default the PluginMaganer would support no proxy setting. For servers behind firewall and HTTP proxy this would prevent installation of gitblit plugins. | ||||
* | | | | Merged #227 "Small adjustments to allow integration with Gerrit Code Review" | James Moger | 2014-12-03 | 3 | -5/+9 |
|\ \ \ \ | |||||
| * | | | | Use startManager(X) from startManager(Injector, Class) | James Moger | 2014-12-03 | 1 | -3/+1 |
| | | | | | |||||
| * | | | | Allow different aspect rations for top-left logo | Luca Milanesio | 2014-11-29 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When configuring a different top-left logo, we would like to allow to have a different HxW aspect ratio image. We need then to avoid locking down the height of the logo and just keep the existing aspect ration as-is. | ||||
| * | | | | Allows starting an already instantiated manager | Luca Milanesio | 2014-11-29 | 1 | -0/+6 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | When a manager is injected through other means, (e.g. using a different GuiceModule and injector in Gerrit) we need a way to start it without having to necessarily passing through the injection process again. | ||||
* | | | | Merged #226 "Added a new property: web.displayUserPanel" | James Moger | 2014-12-03 | 3 | -1/+10 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Added a new property: web.displayUserPanel | Jan Šmucr | 2014-11-27 | 3 | -1/+10 |
|/ / / | | | | | | | | | | | | | This property allows the administrator to hide the user related part of the top panel. This can come handy if there's no use for it (i.e. if Gitblit runs as Gerrit plugin). | ||||
* | | | Fix regression in BasePage due to changes in page construction for bottom ↵ | James Moger | 2014-11-25 | 1 | -20/+19 |
| | | | | | | | | | | | | script injection | ||||
* | | | Add .bat and .cmd to the pretty print extensions | James Moger | 2014-11-24 | 1 | -1/+1 |
| | | | |||||
* | | | Ensure that pretty-printed files are served as text/plain in Raw servlet | James Moger | 2014-11-24 | 1 | -3/+12 |
| | | | |||||
* | | | Fix time units in ldap sync log message | James Moger | 2014-11-24 | 1 | -1/+2 |
| | | | |||||
* | | | Extract WAR data resources if they do not exist in ${baseFolder} | James Moger | 2014-11-24 | 1 | -4/+2 |
| | | | |||||
* | | | Revise severity & priority permissions | James Moger | 2014-11-20 | 4 | -24/+35 |
| | | | | | | | | | | | | Ticket reporters should be able to specify severity whereas only those with repository push access should be able to specify priority. This also fixes a bug related to non-admin users creating tickets. | ||||
* | | | Merge pull request #232 from tomaswolf/ticket-88-bugfix | James Moger | 2014-11-20 | 1 | -2/+20 |
|\ \ \ | | | | | | | | | Usability bug fix | ||||
| * | | | Usability bug fix | Tom | 2014-11-19 | 1 | -2/+20 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | If the opacity slider was moved to the far right faster than the animation showing the image, the user would never see the old file because opacity got adjusted right away. Now we first move the overlay slider to the right, so that something is visible, and then quickly animate opacity to the current value. | ||||
* | | | Merged #223 "Add support for image/svg+xml content type to raw servlet" | James Moger | 2014-11-19 | 2 | -4/+11 |
|\ \ \ |