Rainer Kottenhoff
|
62b1cd0a31
|
Merge pull request #2161 from RaiKoHoff/NewFeatures
Fix small bug in UnslashQuotes
|
2020-03-26 00:26:57 +01:00 |
|
Rainer Kottenhoff
|
804bada2f6
|
+ fix: small bug in UnslashQuotes
|
2020-03-26 00:25:59 +01:00 |
|
Rainer Kottenhoff
|
ffeee8081e
|
Merge pull request #2160 from RaiKoHoff/NewFeatures
Provide search string (grepWinNP3 -> Notepad3)
|
2020-03-25 17:29:11 +01:00 |
|
RaiKoHoff
|
11f8231ce3
|
Merge remote-tracking branch 'upstream/master' into NewFeatures
# Conflicts:
# Versions/day.txt
# res/Notepad3.exe.manifest.conf
# src/VersionEx.h
|
2020-03-25 17:25:14 +01:00 |
|
Pairi Daiza
|
54345910dc
|
Merge pull request #2159 from hpwamr/mui
+ver: VS2019 version update - VS 16.5.1
|
2020-03-25 05:23:33 +01:00 |
|
Pairi Daiza
|
97b97c54f0
|
+ver: VS2019 version update - VS 16.5.1
|
2020-03-25 05:12:20 +01:00 |
|
Rainer Kottenhoff
|
3a0d70b42b
|
Merge remote-tracking branch 'notepad3_orig_rizone/NewFeatures' into NewFeatures
|
2020-03-24 23:12:21 +01:00 |
|
Rainer Kottenhoff
|
970d1afc03
|
Merge branch 'RC2_DEV' into NewFeatures
|
2020-03-24 23:11:23 +01:00 |
|
Rainer Kottenhoff
|
cedac6153d
|
Merge remote-tracking branch 'notepad3_orig_rizone/master' into RC2_DEV
|
2020-03-24 23:10:43 +01:00 |
|
Rainer Kottenhoff
|
21490bfb70
|
Merge pull request #2158 from RaiKoHoff/NewFeatures
Portable grepwin.ini file handling for grepWinNP3 integration
|
2020-03-24 22:59:03 +01:00 |
|
Rainer Kottenhoff
|
3bbbe99fdc
|
+ fix: portable grepwin.ini file handling for grepWinNP3 integration
|
2020-03-24 22:53:56 +01:00 |
|
Pairi Daiza
|
8b44844b47
|
+ chg: Correction of a few typo's
|
2020-03-24 17:34:58 +01:00 |
|
Rainer Kottenhoff
|
a615f5137d
|
Merge pull request #2157 from RaiKoHoff/NewFeatures
Better grepWin integration (portable & language files)
|
2020-03-24 14:32:21 +01:00 |
|
RaiKoHoff
|
63ea67385c
|
+ fix: grepWinNP3 - language file and naming
|
2020-03-24 14:30:32 +01:00 |
|
RaiKoHoff
|
db85f32ed6
|
Merge remote-tracking branch 'upstream/master' into RC2_DEV
|
2020-03-24 08:26:58 +01:00 |
|
RaiKoHoff
|
4ba01206ba
|
Merge branch 'RC2_DEV' into NewFeatures
# Conflicts:
# src/Config/Config.cpp
# src/Config/Config.h
# src/Styles.c
|
2020-03-23 17:41:27 +01:00 |
|
Rainer Kottenhoff
|
b7732de39e
|
Merge pull request #2156 from RaiKoHoff/RC2_DEV
Corrections .ini-file reader/writer locking mechanism
|
2020-03-23 17:39:07 +01:00 |
|
RaiKoHoff
|
a21903d32c
|
+ fix: corrections .ini-file reader/writer locking mechanism
|
2020-03-23 17:02:30 +01:00 |
|
Rainer Kottenhoff
|
3f5a88478e
|
prototype .ini-file locking
|
2020-03-23 08:10:12 +01:00 |
|
Pairi Daiza
|
9b8c4fe51f
|
Merge pull request #2155 from hpwamr/mui
+ upd: Sync all files filters in MiniPath.in with all current Lexers
|
2020-03-22 16:58:42 +01:00 |
|
Pairi Daiza
|
f7f62c980b
|
+ upd: Sync all files filters in MiniPath.in with all current Lexers
|
2020-03-22 15:39:49 +01:00 |
|
Rainer Kottenhoff
|
66a764f1fd
|
Merge remote-tracking branch 'notepad3_orig_rizone/master' into NewFeatures
# Conflicts:
# Versions/build.txt
# res/Notepad3.exe.manifest.conf
# src/VersionEx.h
|
2020-03-22 13:49:14 +01:00 |
|
Pairi Daiza
|
97f824f11b
|
Merge pull request #2154 from hpwamr/mui
+chg: add "lang" in RC lexer in anticipation of feature grepWin
|
2020-03-22 10:00:21 +01:00 |
|
Pairi Daiza
|
f22b11f5df
|
+chg: add "lang" in RC lexer in anticipation of feature grepWin
|
2020-03-22 09:52:21 +01:00 |
|
Rainer Kottenhoff
|
4de64bdae0
|
Merge pull request #2153 from RaiKoHoff/NewFeatures
Refactoring for Scintilla DLL version
|
2020-03-21 23:10:36 +01:00 |
|
Rainer Kottenhoff
|
7cdb3be668
|
Merge branch 'RC2_DEV' into NewFeatures
# Conflicts:
# scintilla/win32/PlatWin.cxx
# scintilla/win32/PlatWin.h
# scintilla/win32/ScintillaWin.cxx
# src/Dialogs.c
# src/Helpers.c
# src/Helpers.h
# src/Styles.c
|
2020-03-21 23:09:09 +01:00 |
|
Rainer Kottenhoff
|
00f23c07ee
|
Merge pull request #2152 from RaiKoHoff/RC2_DEV
Refactoring for Scintilla DLL version
|
2020-03-21 22:31:40 +01:00 |
|
Rainer Kottenhoff
|
56bbc626c6
|
+ fix: refactoring for Scintilla DLL version
|
2020-03-21 22:20:23 +01:00 |
|
Rainer Kottenhoff
|
82c3a7abc1
|
Merge remote-tracking branch 'notepad3_orig_rizone/master' into RC2_DEV
|
2020-03-21 20:01:10 +01:00 |
|
Rainer Kottenhoff
|
963e3c51dd
|
Merge pull request #2151 from RaiKoHoff/NewFeatures
Update (master changes)
|
2020-03-21 17:02:31 +01:00 |
|
Rainer Kottenhoff
|
e530db85fd
|
Merge remote-tracking branch 'notepad3_orig_rizone/master' into NewFeatures
# Conflicts:
# Versions/build.txt
# res/Notepad3.exe.manifest.conf
# src/TypeDefs.h
# src/VersionEx.h
|
2020-03-21 16:55:11 +01:00 |
|
Rainer Kottenhoff
|
e52fa9d73f
|
Merge remote-tracking branch 'notepad3_orig_rizone/master' into RC2_DEV
|
2020-03-21 16:38:27 +01:00 |
|
Rainer Kottenhoff
|
3bfcd73518
|
Merge pull request #2150 from RaiKoHoff/RC2_DEV
Fix concurrency issue on .ini-file access
|
2020-03-21 16:34:26 +01:00 |
|
Rainer Kottenhoff
|
1993420596
|
+ fix: concurrency issue on .ini-file access while (nearly) parallel start
|
2020-03-21 16:27:17 +01:00 |
|
Rainer Kottenhoff
|
3f5db9bcc0
|
Merge pull request #2149 from RaiKoHoff/RC2_DEV
Insert selected language corresponding short & long Time Date string
|
2020-03-21 16:14:26 +01:00 |
|
Rainer Kottenhoff
|
dd9bc1fef7
|
+ fix: insert selected language correspondig short & long DateTime format
+ different RegEx search pattern spec for Update TimeStamps
|
2020-03-21 15:52:01 +01:00 |
|
Pairi Daiza
|
b20696d103
|
Merge pull request #2148 from hpwamr/newdev
+ chg: modify "Environment" of "build_np3portableapp.cmd"
|
2020-03-21 10:51:42 +01:00 |
|
Pairi Daiza
|
9977c111d3
|
+ chg: modify "Environment" of "build_np3portableapp.cmd"
|
2020-03-21 10:50:07 +01:00 |
|
Pairi Daiza
|
1ba177641b
|
Merge pull request #2147 from hpwamr/mui
MUI - Minor translation for "Polish" language.
|
2020-03-21 10:42:43 +01:00 |
|
Pairi Daiza
|
aa2aedf123
|
MUI - Minor translation for "Polish" language.
+ modify "Environment" of "build_np3portableapp.cmd"
|
2020-03-21 10:33:34 +01:00 |
|
Pairi Daiza
|
3211eb033f
|
Merge pull request #2146 from hpwamr/mui
+ upd: Version files for Japanese translation
|
2020-03-21 05:57:54 +01:00 |
|
Pairi Daiza
|
6ef4574529
|
Merge pull request #2145 from maboroshin/master
Translation, and new fix of Scintilla beta
|
2020-03-21 05:57:31 +01:00 |
|
Pairi Daiza
|
f97b1379e7
|
+ upd: Version files for Japanese translation
|
2020-03-21 05:41:18 +01:00 |
|
maboroshin
|
c4d57363cf
|
Correct to IME Behaver based on Scintilla 4.3.3 (beta)
|
2020-03-21 13:22:51 +09:00 |
|
maboroshin
|
463b9360c2
|
Translation: strings_ja_jp.rc window size
|
2020-03-21 13:13:16 +09:00 |
|
Rainer Kottenhoff
|
cfce53daa6
|
Merge pull request #2143 from RaiKoHoff/NewFeatures
Integrate language files for grepWin
|
2020-03-21 01:18:09 +01:00 |
|
Rainer Kottenhoff
|
174f129ae4
|
+ enh: integrate language files for grepWin
|
2020-03-21 01:14:21 +01:00 |
|
Rainer Kottenhoff
|
66a4f7c52d
|
Merge branch 'RC2_DEV' into NewFeatures
|
2020-03-20 23:48:23 +01:00 |
|
Rainer Kottenhoff
|
2b5a76bb54
|
Merge pull request #2142 from RaiKoHoff/RC2_DEV
Normalized view position on FileLoad (historic caret position)
|
2020-03-20 23:47:03 +01:00 |
|
Rainer Kottenhoff
|
ca93ea7ca2
|
Merge remote-tracking branch 'notepad3_orig_rizone/master' into RC2_DEV
|
2020-03-20 23:36:25 +01:00 |
|