breandan.considine
							
						 
					 | 
					
						
						
							
						
						88fe22a783
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
						
						# Conflicts:
#	build.gradle.kts
#	src/main/kotlin/org/acejump/view/Marker.kt 
						
						
					 | 
					
						2019-07-15 00:32:51 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						e52edbd9e6
					 | 
					
						
						
							
							update versions and fix minor bug
						
						
						
						
						
						
					 | 
					
						2019-07-15 00:30:06 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						fb683ca5f8
					 | 
					
						
						
							
							restore dir structure
						
						
						
						
						
						
					 | 
					
						2019-05-18 01:22:46 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						6e5d30750a
					 | 
					
						
						
							
							fix linter error
						
						
						
						
						
						
					 | 
					
						2019-05-18 01:13:29 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						2826a8efae
					 | 
					
						
						
							
							fix bug where all tags are compacted
						
						
						
						
						
						
					 | 
					
						2019-05-18 01:04:41 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						9629a6c5e7
					 | 
					
						
						
							
							fallback to settings color
						
						
						
						
						
						
					 | 
					
						2019-05-17 23:59:17 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						882d35b3c9
					 | 
					
						
						
							
							update version and change notes
						
						
						
						
						
						
					 | 
					
						2019-05-17 22:44:19 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						c1bed03d02
					 | 
					
						
						
							
							fixes #242
						
						
						
						
						
						
					 | 
					
						2019-05-17 22:38:43 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						5c78f8d5dc
					 | 
					
						
						
							
							fixes #273
						
						
						
						
						
						
					 | 
					
						2019-05-17 22:26:58 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Plate
							
						 
					 | 
					
						
						
							
						
						436860a0fb
					 | 
					
						
						
							
							Save current caret shape and colour before jump (instead of saved in settings)
						
						
						
						
						
						
					 | 
					
						2019-05-06 19:14:20 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						2e65206a30
					 | 
					
						
						
							
							note to future self
						
						
						
						
						
						
					 | 
					
						2019-04-16 23:39:03 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						6bad40524b
					 | 
					
						
						
							
							fixes #282
						
						
						
						
						
						
					 | 
					
						2019-04-16 23:32:07 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						48d9c3b17c
					 | 
					
						
						
							
							small refactor
						
						
						
						
						
						
					 | 
					
						2019-04-13 23:17:47 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						345383b244
					 | 
					
						
						
							
							how did this ever work?
						
						
						
						
						
						
					 | 
					
						2019-04-13 02:33:15 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						ce5b908d16
					 | 
					
						
						
							
							settings panel is now color theme coordinated, fixes #249, fixes #275
						
						
						
						
						
						
					 | 
					
						2019-04-12 00:58:21 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						4298b1e5f9
					 | 
					
						
						
							
							bump version for new release
						
						
						
						
						
						
					 | 
					
						2019-03-22 22:25:38 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						1609c12db5
					 | 
					
						
						
							
							fixes #179
						
						
						
						
						
						
					 | 
					
						2019-03-22 22:14:40 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						cd62211dc7
					 | 
					
						
						
							
							minor refactorings
						
						
						
						
						
						
					 | 
					
						2019-03-21 18:07:09 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						986e78978f
					 | 
					
						
						
							
							fixes #270
						
						
						
						
						
						
					 | 
					
						2019-03-14 00:28:20 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						0f03264b68
					 | 
					
						
						
							
							implement #274
						
						
						
						
						
						
					 | 
					
						2019-03-13 22:49:13 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						781a024d30
					 | 
					
						
						
							
							narrow scope
						
						
						
						
						
						
					 | 
					
						2019-03-09 21:25:52 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						5496ac98ca
					 | 
					
						
						
							
							fixes #267
						
						
						
						
						
						
					 | 
					
						2018-12-25 23:43:36 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						a8db5fc223
					 | 
					
						
						
							
							fix broken test
						
						
						
						
						
						
					 | 
					
						2018-12-21 19:50:43 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						23936be9c6
					 | 
					
						
						
							
							refactor tests a bit
						
						
						
						
						
						
					 | 
					
						2018-12-21 19:43:29 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						7615de6489
					 | 
					
						
						
							
							use natural caret color for next result indicator
						
						
						
						
						
						
					 | 
					
						2018-12-21 18:35:45 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						02b8902aec
					 | 
					
						
						
							
							bump version and update release notes
						
						
						
						
						
						
					 | 
					
						2018-12-21 12:26:04 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						d8f76bfbfe
					 | 
					
						
						
							
							add reverse selection and test case
						
						
						
						
						
						
					 | 
					
						2018-12-21 12:15:12 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						b0fd115a7c
					 | 
					
						
						
							
							fix bug with empty list and simplify
						
						
						
						
						
						
					 | 
					
						2018-12-21 00:24:07 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						fd39b0fec5
					 | 
					
						
						
							
							implements #239
						
						
						
						
						
						
					 | 
					
						2018-12-20 01:59:28 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						0760a78ac6
					 | 
					
						
						
							
							fixes #264
						
						
						
						
						
						
					 | 
					
						2018-12-20 01:07:17 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						f7586d5a3b
					 | 
					
						
						
							
							add global assertion for total number of highlighters
						
						
						
						
						
						
					 | 
					
						2018-12-19 22:51:11 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						bf512bf6c3
					 | 
					
						
						
							
							prepare next release
						
						
						
						
						
						
					 | 
					
						2018-12-19 15:40:47 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						7e29011159
					 | 
					
						
						
							
							add test case for #264
						
						
						
						
						
						
					 | 
					
						2018-12-19 15:32:29 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						8f316be3ec
					 | 
					
						
						
							
							add TODO for #264
						
						
						
						
						
						
					 | 
					
						2018-12-19 00:25:25 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						79346bd20b
					 | 
					
						
						
							
							rename caret color to be more descriptive
						
						
						
						
						
						
					 | 
					
						2018-12-19 00:19:08 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						8da6269216
					 | 
					
						
						
							
							increase test failure timeout
						
						
						
						
						
						
					 | 
					
						2018-12-19 00:18:00 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						8eb0b8ab66
					 | 
					
						
						
							
							fixes #263
						
						
						
						
						
						
					 | 
					
						2018-12-19 00:17:34 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						67f7d86b0f
					 | 
					
						
						
							
							bump minimum required version as per #200
						
						
						
						
						
						
					 | 
					
						2018-12-18 22:19:20 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						43b3e18d41
					 | 
					
						
						
							
							update changelog and release notes
						
						
						
						
						
						
					 | 
					
						2018-12-07 00:21:10 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						d12807aa1a
					 | 
					
						
						
							
							import *
						
						
						
						
						
						
					 | 
					
						2018-12-01 00:59:31 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						c2ffbe9c8a
					 | 
					
						
						
							
							relax time limit for CI testing
						
						
						
						
						
						
					 | 
					
						2018-12-01 00:59:13 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan.considine
							
						 
					 | 
					
						
						
							
						
						9b031c46d8
					 | 
					
						
						
							
							maybe this fixes #254?
						
						
						
						
						
						
					 | 
					
						2018-11-30 23:32:52 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						9b79c5c708
					 | 
					
						
						
							
							add useful exception message
						
						
						
						
						
						
					 | 
					
						2018-11-27 14:01:13 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						34cf40efcd
					 | 
					
						
						
							
							naming and minor refactor
						
						
						
						
						
						
					 | 
					
						2018-11-27 13:38:55 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						b4ffe6be89
					 | 
					
						
						
							
							add option to display current search text cf. #227
						
						
						
						
						
						
					 | 
					
						2018-11-24 04:10:23 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						b09803fc13
					 | 
					
						
						
							
							simplify key handler and strengthen test cases
						
						
						
						
						
						
					 | 
					
						2018-11-24 02:11:42 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						5bf4ae4c5f
					 | 
					
						
						
							
							add TODO for missing tags issue #245
						
						
						
						
						
						
					 | 
					
						2018-11-17 15:40:24 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						bdf6cb8d88
					 | 
					
						
						
							
							remove redundant link, add TODO
						
						
						
						
						
						
					 | 
					
						2018-11-17 14:36:23 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						3315030cf5
					 | 
					
						
						
							
							use editor markupModel directly to check tearDown
						
						
						
						
						
						
					 | 
					
						2018-11-17 14:34:01 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								breandan
							
						 
					 | 
					
						
						
							
						
						008686ae21
					 | 
					
						
						
							
							alter code style to omit leading space
						
						
						
						
						
						
					 | 
					
						2018-11-17 14:33:28 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |