]>
source.dussan.org Git - gitblit.git/log
James Moger [Wed, 19 Mar 2014 01:10:48 +0000 (21:10 -0400)]
Fix authentication security hole with external providers
James Moger [Mon, 17 Mar 2014 17:31:16 +0000 (11:31 -0600)]
Merged #34 "Fix NPE in FileTicketService on finding all journals"
James Moger [Mon, 17 Mar 2014 17:25:39 +0000 (13:25 -0400)]
Fix NPE in FileTicketService on finding all journals
James Moger [Mon, 17 Mar 2014 13:36:09 +0000 (07:36 -0600)]
Merged #33 "Merge overrides in addition to merging the normal settings"
James Moger [Mon, 17 Mar 2014 13:31:52 +0000 (09:31 -0400)]
Merge overrides in addition to merging the normal settings
Some command-line parameters are ignored due to a bug in the merge
settings method which merges overrides into the normal settings map.
This works fine until the settings class decides to reload from the
pristine settings file which dumps the explicitly overrides.
The solution is to merge the overrides in addition to the standard
settings.
James Moger [Sun, 16 Mar 2014 20:26:19 +0000 (14:26 -0600)]
Merged #32 "Fix incorrect ticket branch ref in ticket page changed paths list"
James Moger [Sun, 16 Mar 2014 20:24:39 +0000 (16:24 -0400)]
Fix incorrect ticket branch ref in ticket page changed paths list
James Moger [Thu, 13 Mar 2014 14:45:22 +0000 (08:45 -0600)]
Merged #31 "Tag entries do not have tooltips for long messages"
James Moger [Thu, 13 Mar 2014 14:43:54 +0000 (10:43 -0400)]
Set tooltip for truncated tag and branch messages
James Moger [Thu, 13 Mar 2014 02:31:59 +0000 (20:31 -0600)]
Merged #30 "Watch list push parameters are not always honored"
James Moger [Thu, 13 Mar 2014 02:31:51 +0000 (20:31 -0600)]
Merged #29 "Watch list is not properly verified on push"
James Moger [Thu, 13 Mar 2014 02:25:52 +0000 (22:25 -0400)]
Fix TicketModel modList bug when a field was set multiple times
James Moger [Thu, 13 Mar 2014 01:59:08 +0000 (21:59 -0400)]
Fix watch list verification on push
James Moger [Thu, 13 Mar 2014 01:44:36 +0000 (21:44 -0400)]
Improve logging of received patchset command
James Moger [Thu, 13 Mar 2014 01:16:15 +0000 (19:16 -0600)]
Merged #27 "Fix ticket page IOBE when Gitblit is not serving repositories"
James Moger [Thu, 13 Mar 2014 01:12:06 +0000 (21:12 -0400)]
Fix ticket page IOBE when Gitblit is not serving repositories
James Moger [Wed, 12 Mar 2014 21:21:12 +0000 (17:21 -0400)]
Tweak the receive pack push permission check to be a method
James Moger [Tue, 11 Mar 2014 17:18:08 +0000 (11:18 -0600)]
Merged #26 "Exclude ticket branches when forking a canonical repository"
James Moger [Tue, 11 Mar 2014 16:36:30 +0000 (12:36 -0400)]
Exclude ticket branches when forking a canonical repository
James Moger [Tue, 11 Mar 2014 14:24:07 +0000 (08:24 -0600)]
Merged #25 "Add closed status for milestones and abandoned status for tickets"
James Moger [Tue, 11 Mar 2014 14:22:33 +0000 (10:22 -0400)]
Add closed status for milestones and abandoned status for tickets
James Moger [Tue, 11 Mar 2014 14:07:37 +0000 (08:07 -0600)]
Merged #24 "Workaround pegdown bug and improve relative image path processing"
James Moger [Tue, 11 Mar 2014 14:02:28 +0000 (10:02 -0400)]
Workaround pegdown bug and improve relative image path processing
James Moger [Mon, 10 Mar 2014 16:06:59 +0000 (12:06 -0400)]
Clarify ticket fetch instructions
James Moger [Mon, 10 Mar 2014 13:33:23 +0000 (09:33 -0400)]
Documentation
James Moger [Mon, 10 Mar 2014 13:29:38 +0000 (09:29 -0400)]
Adjust propose instructions to "checkout -b ticket/{id} origin/{branch}"
James Moger [Mon, 10 Mar 2014 13:22:04 +0000 (09:22 -0400)]
Repository owners were not CCd on ticket emails
James Moger [Sun, 9 Mar 2014 17:04:59 +0000 (13:04 -0400)]
Mirrors and read-only repositories must disable review function
James Moger [Sun, 9 Mar 2014 16:38:31 +0000 (12:38 -0400)]
Fixed incorrect ticket fetch instructions in email notifications
James Moger [Sun, 9 Mar 2014 15:08:25 +0000 (11:08 -0400)]
Reset build identifiers for next development cycle
James Moger [Sun, 9 Mar 2014 15:08:25 +0000 (11:08 -0400)]
Prepare 1.4.0 release
James Moger [Sun, 9 Mar 2014 15:08:03 +0000 (11:08 -0400)]
Documentation
James Moger [Sun, 9 Mar 2014 14:55:13 +0000 (10:55 -0400)]
Merge pull request #160 from Mrbytes/master
Updated esES translation; last string
mrbytes [Sun, 9 Mar 2014 14:38:47 +0000 (15:38 +0100)]
Updated esES translation; last string
James Moger [Sun, 9 Mar 2014 14:06:10 +0000 (10:06 -0400)]
Merge pull request #159 from kwoot/nl-update
dutch translation of string
James Moger [Sun, 9 Mar 2014 14:05:52 +0000 (10:05 -0400)]
Merge pull request #158 from yin8086/ChineseTrans
add a Chinese translate string
James Moger [Sun, 9 Mar 2014 14:05:25 +0000 (10:05 -0400)]
Merge pull request #157 from ds5apn/master
Added Korean translation gb.mergeToDescription and improved some strings
Jeroen Baten [Sun, 9 Mar 2014 07:57:35 +0000 (08:57 +0100)]
dutch translation of string
Stardrad Yin [Sun, 9 Mar 2014 06:58:15 +0000 (14:58 +0800)]
add a Chinese translate string
Dongsu, KIM [Sun, 9 Mar 2014 03:12:59 +0000 (12:12 +0900)]
Added Korean translation gb.mergeToDescription and improved some strings
James Moger [Sun, 9 Mar 2014 01:44:16 +0000 (20:44 -0500)]
Listen for git daemon and fanout clients on all intefaces, by default
James Moger [Sat, 8 Mar 2014 20:39:36 +0000 (15:39 -0500)]
Allow configuring the default integration branch for a repository
James Moger [Sat, 8 Mar 2014 17:32:48 +0000 (12:32 -0500)]
Merge pull request #156 from Mrbytes/master
Updated esES translation
James Moger [Sat, 8 Mar 2014 17:24:36 +0000 (12:24 -0500)]
Disable vote & watch links if repository is not accepting ticket updates
James Moger [Sat, 8 Mar 2014 17:15:19 +0000 (12:15 -0500)]
Documentation
mrbytes [Sat, 8 Mar 2014 17:10:58 +0000 (18:10 +0100)]
Merge branch 'master' of https://github.com/gitblit/gitblit
mrbytes [Sat, 8 Mar 2014 17:05:55 +0000 (18:05 +0100)]
Updated esES translation
James Moger [Sat, 8 Mar 2014 16:59:18 +0000 (11:59 -0500)]
Prevent Lucene queries from starting with a conjunction
James Moger [Sat, 8 Mar 2014 16:53:38 +0000 (11:53 -0500)]
Fix integration branch in propose instructions
James Moger [Sat, 8 Mar 2014 16:53:01 +0000 (11:53 -0500)]
Allow selection of integration branch in new ticket page
James Moger [Sat, 8 Mar 2014 16:27:00 +0000 (11:27 -0500)]
Move Gitblit branches to refs/meta/gitblit
James Moger [Sat, 8 Mar 2014 14:19:01 +0000 (09:19 -0500)]
Merge pull request #154 from kwoot/nl-update
dutch translations.
James Moger [Sat, 8 Mar 2014 14:18:17 +0000 (09:18 -0500)]
Merge pull request #153 from yin8086/ChineseTrans
add Chinese strings
James Moger [Sat, 8 Mar 2014 14:17:58 +0000 (09:17 -0500)]
Merge pull request #152 from ds5apn/master
Added new strings to Korean translations
Jeroen Baten [Sat, 8 Mar 2014 07:40:02 +0000 (08:40 +0100)]
dutch translations.
why the original shows up, I have no idea
Stardrad Yin [Sat, 8 Mar 2014 06:46:57 +0000 (14:46 +0800)]
add Chinese strings
Dongsu, KIM [Sat, 8 Mar 2014 05:36:59 +0000 (14:36 +0900)]
added another string to Korean translations
James Moger [Fri, 7 Mar 2014 22:40:07 +0000 (17:40 -0500)]
Replaced uploading to GoogleCode with uploading to Bintray on release
James Moger [Fri, 7 Mar 2014 20:25:08 +0000 (15:25 -0500)]
Fix 'head' vs 'HEAD' commit resolution
James Moger [Fri, 7 Mar 2014 20:15:52 +0000 (15:15 -0500)]
Fix NPE in bugtraq processor
James Moger [Fri, 7 Mar 2014 19:59:02 +0000 (14:59 -0500)]
Display an explanation in ticket page if the user can't propose commits
James Moger [Fri, 7 Mar 2014 19:28:12 +0000 (14:28 -0500)]
Conditionally hide the propose patchset instructions
There are a few scenarios where a ticket without a patchset should not
display propose instructions.
1. the ticket is resolved
2. the repository is configured to reject new patchsets or is read-only
3. the server is configured to reject new patchsets
James Moger [Fri, 7 Mar 2014 17:23:23 +0000 (12:23 -0500)]
Fix NPE in the Edit Ticket page
James Moger [Fri, 7 Mar 2014 12:55:03 +0000 (07:55 -0500)]
Documentation
James Moger [Fri, 7 Mar 2014 12:54:14 +0000 (07:54 -0500)]
Do not send ticket emails to disabled users
James Moger [Fri, 7 Mar 2014 12:52:58 +0000 (07:52 -0500)]
Remove garbage from a bad squash & cherry-pick
James Moger [Fri, 7 Mar 2014 03:08:57 +0000 (22:08 -0500)]
Merge pull request #151 from yin8086/ChineseTrans
fix some Chinese translations due to some special characters.
Stardrad Yin [Fri, 7 Mar 2014 02:03:42 +0000 (10:03 +0800)]
fix some Chinese translations due to some special characters.
James Moger [Fri, 7 Mar 2014 00:14:02 +0000 (19:14 -0500)]
Documentation
James Moger [Thu, 6 Mar 2014 23:02:42 +0000 (18:02 -0500)]
Do not use @Inject on the ticket service constructors
James Moger [Thu, 6 Mar 2014 21:55:45 +0000 (16:55 -0500)]
Exclude title, body, and status fields from initial proposal email
James Moger [Thu, 6 Mar 2014 21:15:09 +0000 (16:15 -0500)]
Documentation
James Moger [Thu, 6 Mar 2014 20:53:20 +0000 (15:53 -0500)]
Documentation and clarify git workflows
James Moger [Thu, 6 Mar 2014 19:40:08 +0000 (14:40 -0500)]
Allow resolve for proposal workflows
James Moger [Thu, 6 Mar 2014 19:39:32 +0000 (14:39 -0500)]
Update contributors list
James Moger [Thu, 6 Mar 2014 19:32:08 +0000 (14:32 -0500)]
Fixed bug in merge: improper use of force and failing on FORCED result
Jeroen Baten [Fri, 4 Jan 2013 15:56:08 +0000 (16:56 +0100)]
Updated the Dutch translation for 1.4.0
James Moger [Thu, 6 Mar 2014 18:49:02 +0000 (12:49 -0600)]
Merged #22 "Tie mirroring, pushing, and the BranchTicketService together"
James Moger [Thu, 6 Mar 2014 18:39:11 +0000 (13:39 -0500)]
Document ticket replication, mirroring, and advanced administration
James Moger [Thu, 6 Mar 2014 18:38:44 +0000 (13:38 -0500)]
Improve the GO reindex-tickets shell scripts
James Moger [Thu, 6 Mar 2014 18:38:12 +0000 (13:38 -0500)]
Add and document REINDEX_TICKETS rpc request type
James Moger [Thu, 6 Mar 2014 18:36:23 +0000 (13:36 -0500)]
Revise push/mirror tickets branch triggering
James Moger [Thu, 6 Mar 2014 12:42:47 +0000 (07:42 -0500)]
Merge pull request #148 from yin8086/ChineseTrans
Add and fix Chinese translations
James Moger [Thu, 6 Mar 2014 12:41:10 +0000 (07:41 -0500)]
Merge pull request #149 from ds5apn/master
fixed some Korean translations
Dongsu, KIM [Thu, 6 Mar 2014 10:28:56 +0000 (19:28 +0900)]
correct some translations
James Moger [Thu, 6 Mar 2014 02:50:16 +0000 (21:50 -0500)]
Fire an event on received ticket branch updates to trigger reindex
It would be useful to be able to push a complete repository with a
refs/gitblit/tickets branch and have Gitblit index all those tickets.
Additionally, it would be nice for the mirroring service to recognize
an incoming update to this ref and fire an event that can be processed
by the BranchTicketService, if so configured, to reindex the tickets.
Stardrad Yin [Thu, 6 Mar 2014 02:45:43 +0000 (10:45 +0800)]
Add Chinese translations for new strings, and fix translations based on online page views of dev.gitblit.com
James Moger [Wed, 5 Mar 2014 22:48:21 +0000 (17:48 -0500)]
Update to JGit 3.3.0
James Moger [Wed, 5 Mar 2014 22:35:43 +0000 (17:35 -0500)]
Merge pull request #147 from Mrbytes/master
Translation esES updated
mrbytes [Wed, 5 Mar 2014 22:06:10 +0000 (23:06 +0100)]
Translation esES updated
- Ready for the 1.4.0 release plus a few Fixes
Signed-off-by: mrbytes <eguervos@msn.com>
James Moger [Wed, 5 Mar 2014 18:19:40 +0000 (13:19 -0500)]
Add setting to hide the navbar for those embedding Gitblit
James Moger [Wed, 5 Mar 2014 17:26:14 +0000 (12:26 -0500)]
Centralized ticket editing permission controls
James Moger [Wed, 5 Mar 2014 16:41:34 +0000 (11:41 -0500)]
Delegate closed ticket changes to the Edit Ticket page
James Moger [Wed, 5 Mar 2014 16:26:26 +0000 (11:26 -0500)]
Allow unregistered milestone selection on edit ticket page
James Moger [Wed, 5 Mar 2014 16:19:50 +0000 (11:19 -0500)]
Allow changing status from edit ticket page
James Moger [Wed, 5 Mar 2014 16:07:49 +0000 (11:07 -0500)]
New proposal notifications should include the patchset details
James Moger [Wed, 5 Mar 2014 15:56:34 +0000 (10:56 -0500)]
Allow integration (mergeTo) branch to be changed in edit ticket
James Moger [Wed, 5 Mar 2014 15:53:01 +0000 (10:53 -0500)]
Localize the ticket activity tab field name changes
James Moger [Wed, 5 Mar 2014 16:31:22 +0000 (11:31 -0500)]
Merge pull request #145 from yin8086/ChineseTrans
Fix Chinese translate strings
James Moger [Wed, 5 Mar 2014 16:31:08 +0000 (11:31 -0500)]
Merge pull request #144 from ds5apn/master
Update Korean Translation for Gitblit 1.4.0