CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-17 21:03:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,604 Commits 2 Branches 34 Tags 274 MiB
99f46f29bc
Commit Graph

3604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rainer Kottenhoff
99f46f29bc Merge remote-tracking branch 'origin/Dev_RC_Fixes' into Dev_ONIGURUMA 2019-06-20 07:56:36 +02:00
Rainer Kottenhoff
02e7625628 Merge remote-tracking branch 'notepad3_orig_rizone/Dev_ONIGURUMA' into Dev_ONIGURUMA 2019-06-20 07:56:20 +02:00
Pairi Daiza
acfbab0792
Merge pull request #1349 from hpwamr/master 
Merge pull request #1 from rizonesoft/master
 2019-06-19 22:46:11 +01:00
Pairi Daiza
d016833f0b
Merge pull request #1348 from hpwamr/mui_dev 
Merge pull request from rizonesoft/master
 2019-06-19 22:32:01 +01:00
Pairi Daiza
fa116a5993
Merge pull request #2 from rizonesoft/master 
Update hpwamr/Notepad3/mui_dev
 2019-06-19 22:13:18 +01:00
Pairi Daiza
060413ef4b
Merge pull request #1 from rizonesoft/master 
Update hpwamr/Notepad3/master
 2019-06-19 22:11:16 +01:00
Pairi Daiza
6dad40ee88
Merge pull request #1347 from rizonesoft/master 
Update Oniguruma with JP: Appearance
 2019-06-19 18:38:44 +01:00
Pairi Daiza
68b48191d0
Merge pull request #1346 from maboroshin/master 
Translation >JP :Appearance
 2019-06-18 09:49:05 +01:00
maboroshin
b6a11a048b Translation >JP :Appearance 2019-06-18 16:24:32 +09:00
Rainer Kottenhoff
35d6fda771 Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_ONIGURUMA 2019-06-15 14:07:53 +02:00
Rainer Kottenhoff
1b8ac17975
Merge pull request #1345 from RaiKoHoff/Dev_ONIGURUMA 
+ add: Color hover and picker (HTML color def only #RRGGBB)
 2019-06-15 13:49:57 +02:00
Rainer Kottenhoff
bdaab67697 + add: Color hover and picker (HTML color def only #RRGGBB) 2019-06-15 13:48:49 +02:00
Rainer Kottenhoff
6ac9e58800
Merge pull request #1344 from RaiKoHoff/Dev_RC_Fixes 
Fix wrong error message for error dialog box
 2019-06-14 20:52:04 +02:00
Rainer Kottenhoff
a2ba70bb9b + fix: wrong error message for error dialog box while trying to write to readonly file. 2019-06-14 20:42:26 +02:00
Rainer Kottenhoff
12db738c6f
Merge pull request #1343 from RaiKoHoff/Dev_ONIGURUMA 
TOML Lexer: fixing minor problems
 2019-06-14 16:07:10 +02:00
Rainer Kottenhoff
d41a89e721 + fix: TOML Lexer: fixing problem with operator w/o spacing 2019-06-14 16:05:47 +02:00
Rainer Kottenhoff
1494c61370 + ver: version strings only 2019-06-14 00:42:57 +02:00
Rainer Kottenhoff
23a06a59e1 + add: TOML Lexer: Keyword handling 2019-06-14 00:40:55 +02:00
Rainer Kottenhoff
6ea2f94ffe
Merge pull request #1342 from RaiKoHoff/Dev_ONIGURUMA 
TOML Lexer Enhancements
 2019-06-13 18:00:50 +02:00
Rainer Kottenhoff
d098270432 Merge remote-tracking branch 'Notepad3_upstream_Rizone/master' into Dev_ONIGURUMA 2019-06-13 17:54:30 +02:00
Rainer Kottenhoff
51deab312a
Merge pull request #1340 from RaiKoHoff/Dev_RC_Fixes 
Don't jump to caret position after toggle fold by mouse-click
 2019-06-13 17:53:43 +02:00
Rainer Kottenhoff
c61559dc0f + add: TOML Lexer: Quoted Key handling 2019-06-13 17:53:29 +02:00
Rainer Kottenhoff
4c96bf9788 + add: TOML Lexer : Date-Time highlight & other enhancements 
+ add: some test files for manual checks
 2019-06-13 16:00:49 +02:00
Rainer Kottenhoff
9f3e8c1032 Merge remote-tracking branch 'origin/Dev_RC_Fixes' into Dev_ONIGURUMA 2019-06-13 12:57:16 +02:00
Rainer Kottenhoff
f663e38b02 Merge remote-tracking branch 'upstream/master' into Dev_RC_Fixes 2019-06-13 12:47:25 +02:00
Rainer Kottenhoff
bfa2ab88c0 + fix: don't jump to caret position after toggle fold by mouse-click 2019-06-13 12:37:37 +02:00
Pairi Daiza
464d456f2d
Merge pull request #1333 from RaiKoHoff/Dev_RC_Fixes 
Version update VS2019 : MS Visual C++ 2019 16.1.3
 2019-06-13 10:28:40 +02:00
Pairi Daiza
933f754fe0
Merge pull request #1334 from xsak/master 
Some more shortened strings
 2019-06-13 10:20:46 +02:00
Akos Keresztes
81f1bbb9d7 Typo fix 2019-06-13 10:18:01 +02:00
Akos Keresztes
50e288bd3f Sync from upstream 2019-06-13 09:35:21 +02:00
Rainer Kottenhoff
5e6c5fabec + upd: Version update VS2019 : MS Visual C++ 2019 16.1.3 2019-06-13 09:33:54 +02:00
Akos Keresztes
b3044824e5 Hungarian lang file - more strings to change 2019-06-13 09:29:42 +02:00
Akos Keresztes
6d9bbe387a Hungarian lang files - strings shortened, changes 2019-06-13 09:29:18 +02:00
Rainer Kottenhoff
0d0eedb559 + enh: TOML Lexer: add "Literal String" and "Number" 2019-06-13 03:56:31 +02:00
Rainer Kottenhoff
454321c8d7
Merge pull request #1331 from RaiKoHoff/Dev_ONIGURUMA 
Enhanced TOML Lexer (still incomplete vs. spec)
 2019-06-12 18:58:17 +02:00
Rainer Kottenhoff
cf2ca6de9a + enh: a little bit more advanced TOML Lexer 2019-06-12 18:49:38 +02:00
Rainer Kottenhoff
9d8c7bbe6c + add: first draft frame of TOML Lexer 2019-06-12 01:16:41 +02:00
Rainer Kottenhoff
4aa839c13e + rm: remove (old) AHK Lexer in favourite of modern AHK_L Lexer 2019-06-11 20:49:59 +02:00
Rainer Kottenhoff
71e569cde5 + rm: remove (old) AHK Lexer in favourite of modern AHK_L Lexer 2019-06-11 20:48:43 +02:00
Rainer Kottenhoff
4805c0b3ac Merge remote-tracking branch 'origin/Dev_RC_Fixes' into Dev_ONIGURUMA 
# Conflicts:
#	np3portableapp/_buildname.txt
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
 2019-06-11 20:20:59 +02:00
Rainer Kottenhoff
c2e88b1bb2
Merge pull request #1330 from RaiKoHoff/Dev_RC_Fixes 
Fix small bug in file extension matching for Lexer selection
 2019-06-11 20:17:44 +02:00
Rainer Kottenhoff
051d134ba2 + fix: small bug in file extension matching for Lexer selection 2019-06-11 18:46:13 +02:00
Rainer Kottenhoff
5941d8c20f
Merge pull request #1329 from RaiKoHoff/Dev_ONIGURUMA 
Multiselect Edit Indicator
 2019-06-11 15:31:33 +02:00
Rainer Kottenhoff
7e04105532 + add: Multiselect Edit Indicator 2019-06-11 15:29:52 +02:00
Rainer Kottenhoff
0a7c22682b Merge remote-tracking branch 'Notepad3_upstream_Rizone/master' into Dev_ONIGURUMA 
# Conflicts:
#	src/Styles.c
 2019-06-11 11:31:28 +02:00
Rainer Kottenhoff
c7bf035548
Merge pull request #1328 from RaiKoHoff/Dev_RC_Fixes 
Scintilla 416 merge conflict (wrong RegistryLexer version used)
 2019-06-11 11:29:02 +02:00
Rainer Kottenhoff
3770cedc13 + chg: version strings only 2019-06-11 11:18:31 +02:00
Rainer Kottenhoff
0b1ed1b272 + fix: MarkOcc color default string builder 
+ fix: Scintilla 416 merge conflict
 2019-06-11 11:16:59 +02:00
Rainer Kottenhoff
a4115767d8 Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_ONIGURUMA 2019-06-11 08:09:56 +02:00
Rainer Kottenhoff
cee3d22e2e
Merge pull request #1327 from RaiKoHoff/Dev_RC_Fixes 
Scintilla Version 416
 2019-06-11 01:38:58 +02:00