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 |
|
Rainer Kottenhoff
|
e2487e3891
|
+ fix: behavior of replace (dialog) in case of multi-line selection
|
2018-12-06 17:52:52 +01:00 |
|
Rainer Kottenhoff
|
e070478f0d
|
+ chg: Nim syntax highlighting close to official Nim site code example highligthting
|
2018-12-06 13:03:38 +01:00 |
|
Rainer Kottenhoff
|
f55a70bca4
|
+ NimLexer keyword corrections
|
2018-12-06 11:55:52 +01:00 |
|
Rainer Kottenhoff
|
cbb585c3d4
|
Merge pull request #854 from RaiKoHoff/Dev_NewFeatures
Merge bugfixes for release
|
2018-12-06 03:48:38 +01:00 |
|
Rainer Kottenhoff
|
f71a30d336
|
+ fix: merge conflict
|
2018-12-06 03:47:15 +01:00 |
|
Rainer Kottenhoff
|
11315b7207
|
Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_NewFeatures
# Conflicts:
# src/Notepad3.c
|
2018-12-06 03:46:46 +01:00 |
|
Rainer Kottenhoff
|
84c49a600f
|
Merge pull request #853 from RaiKoHoff/Dev_Fix4Releases
Update changelog
|
2018-12-06 03:30:29 +01:00 |
|
Rainer Kottenhoff
|
5a6ad071e0
|
+ upd: changelog
|
2018-12-06 03:28:46 +01:00 |
|
Rainer Kottenhoff
|
af466c587f
|
Merge pull request #852 from RaiKoHoff/Dev_Fix4Releases
Fix for replace dialog
|
2018-12-06 03:27:29 +01:00 |
|
Rainer Kottenhoff
|
cf80dca476
|
+ fix: tmp disable "mark all occ" in case of multi-line selection
|
2018-12-06 03:14:17 +01:00 |
|
Rainer Kottenhoff
|
9ca9e305f3
|
+ fix: handling of some settings default values
|
2018-12-06 02:04:41 +01:00 |
|
Rainer Kottenhoff
|
0e5145f7a0
|
Merge pull request #851 from RaiKoHoff/Dev_Fix4Releases
UTF-8 affinity initial default settings
|
2018-12-05 15:58:56 +01:00 |
|
Rainer Kottenhoff
|
7d06abb8e7
|
+ chg: UTF-8 affine initial default settings
|
2018-12-05 15:46:40 +01:00 |
|
Rainer Kottenhoff
|
79fe92e3d0
|
+ upd: merge current Scintilla dev stage
|
2018-12-05 09:40:12 +01:00 |
|
Rainer Kottenhoff
|
66ab3945ea
|
Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_NewFeatures
# Conflicts:
# language/common_res.rc
|
2018-12-05 09:38:28 +01:00 |
|
Rainer Kottenhoff
|
cd4770728b
|
Merge pull request #850 from RaiKoHoff/Dev_Fix4Releases
Chnages: ESC behavior and pre-selected search pattern
|
2018-12-05 09:17:23 +01:00 |
|
Rainer Kottenhoff
|
0d53ea5115
|
+ fix: don't exit Notepad on ESC (if activated), if only canceling ToolTip or AutoCompletion is intended
+ chg: update changelog
|
2018-12-05 08:51:16 +01:00 |
|
Rainer Kottenhoff
|
057165ec14
|
+ chg: Open FInd/Replace: use most recent find pattern instead of clipboard (if selection is empty)
|
2018-12-05 08:04:08 +01:00 |
|
Pairi Daiza
|
eb8c6c8ddf
|
Merge pull request #849 from hpwamr/MUI_dev
MUI - craigo- broken link in About dialog #848
|
2018-12-04 20:15:37 +01:00 |
|
Pairi Daiza
|
66feae393c
|
MUI - craigo- broken link in About dialog #848
|
2018-12-04 20:03:51 +01:00 |
|