Commit Graph

6374 Commits

Author SHA1 Message Date
Rainer Kottenhoff
9d36678bda
Merge pull request #872 from RaiKoHoff/Dev_Fix4Releases
Bugfix: replace all in target range
2019-01-03 11:16:38 +01:00
Rainer Kottenhoff
11e94c998b + fix: replace all in target range 2019-01-03 10:55:35 +01:00
Rainer Kottenhoff
559e8713e4
Merge pull request #871 from RaiKoHoff/Dev_NewFeatures
Bugfix: RegEx engine interface (find range calculation)
2019-01-02 20:34:44 +01:00
Rainer Kottenhoff
02a55e7881 Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_NewFeatures
# Conflicts:
#	Versions/build.txt
#	np3portableapp/_buildname.txt
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
2019-01-02 20:32:47 +01:00
Rainer Kottenhoff
74721df519
Merge pull request #870 from RaiKoHoff/Dev_Fix4Releases
Onigmo RegEx Interface: fixing bug in returning correct matching range
2019-01-02 20:17:17 +01:00
Rainer Kottenhoff
9ae99e1d20 + fix: Onigmo RegEx Interface: bug in returning correct matching range 2019-01-02 19:58:13 +01:00
Pairi Daiza
ec743f791b
Merge pull request #869 from hpwamr/MUI_dev
Change Rizonesoft Copyright © to year "2019"
2019-01-01 06:31:19 +01:00
Pairi Daiza
fe977cddec Change Rizonesoft Copyright © to year "2019" 2018-12-30 00:28:28 +01:00
Rainer Kottenhoff
f34b2191b6 + upd: current uthash header-lib version 2.1.0 2018-12-29 08:54:49 +01:00
Rainer Kottenhoff
4af10352c1 Merge branch 'Dev_Fix4Releases' into Dev_NewFeatures 2018-12-29 08:47:31 +01:00
Pairi Daiza
2218182266
Merge pull request #867 from hpwamr/MUI_dev
+ fix: Adaptations for Visual Studio 2019 Preview
2018-12-25 22:26:55 +01:00
Pairi Daiza
2bec07eb24 + fix: Adoptions for Visual Studio 2019 Preview
- Correction LINK: fatal error LNK1181: cannot open input file 'scintilla.lib'
2018-12-25 22:05:50 +01:00
Rainer Kottenhoff
6e8348cedb + upd: uthash and Scintilla components 2018-12-21 12:05:14 +01:00
Rainer Kottenhoff
253466f2e8 Merge branch 'Dev_Fixes4Release' into Dev_NewFeatures 2018-12-21 11:44:42 +01:00
Pairi Daiza
0d08bc149c
Merge pull request #866 from hpwamr/MUI_dev
MUI - Command Help Line Dialog box
2018-12-20 22:12:10 +01:00
Pairi Daiza
441fac1c9c MUI - Command Help Line Dialog box
- Fixed a small display flaw
2018-12-20 21:53:44 +01:00
Rainer Kottenhoff
b17cd5634e Merge branch 'Dev_Fix4Releases' into Dev_NewFeatures 2018-12-20 06:14:09 +01:00
Pairi Daiza
adb523de5a
Merge pull request #865 from hpwamr/MUI_dev
MUI - af-ZA change Codepage UTF8 to Win-1252
2018-12-19 20:44:29 +01:00
Pairi Daiza
4735d69a7e MUI - af-ZA change Codepage UTF8 to Win-1252 2018-12-19 20:35:50 +01:00
Rainer Kottenhoff
33fc0e753d
Merge pull request #864 from RaiKoHoff/Dev_NewFeatures
Dev new features
2018-12-18 18:37:04 +01:00
Rainer Kottenhoff
088db34a08 + upd: change log 2018-12-18 17:27:11 +01:00
Rainer Kottenhoff
5c424b2900 Merge remote-tracking branch 'Notepad3_upstream_Rizone/master' into Dev_NewFeatures 2018-12-17 17:09:34 +01:00
Rainer Kottenhoff
a1833e684d
Merge pull request #863 from hpwamr/MUI_dev
MUI nl-NL - Correction small typo
2018-12-17 17:08:40 +01:00
Rainer Kottenhoff
ad742d89a8 Merge branch 'Dev_Fixes4Release' into Dev_NewFeatures
# Conflicts:
#	language/np3_af_za/dialogs_af_za.rc
#	language/np3_af_za/menu_af_za.rc
#	language/np3_af_za/strings_af_za.rc
2018-12-17 17:01:43 +01:00
Pairi Daiza
d58ed16af7 MUI nl-NL - Correction small typo 2018-12-17 16:52:46 +01:00
Derick Payne
d08ed57882 Update dialogs_af_za.rc 2018-12-16 01:39:05 +02:00
Derick Payne
cbcf8527c2 Preliminary Afrikaans Translation 2018-12-16 01:36:16 +02:00
Rainer Kottenhoff
825ea53c73 Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_NewFeatures 2018-12-15 18:25:15 +01:00
Rainer Kottenhoff
37f2501171
Merge pull request #862 from RaiKoHoff/Dev_Fix4Releases
Correction for Nederland language
2018-12-15 12:34:09 +01:00
Rainer Kottenhoff
3c1a3f36b7 + fix: correction for nederland language 2018-12-15 12:32:23 +01:00
Rainer Kottenhoff
d8eb16bd0a + add: switch to choose between reliable and less reliable compact encoding detection results 2018-12-14 14:18:39 +01:00
Rainer Kottenhoff
04d16f0be2 + include Nim lexer (lost by project file merging from master) 2018-12-14 11:56:03 +01:00
Rainer Kottenhoff
dace6e4c69 Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_NewFeatures
# Conflicts:
#	language/np3_fr_fr/dialogs_fr_fr.rc
#	language/np3_ja_jp/dialogs_ja_jp.rc
#	language/np3_nl_nl/dialogs_nl_nl.rc
2018-12-14 11:39:45 +01:00
Rainer Kottenhoff
77ff2625df
Merge pull request #861 from RaiKoHoff/Dev_Fix4Releases
ASCII fallback only for selected encoding
2018-12-14 11:31:17 +01:00
Rainer Kottenhoff
d91ce547a3 + revert: use only reliable encoding detections ! 2018-12-14 11:13:01 +01:00
Rainer Kottenhoff
1a739f20ad + fix: ASCII fallback only for selected encodings 2018-12-14 10:51:37 +01:00
Rainer Kottenhoff
3ccb4e9f4b + upd: current Scintilla development 2018-12-13 13:35:11 +01:00
Rainer Kottenhoff
46ff960da7 Merge remote-tracking branch 'Notepad3_upstream_Rizone/master' into Dev_NewFeatures
# Conflicts:
#	scintilla/Scintilla.vcxproj
#	src/Helpers.h
2018-12-13 13:12:44 +01:00
Rainer Kottenhoff
09829d1af0
Merge pull request #860 from RaiKoHoff/Dev_Fixes4Release
Adoptions for Visual Studio 2019 Preview
2018-12-13 11:52:47 +01:00
Rainer Kottenhoff
1f0895ce2d + fix: Adoptions for Visual Studio 2019 Preview 2018-12-13 11:33:24 +01:00
Rainer Kottenhoff
c76597858c Merge branch 'Dev_Fix4Releases' into Dev_NewFeatures
# Conflicts:
#	src/Version.h
2018-12-11 23:41:53 +01:00
Rainer Kottenhoff
2edd9ad127
Merge pull request #859 from RaiKoHoff/Dev_Fix4Releases
Fix: Default Encoding settings
2018-12-11 23:38:35 +01:00
Rainer Kottenhoff
d754f1d892 + fix: Default Encoding settings 2018-12-11 23:20:55 +01:00
Rainer Kottenhoff
304280c0ba + chg: VS2019pre adaptions 2018-12-11 19:40:46 +01:00
Rainer Kottenhoff
093b82fae6 + fix: some code cleanup 2018-12-08 20:15:40 +01:00
Rainer Kottenhoff
1cb2461848 Merge branch 'Dev_Fix4Releases' into Dev_NewFeatures 2018-12-08 20:05:26 +01:00
Rainer Kottenhoff
ffa2541c0f
Merge pull request #858 from RaiKoHoff/Dev_Fix4Releases
Disable accelerator-key interception for universal Unicode input method
2018-12-08 19:50:02 +01:00
Rainer Kottenhoff
e02ecfcde1 + fix: disable accelerator-key interception for universal Unicode input method 2018-12-08 19:40:06 +01:00
Rainer Kottenhoff
1ee3bb4ea7 Merge branch 'Dev_Fix4Releases' into Dev_NewFeatures 2018-12-06 18:02:34 +01:00
Rainer Kottenhoff
21a1974e14
Merge pull request #855 from RaiKoHoff/Dev_Fix4Releases
Fix behavior of replace (dialog) in case of multi-line selection
2018-12-06 18:00:59 +01:00