CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5,408 Commits 2 Branches 34 Tags 274 MiB
caa414368d
Commit Graph

5408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rainer Kottenhoff
caa414368d + fix: DLL-Build solution, editorconfigs, grepWin-Layout 2020-04-19 12:22:23 +02:00
Rainer Kottenhoff
80e2d9e6ec + fix: missing all-bars update after command message 2020-04-19 01:06:36 +02:00
Rainer Kottenhoff
399af3499a Merge remote-tracking branch 'notepad3_orig_rizone/master' into grepWin_Integration 
# Conflicts:
#	grepWinNP3/src/Resources/grepWin.rc
 2020-04-19 00:26:01 +02:00
Rainer Kottenhoff
6056c24bd7 + chg: revert encoding of grepWin's .rc and corresponding resource.h file 2020-04-19 00:23:14 +02:00
Pairi Daiza
07135d560a
Merge pull request #2238 from hpwamr/mui 
+ chg: Add UTF-8 tag to grepWinNP3.rc
 2020-04-19 00:03:09 +02:00
Pairi Daiza
93535ac039 + chg: Add UTF-8 tag to grepWinNP3.rc 2020-04-18 23:53:34 +02:00
Pairi Daiza
6901f62381
Merge pull request #2235 from hpwamr/mui 
MUI - Update Slovak translation (sk-SK) of MiniPath and minor corrections
 2020-04-18 18:26:04 +02:00
Pairi Daiza
8d9d483041 MUI - Update Slovak translation (sk-SK) of MiniPath and minor correctionS 2020-04-18 18:12:15 +02:00
Rainer Kottenhoff
d37a8417bb
Merge pull request #2234 from RaiKoHoff/grepWin_Integration 
grepWinNP3: optimized single-tread worker option
 2020-04-18 10:30:00 +02:00
Rainer Kottenhoff
cd2a877d75 + fix: grepWinNP3: optimized single-tread worker option 
+ fix: grepWinNP3 language files
 2020-04-18 10:19:34 +02:00
Rainer Kottenhoff
b633f51887
Merge pull request #2232 from RaiKoHoff/grepWin_Integration 
grepWin license information
 2020-04-17 21:31:58 +02:00
Rainer Kottenhoff
a43fccad01 Merge remote-tracking branch 'notepad3_orig_rizone/master' into grepWin_Integration 2020-04-17 21:10:10 +02:00
Rainer Kottenhoff
e70b8c9007 + chg: Default long-line wrap settings 
+ add: grepWin license information and credits
 2020-04-17 21:09:40 +02:00
Rainer Kottenhoff
e15234849d
Update README.md 
Add license remark
 2020-04-17 20:45:25 +02:00
Rainer Kottenhoff
d302ce5150 + chg: remove spinning wait-cursor for text operations (may need reactivation for long operations) 2020-04-17 20:15:32 +02:00
Rainer Kottenhoff
489424b8ff
Merge pull request #2231 from RaiKoHoff/grepWin_Integration 
Move packages.config to corresponding project folder
 2020-04-17 19:02:07 +02:00
Rainer Kottenhoff
12abdfde22 + chg: move packages.config to corresponding project folder 2020-04-17 18:51:23 +02:00
Rainer Kottenhoff
70d6709799
Merge pull request #2230 from RaiKoHoff/grepWin_Integration 
grepWinNP3 integration
 2020-04-17 16:24:13 +02:00
RaiKoHoff
5dd380f86a + try: 2nd AppVeyor NuGet package restore 2020-04-17 16:19:31 +02:00
RaiKoHoff
dd993f604b + try: fix AppVeyor NuGet packages restore 2020-04-17 16:08:38 +02:00
RaiKoHoff
9208cc8603 + chg: hide other solution files (needed for NuGet restore) 2020-04-17 15:36:48 +02:00
RaiKoHoff
afc741f3cc + fix: finalize grepWinNP3 integration 2020-04-17 15:31:07 +02:00
RaiKoHoff
f7717188d4 + add: grepWinNP3 sources 2020-04-17 14:19:38 +02:00
RaiKoHoff
417ac8a604 + upd: NuGet package manager 2020-04-17 12:56:38 +02:00
RaiKoHoff
22c472a219 + sub: remove grepWinNP3 binary deployment folder 2020-04-17 12:52:13 +02:00
RaiKoHoff
5f669520a8 Merge branch 'NewFeatures_grepWinNP3' 2020-04-17 12:49:11 +02:00
RaiKoHoff
c270f79291 Merge remote-tracking branch 'upstream/master' into NewFeatures_grepWinNP3 2020-04-16 19:14:39 +02:00
Pairi Daiza
0bb1656998
Merge pull request #2228 from hpwamr/mui 
MUI - Translation >Japanese : String: disclaimer
 2020-04-16 16:07:01 +02:00
Pairi Daiza
bd5080e5b9 MUI - Translation >Japanese : String: disclaimer 
+ upd: Versioning files
 2020-04-16 15:55:34 +02:00
Pairi Daiza
974d2120b0
Merge pull request #2227 from maboroshin/master 
Translation >Japanese : String: disclaimer
 2020-04-16 15:52:27 +02:00
maboroshin
8453786d7c
Translation >Japanese : String: disclaimer 2020-04-16 19:24:25 +09:00
RaiKoHoff
989ca9f6fe Merge remote-tracking branch 'upstream/master' into NewFeatures_grepWinNP3 2020-04-15 09:41:43 +02:00
Pairi Daiza
cf808f89ce
Merge pull request #2225 from hpwamr/mui 
MUI - Minor correction to layout in pl-PL
 2020-04-14 23:38:03 +02:00
Pairi Daiza
5c2dac55d6 MUI - Minor correction to layout in pl-PL 
+ver: VS2019 version update - VS 16.5.4
+ upd: Versioning files
 2020-04-14 23:26:06 +02:00
RaiKoHoff
801e08ceb4 Merge remote-tracking branch 'upstream/master' into NewFeatures_grepWinNP3 2020-04-14 19:10:27 +02:00
Pairi Daiza
050541c94b
Merge pull request #2224 from maboroshin/master 
Translation >Japanese : 2020/Apr, Grep, Overlap
 2020-04-14 14:28:01 +02:00
RaiKoHoff
70023d52a2 Merge remote-tracking branch 'upstream/Hotfix_REL_5204112' into NewFeatures_grepWinNP3 
# Conflicts:
#	src/Edit.c
#	src/Notepad3.c
 2020-04-14 12:38:42 +02:00
RaiKoHoff
e45359fb12 Merge remote-tracking branch 'upstream/master' into NewFeatures_grepWinNP3 2020-04-14 12:31:32 +02:00
maboroshin
2e83df80d0 Translation >Japanese : 2020/Apr, Grep, Overlap 2020-04-14 19:04:06 +09:00
Rainer Kottenhoff
10c9448ff1
Merge pull request #2223 from RaiKoHoff/Hotfix_REL_5204112 
Hotfix: view selection on wrapped long-lines
 2020-04-14 11:36:56 +02:00
RaiKoHoff
61ad7594d3 + fix: view selection on wrapped long-lines 2020-04-14 11:35:30 +02:00
Pairi Daiza
8b6fb9cc8b
Merge pull request #2219 from hpwamr/mui 
+ upd: First BETA build after Release v5.20.411.2
 2020-04-13 15:55:10 +02:00
Pairi Daiza
fb55b3aef7 + upd: First BETA build after Release v5.20.411.2 2020-04-13 15:43:30 +02:00
Rainer Kottenhoff
b1779437f5
Merge pull request #2218 from rizonesoft/NewFeatures 
Merge "New Features" development branch to master
 2020-04-13 14:15:35 +02:00
Rainer Kottenhoff
f17a24c5f0
Merge pull request #2217 from RaiKoHoff/NewFeatures_grepWinNP3 
New features grep win np3
 2020-04-13 14:07:19 +02:00
Rainer Kottenhoff
eb4c095e05 Merge branch 'RC2_DEV' into NewFeatures_grepWinNP3 
# Conflicts:
#	Build/Changes.txt
#	Versions/day.txt
#	np3portableapp/_buildname.txt
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
 2020-04-13 14:06:14 +02:00
Rainer Kottenhoff
9136faaf27
Merge pull request #2216 from RaiKoHoff/NewFeatures_grepWinNP3 
View selection on wrapped long-lines vs. normalizing view
 2020-04-13 14:04:54 +02:00
Rainer Kottenhoff
8a7048711f + fix: view selection on wrapped long-lines vs. normalizing view 
+ upd: grepWinNP3 version (v2.1.0.4)
 2020-04-13 14:03:59 +02:00
Pairi Daiza
243cd470db + upd: Update Changes.txt 2020-04-12 00:29:32 +02:00
Pairi Daiza
fd1a2fd16a
Merge pull request #2213 from hpwamr/mui 
+ upd: Versioning files
 2020-04-11 23:19:29 +02:00