Commit Graph

8619 Commits

Author SHA1 Message Date
METANEOCORTEX\Kotti
2ea10f14ba Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_LongPath 2021-11-17 01:06:22 +01:00
METANEOCORTEX\Kotti
c9605de60b +fix: heap corruption on retrieving text from combo box 2021-11-17 01:05:58 +01:00
Pairi Daiza
99e3893510
Merge pull request #3793 from hpwamr/mui
+ Upd: MS VS 2019 version update (v16.11.7)
2021-11-17 00:13:40 +01:00
Pairi Daiza
928c2a79f0
Merge pull request #3794 from hpwamr/xperim
+ Upd: MS VS 2022 version update (v17.0.1)
2021-11-17 00:11:42 +01:00
Pairi Daiza
d0a1aac0c9
+ Upd: MS VS 2022 version update (v17.0.1) 2021-11-17 00:10:09 +01:00
Pairi Daiza
256fb38904
+ Upd: MS VS 2019 version update (v16.11.7) 2021-11-16 23:55:39 +01:00
Pairi Daiza
70facf5be1
Merge pull request #3792 from hpwamr/xperim
+del: Remove a depreciate solution
2021-11-16 19:03:13 +01:00
Pairi Daiza
deba19a8c6
+del: Remove a depreciate solution 2021-11-16 19:02:00 +01:00
Rainer Kottenhoff
0d6a0bff5f
Merge pull request #3791 from RaiKoHoff/Dev_LongPath
Merge VS2019 and VS2022 Solution/Projects
2021-11-16 14:43:04 +01:00
METANEOCORTEX\Kotti
d27e5242a4 +mrg: merge VS2019 and VS2022 Solution/Projects 2021-11-16 14:42:11 +01:00
Rainer Kottenhoff
28facad986
Merge pull request #3790 from RaiKoHoff/Dev_LongPath
Merge and Project fixes
2021-11-16 00:26:49 +01:00
METANEOCORTEX\Kotti
7f46f086d8 +rev: revert wrong stub-project names 2021-11-16 00:24:55 +01:00
METANEOCORTEX\Kotti
6b6f9be955 Merge remote-tracking branch 'notepad3_orig_rizone/Dev_LongPath' into Dev_LongPath
# Conflicts:
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
2021-11-16 00:18:23 +01:00
METANEOCORTEX\Kotti
cdbf9f2339 Merge branch 'Dev_RC' into Dev_LongPath
# Conflicts:
#	src/Edit.c
2021-11-16 00:02:29 +01:00
Pairi Daiza
dc74d05444
Merge pull request #3789 from hpwamr/xperim
+add: VS2022 Manual Adjust Dependencies
2021-11-15 22:40:48 +01:00
Pairi Daiza
0d999c97af
+add: VS2022 Manual Adjust Dependencies 2021-11-15 22:39:25 +01:00
Pairi Daiza
2ca6292c91
Merge pull request #3788 from hpwamr/xperim
+add: VS2022 Solution/Projects Dependencies
2021-11-15 22:33:19 +01:00
Pairi Daiza
64f1efa2cd
+add: VS2022 Solution/Projects Dependencies 2021-11-15 22:25:34 +01:00
Pairi Daiza
c115b52954
Merge pull request #3787 from hpwamr/mui
+ Upd: Version files and Changes.txt
2021-11-15 22:07:58 +01:00
Pairi Daiza
e46a7d381f
+ Upd: Version files and Changes.txt 2021-11-15 21:50:13 +01:00
Pairi Daiza
6ae928f0f1
Merge pull request #3786 from RaiKoHoff/Dev_RC
Fix Don't clear occurrence markers for unchanged search pattern
2021-11-15 18:40:56 +01:00
METANEOCORTEX\Kotti
fa30766566 +fix: Don't clear occurrence markers for unchanged search pattern 2021-11-15 18:01:09 +01:00
METANEOCORTEX\Kotti
51499d9869 +rev: reverting and fixing several F/R pattern issues 2021-11-15 17:10:41 +01:00
METANEOCORTEX\Kotti
71fcacd33f Merge branch 'Dev_RC' into Dev_LongPath
# Conflicts:
#	src/DarkMode/user32-stub/user32-stub.vcxproj
#	src/DarkMode/uxtheme-stub/uxtheme-stub.vcxproj
#	src/Edit.c
#	src/Notepad3.vcxproj
2021-11-15 17:09:40 +01:00
Pairi Daiza
9ee76f0ba4
Merge pull request #3785 from RaiKoHoff/Dev_RC
Try to fix issues around F/R search pattern handling
2021-11-15 14:51:24 +01:00
METANEOCORTEX\Kotti
b74dec0df2 +fix: F/R wildcard pattern handling 2021-11-15 14:26:01 +01:00
METANEOCORTEX\Kotti
5df65e8910 +rev: reverting changes to F/R behavior, correction for empty pattern 2021-11-15 10:36:45 +01:00
METANEOCORTEX\Kotti
f2bc2d6032 +fix: correction to VS2019 project settings 2021-11-15 10:35:16 +01:00
Rainer Kottenhoff
916fb95822
Merge pull request #3784 from RaiKoHoff/Dev_LongPath
Fix target location for MUI libs/dlls
2021-11-14 12:26:21 +01:00
METANEOCORTEX\Kotti
792ad11d7b +fix: target location for MUI libs/dlls 2021-11-14 12:24:58 +01:00
METANEOCORTEX\Kotti
61d31b7e7d Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_LongPath 2021-11-14 12:00:26 +01:00
Pairi Daiza
b425de06cc
Merge pull request #3783 from hpwamr/mui
MUI - Update strings_pl_pl.rc
2021-11-13 20:09:36 +01:00
Pairi Daiza
660024f0d5
MUI - Update strings_pl_pl.rc 2021-11-13 19:51:39 +01:00
Pairi Daiza
3bd6b870b3
Merge pull request #3782 from hpwamr/mui
MUI - Update strings_hi_in.rc
2021-11-13 17:39:46 +01:00
Pairi Daiza
6d1931a37c
MUI - Update strings_hi_in.rc 2021-11-13 17:23:19 +01:00
Rainer Kottenhoff
2650138db6
Merge pull request #3781 from RaiKoHoff/Dev_LongPath
Fix VS2022 Solution/Projects
2021-11-13 10:41:23 +01:00
METANEOCORTEX\Kotti
c7657f060b +fix: VS2022 Solution/Projects 2021-11-13 10:39:54 +01:00
METANEOCORTEX\Kotti
60e13a72c9 Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_LongPath 2021-11-13 09:10:52 +01:00
Pairi Daiza
55b3c9666a
Merge pull request #3780 from hpwamr/mui
MUI - Update strings_sk_sk.rc
2021-11-13 06:29:59 +01:00
Pairi Daiza
10ba633550
MUI - Update strings_sk_sk.rc 2021-11-13 06:18:29 +01:00
Pairi Daiza
d40ab666b8
Merge pull request #3779 from hpwamr/xperim
+ Upd: Version files and Changes.txt
2021-11-12 19:59:03 +01:00
Pairi Daiza
4e627be333
+ Upd: Version files and Changes.txt 2021-11-12 19:56:57 +01:00
Pairi Daiza
087995c843
Merge pull request #3778 from VenusGirl/patch-4
Update strings_ko_kr.rc
2021-11-12 17:30:55 +01:00
VenusGirl
4c3492a69f
Update strings_ko_kr.rc 2021-11-13 00:58:03 +09:00
Pairi Daiza
73d53b4708
Merge pull request #3777 from xsak/master
Hungarian translation - search and replace strings changed
2021-11-12 16:50:44 +01:00
Akos Keresztes
52d345d808 Hungarian translation - search and replace strings changed 2021-11-12 15:08:37 +01:00
Rainer Kottenhoff
a8e19b6579
Merge pull request #3776 from RaiKoHoff/Dev_LongPath
Add missing dll-stubs to VS2022 solution
2021-11-12 15:07:36 +01:00
METANEOCORTEX\Kotti
fd78439236 +fix: add missing dll-stubs to VS2022 solution 2021-11-12 15:06:26 +01:00
METANEOCORTEX\Kotti
a16934b4e7 Merge branch 'Dev_RC' into Dev_LongPath 2021-11-12 14:52:32 +01:00
METANEOCORTEX\Kotti
ebb1a71bd6 Merge branch 'Dev_RC' into Dev_LongPath
# Conflicts:
#	src/Edit.c
2021-11-12 14:48:00 +01:00