Commit Graph

8546 Commits

Author SHA1 Message Date
Rainer Kottenhoff
b2f98f76df
Merge pull request #3763 from RaiKoHoff/Dev_LongPath
Merge from master
2021-11-10 12:27:13 +01:00
Rainer Kottenhoff
54fd8e7f16
Merge branch 'rizonesoft:Dev_LongPath' into Dev_LongPath 2021-11-10 12:26:03 +01:00
METANEOCORTEX\Kotti
37823bfd51 Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_LongPath
# Conflicts:
#	src/Version.h
2021-11-10 12:24:56 +01:00
Rainer Kottenhoff
3c4baf4cf0
Merge pull request #3762 from RaiKoHoff/Dev_LongPath
Add VS2022 version info
2021-11-10 12:18:56 +01:00
Rainer Kottenhoff
fa46722e8c
Merge branch 'rizonesoft:Dev_LongPath' into Dev_LongPath 2021-11-10 12:17:28 +01:00
METANEOCORTEX\Kotti
6c4c2e325f +chg: add VS2022 version info 2021-11-10 12:16:44 +01:00
Rainer Kottenhoff
b3d6a71c45
Merge pull request #3761 from RaiKoHoff/Dev_LongPath
Add Solution/Projects for VS2022
2021-11-10 12:06:50 +01:00
METANEOCORTEX\Kotti
41494e056f +add: parallel solution/projects for VS2022 2021-11-10 12:03:15 +01:00
Pairi Daiza
e4db524988
Merge pull request #3760 from hpwamr/mui
MUI - Minor translations in fr-FR and es-ES
2021-11-10 11:50:55 +01:00
Pairi Daiza
9c326b5b18
MUI - Minor translations in fr-FR and es-ES
+ Upd: MS VS 2019 version update (v16.11.6)
2021-11-10 11:26:36 +01:00
METANEOCORTEX\Kotti
0cf7163b3a Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_LongPath 2021-11-10 11:11:06 +01:00
Pairi Daiza
998204cb02
Merge pull request #3759 from hpwamr/mui
MUI - Improve 2 sentences in "Replace" dialog window
2021-11-10 10:43:55 +01:00
Pairi Daiza
716e004cb6
MUI - Improve 2 sentences in "Replace" dialog window
- Related to issue: https://github.com/rizonesoft/Notepad3/issues/3656#issuecomment-937911121
2021-11-10 10:02:04 +01:00
Pairi Daiza
3813808f57
Merge pull request #3757 from hpwamr/mui
+ add: examples of Apache Config files ".conf"
2021-11-09 23:36:13 +01:00
Pairi Daiza
d69f801746
+ add: examples of Apache Config files ".conf" 2021-11-09 23:35:24 +01:00
METANEOCORTEX\Kotti
8e52bcbdc3 Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_LongPath
# Conflicts:
#	Build/Changes.txt
#	Versions/day.txt
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
2021-11-09 23:09:39 +01:00
Pairi Daiza
0b3f34c077
Merge pull request #3754 from hpwamr/mui
Preparation Version files for "Release_Candidate_5.21.1109.1"
2021-11-09 15:21:35 +01:00
Pairi Daiza
b7b2d9a1e4
Preparation Version files for "Release_Canditate_5.21.1109.1"
- bugs fix version
2021-11-09 15:08:16 +01:00
Pairi Daiza
da3a706bdf
Merge pull request #3753 from hpwamr/xperim
+ Upd: Version files and Changes.txt
2021-11-09 13:27:42 +01:00
Pairi Daiza
1dbab3a2f7
+ Upd: Version files and Changes.txt 2021-11-09 13:26:04 +01:00
Rainer Kottenhoff
ee83e9ff6b
Merge pull request #3752 from RaiKoHoff/Dev_LongPath
Update Lexilla version info only (v5.1.3)
2021-11-09 12:33:37 +01:00
METANEOCORTEX\Kotti
80e83f30bc Merge branch 'Dev_LongPath' of https://github.com/RaiKoHoff/Notepad3 into Dev_LongPath 2021-11-09 12:32:47 +01:00
METANEOCORTEX\Kotti
e1fc345158 +upd: Lexilla version info only (v5.1.3) 2021-11-09 12:27:40 +01:00
Rainer Kottenhoff
96cbd5ca40
Merge pull request #3751 from RaiKoHoff/Dev_LongPath
Update: Scintilla Lib v5.1.4
2021-11-09 11:32:18 +01:00
METANEOCORTEX\Kotti
69cc324d23 +upd: Scintilla Lib v5.1.4 2021-11-09 11:31:00 +01:00
Rainer Kottenhoff
68e4719fc4
Merge pull request #3750 from RaiKoHoff/Dev_LongPath
Lexer Fortran: extended intrinsic functions
2021-11-09 10:33:59 +01:00
METANEOCORTEX\Kotti
91cab8f1e8 +enh: Lexer Fortran: extended intrinsic functions 2021-11-09 10:32:50 +01:00
METANEOCORTEX\Kotti
72f4f8809f Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_LongPath 2021-11-09 09:31:43 +01:00
Pairi Daiza
b0dfe42ba2
Merge pull request #3749 from hpwamr/mui
- fix correction of typo
2021-11-08 23:25:39 +01:00
Pairi Daiza
65a298422e
- fix correction of typo 2021-11-08 23:24:50 +01:00
Pairi Daiza
4bbdbc495d
Merge pull request #3748 from hpwamr/mui
+add: A Fortran Lexer test file
2021-11-08 23:16:56 +01:00
Pairi Daiza
be8a06aff1
+add: A Fortran Lexer test file 2021-11-08 23:03:33 +01:00
Rainer Kottenhoff
6c273b725f
Merge pull request #3747 from RaiKoHoff/Dev_LongPath
Add Fortran Lexer
2021-11-08 19:44:50 +01:00
Rainer Kottenhoff
778e588118
Merge branch 'Dev_LongPath' into Dev_LongPath 2021-11-08 19:44:39 +01:00
METANEOCORTEX\Kotti
24c7de78db +add: Fortran Lexer 2021-11-08 19:40:17 +01:00
METANEOCORTEX\Kotti
2ef2ffb8c6 + fix: Path_ToShortPathName() for grepWinNP3 startup 2021-11-08 12:13:08 +01:00
Pairi Daiza
3ddc31dd41
Merge pull request #3746 from hpwamr/mui
+ upd: Turkish translator name (id)
2021-11-06 17:30:16 +01:00
Pairi Daiza
fe775436bf
+ upd: Turkish translator name (id) 2021-11-06 17:03:08 +01:00
Pairi Daiza
accd757e95
Merge pull request #3741 from hpwamr/mui
+ Upd: Version files and Changes.txt
2021-10-30 16:17:41 +02:00
Pairi Daiza
81ff516fd6
+ Upd: Version files and Changes.txt 2021-10-30 15:54:44 +02:00
Rainer Kottenhoff
19747071d5
Merge pull request #3740 from RaiKoHoff/Dev_RC
Fix wrong format for reporting number of replaced occurrences "In Selection"
2021-10-30 01:11:04 +02:00
METANEOCORTEX\Kotti
49a456af5b Merge branch 'Dev_RC' into Dev_LongPath 2021-10-30 00:55:29 +02:00
METANEOCORTEX\Kotti
74c26d113a +fix: wrong format for reporting number of replaced occurrences "In Selection"+fix: grepWinNP3 not intended switching file size search settings 2021-10-30 00:52:15 +02:00
METANEOCORTEX\Kotti
af4bacb3b6 +fix: wrong format for reporting number of replaced occurrences "In Selection" 2021-10-29 18:19:23 +02:00
METANEOCORTEX\Kotti
4167292b07 Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_LongPath
# Conflicts:
#	src/Dialogs.c
2021-10-29 18:00:16 +02:00
Rainer Kottenhoff
b0581c2e0b
Merge pull request #3738 from RaiKoHoff/Dev_RC
Fix grepWinNP3 not intended switching file size search settings
2021-10-29 17:57:15 +02:00
METANEOCORTEX\Kotti
f74c4154ed +fix: grepWinNP3 not intended switching file size search settings 2021-10-29 17:41:35 +02:00
METANEOCORTEX\Kotti
1e16f7f609 Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_LongPath
# Conflicts:
#	Build/Changes.txt
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
2021-10-29 16:13:40 +02:00
Pairi Daiza
6977583017
Merge pull request #3736 from hpwamr/xperim
+Fix: Key "Favorites=(path)" not added in "Setup" version
2021-10-23 11:46:25 +02:00
Pairi Daiza
829bb67705
+Fix: Key "Favorites=(path)" not added in "Setup" version 2021-10-23 11:43:32 +02:00