Commit Graph

5281 Commits

Author SHA1 Message Date
RaiKoHoff
d3713c84ca Merge commit '87b46e5b44f1757e5e7eeb88d848b8f5ef295940' into NewFeatures_grepWinNP3 2020-03-31 15:05:09 +02:00
RaiKoHoff
dd85c0d2c2 Merge remote-tracking branch 'upstream/master' into NewFeatures_grepWinNP3
# Conflicts:
#	src/VersionEx.h
2020-03-31 12:57:17 +02:00
Rainer Kottenhoff
e77adc6625
Merge pull request #2182 from RaiKoHoff/RC2_DEV
Update Oniguruma RegEx RC1 for v6.9.5
2020-03-31 12:50:53 +02:00
RaiKoHoff
072a750dfe + upd: Oniguruma RegEx RC1 for v6.9.5 2020-03-31 12:41:26 +02:00
RaiKoHoff
d8072e3e9e Merge remote-tracking branch 'upstream/master' into RC2_DEV 2020-03-31 12:38:04 +02:00
RaiKoHoff
75e5e59184 + upd: backlog 2020-03-31 12:32:00 +02:00
Rainer Kottenhoff
87b46e5b44
Merge pull request #2181 from RaiKoHoff/NewFeatures_grepWinNP3
Fix grepWinNP3 ordered map of languages for selection box
2020-03-31 09:43:00 +02:00
RaiKoHoff
50bc0fe866 + fix: grepWinNP3 ordered map of languages for selection box 2020-03-31 09:41:42 +02:00
RaiKoHoff
faf29e2651 Merge remote-tracking branch 'upstream/NewFeatures' into NewFeatures_grepWinNP3 2020-03-31 09:27:42 +02:00
Rainer Kottenhoff
ae8ade9fb2
Merge pull request #2180 from RaiKoHoff/NewFeatures_grepWinNP3
Enhancement "grepWinNP3" integration
2020-03-30 23:21:26 +02:00
Rainer Kottenhoff
1de35f8c6d + fix: translatable error message format (msgbox)
+ chg: add filepath to message on file locking error
2020-03-30 23:19:36 +02:00
RaiKoHoff
6d494ffb51 + upd: version files 2020-03-30 17:38:06 +02:00
RaiKoHoff
8eabce77ed Merge remote-tracking branch 'upstream/NewFeatures' into NewFeatures_grepWinNP3 2020-03-30 17:36:35 +02:00
RaiKoHoff
766a8c1898 Merge remote-tracking branch 'upstream/master' into NewFeatures_grepWinNP3
# Conflicts:
#	Versions/day.txt
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
2020-03-30 17:34:06 +02:00
RaiKoHoff
0936dc0833 + add: call Notepad3 with case-sensitive and dot-match-all flag (if applicable) 2020-03-30 17:33:02 +02:00
Pairi Daiza
19f63e4b37
Merge pull request #2178 from hpwamr/newdev
MUI - Add "English (United States) [en-US]" language
2020-03-30 15:08:41 +02:00
Pairi Daiza
ed6f94c770 MUI - Add "English (United States) [en-US]" language 2020-03-30 15:07:30 +02:00
Pairi Daiza
9af35abd73
Merge pull request #2177 from hpwamr/mui
+ upd: version strings
2020-03-30 11:56:45 +02:00
Pairi Daiza
7809712120 + upd: version strings 2020-03-30 11:47:45 +02:00
Pairi Daiza
948676989c
Merge pull request #2176 from hpwamr/newdev
+ upd: version strings
2020-03-30 11:40:52 +02:00
Pairi Daiza
216b1431aa + upd: version strings 2020-03-30 11:38:45 +02:00
Pairi Daiza
1b6cbd7cda +chg Update changes.txt 2020-03-30 11:16:36 +02:00
Pairi Daiza
eeb61454cc Restore previous .gitgmore 2020-03-30 11:01:56 +02:00
Pairi Daiza
840fd3e888
Merge pull request #2175 from hpwamr/newdev
MUI - Add 'Overlapping Search" in Search menu for all languages
2020-03-30 10:55:16 +02:00
Pairi Daiza
8ebbf3a5ea MUI - Add 'Overlapping Search" in Search menu for all languages 2020-03-30 10:51:27 +02:00
RaiKoHoff
b2a22c6a0f Merge remote-tracking branch 'upstream/master' into NewFeatures_grepWinNP3
# Conflicts:
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
2020-03-30 10:20:48 +02:00
RaiKoHoff
d99bab53f9 Merge remote-tracking branch 'upstream/master' into RC2_DEV 2020-03-30 10:16:27 +02:00
Pairi Daiza
428ca052fe
Merge pull request #2174 from hpwamr/mui
MUI - Fixed some minor typos
2020-03-29 23:30:43 +02:00
Pairi Daiza
ed7a83faed MUI - Fixed some minor typos 2020-03-29 23:20:45 +02:00
Rainer Kottenhoff
b59537be8c
Merge pull request #2173 from RaiKoHoff/NewFeatures_grepWinNP3
grepWinNP3 corrections
2020-03-29 00:48:12 +01:00
Rainer Kottenhoff
c991b3a9cb - some refactorings
- romove warnings on MUI lib builds
2020-03-29 00:45:11 +01:00
Rainer Kottenhoff
36f8bfb5c0 Merge remote-tracking branch 'notepad3_orig_rizone/master' into NewFeatures_grepWinNP3 2020-03-28 18:02:26 +01:00
Pairi Daiza
6452ccbb06
Merge pull request #2171 from hpwamr/mui
+chg Update changes.txt
2020-03-28 10:16:07 +01:00
Pairi Daiza
f19c1285d0 +chg Update changes.txt 2020-03-28 10:15:25 +01:00
Rainer Kottenhoff
477e9e94ba Merge remote-tracking branch 'notepad3_orig_rizone/master' into NewFeatures_grepWinNP3
# Conflicts:
#	Versions/build.txt
2020-03-28 09:55:58 +01:00
Rainer Kottenhoff
402de3050e
Merge pull request #2170 from RaiKoHoff/RC2_DEV
Fix Logical Number comparison
2020-03-28 09:44:01 +01:00
Rainer Kottenhoff
e1c2ea5c83 + fix: Logical Number comparison 2020-03-28 09:33:44 +01:00
Rainer Kottenhoff
9f04e9e374 Merge remote-tracking branch 'notepad3_orig_rizone/master' into NewFeatures_grepWinNP3
# Conflicts:
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
2020-03-28 09:11:02 +01:00
Rainer Kottenhoff
04784abd9d
Merge pull request #2169 from RaiKoHoff/RC2_DEV
Fix locale dependent string comparison
2020-03-28 09:09:17 +01:00
Rainer Kottenhoff
219fdf55b9 + fix: release build corrections 2020-03-28 09:02:21 +01:00
Rainer Kottenhoff
a433db8a4f + fix: locale dependent string comparision 2020-03-28 08:32:29 +01:00
RaiKoHoff
2a4f870ccd + upd: version strings 2020-03-27 16:15:52 +01:00
RaiKoHoff
0962d0dfc3 + upd: grepWinNP3 version 2020-03-27 16:12:31 +01:00
RaiKoHoff
c370ac4e84 Merge remote-tracking branch 'upstream/master' into NewFeatures_grepWinNP3 2020-03-27 16:11:43 +01:00
RaiKoHoff
625f64bc0d Merge remote-tracking branch 'upstream/master' into RC2_DEV 2020-03-27 15:00:37 +01:00
RaiKoHoff
2b3b1778b6 Merge remote-tracking branch 'origin/NewFeatures' into NewFeatures_grepWinNP3 2020-03-27 14:59:48 +01:00
Rainer Kottenhoff
ce168e1381
Merge pull request #2168 from RaiKoHoff/NewFeatures_grepWinNP3
grepWinNP3 Update
2020-03-27 14:50:26 +01:00
RaiKoHoff
0474761bed Merge remote-tracking branch 'upstream/NewFeatures' into NewFeatures_grepWinNP3
# Conflicts:
#	grepWinNP3/lang/Français (France) [fr-FR].lang
#	grepWinNP3/lang/Беларуская (Беларусь) [be-BY].lang
#	grepWinNP3/lang/Русский (Pоссия) [ru-RU].lang
2020-03-27 14:48:31 +01:00
RaiKoHoff
962257723d Merge branch 'NewFeatures_grepWinNP3' into NewFeatures 2020-03-27 14:19:24 +01:00
RaiKoHoff
f72c0d1d54 + upd: current master branch dev merged
+ fix: grepWinNP3 language switching
2020-03-27 14:16:50 +01:00