Commit Graph

6374 Commits

Author SHA1 Message Date
Pairi Daiza
0bb39392c8 + chg: Correction typo 2020-03-17 23:12:30 +01:00
Rainer Kottenhoff
6b21c1548f Merge remote-tracking branch 'notepad3_orig_rizone/master' into NewFeatures 2020-03-17 21:08:25 +01:00
Rainer Kottenhoff
71bab8728e
Merge pull request #2123 from RaiKoHoff/RC2_DEV
Fix: German translation for some strings
2020-03-17 21:05:53 +01:00
Rainer Kottenhoff
fea8385a68 + fix: German translation for some strings 2020-03-17 21:05:15 +01:00
RaiKoHoff
b2ddb08f54 + add: grepWin integration: multi file search 2020-03-17 18:39:13 +01:00
Pairi Daiza
404c88f309
Merge pull request #2121 from hpwamr/mui
+ chg: Correction typo for: "..\Build\Docs"
2020-03-17 18:23:21 +01:00
Pairi Daiza
ac1e3b8a41 + chg: Correction typo for: "..\Build\Docs" 2020-03-17 18:09:53 +01:00
Pairi Daiza
d94cf897a1
Merge pull request #2120 from hpwamr/mui
+ chg: Preparation Changes.txt for Release version
2020-03-17 17:23:20 +01:00
Pairi Daiza
5e077c626b + chg: Preparation Changes.txt for Release version 2020-03-17 16:29:20 +01:00
RaiKoHoff
f02b4766c8 Merge branch 'RC2_DEV' into NewFeatures 2020-03-17 14:40:17 +01:00
Rainer Kottenhoff
1d3cda429d
Merge pull request #2119 from RaiKoHoff/RC2_DEV
Changes.txt review
2020-03-17 14:19:28 +01:00
RaiKoHoff
f04d32c9ef + chk: review Changes.txt 2020-03-17 14:12:53 +01:00
RaiKoHoff
ca3c946e51 Merge branch 'RC2_DEV' into NewFeatures 2020-03-17 11:07:54 +01:00
RaiKoHoff
8a505cac0a Merge remote-tracking branch 'upstream/master' into RC2_DEV 2020-03-17 11:07:24 +01:00
Rainer Kottenhoff
f04ca68faf
Merge pull request #2118 from RaiKoHoff/RC2_DEV
Changed: Focused-View scrolling
2020-03-17 09:57:55 +01:00
RaiKoHoff
f51fafda10 + chg: optional scroll to caret position 2020-03-17 09:43:55 +01:00
RaiKoHoff
f3ee0029c7 + fix: Focused-View scrolling 2020-03-17 08:45:28 +01:00
RaiKoHoff
8cf1ba6be9 Merge remote-tracking branch 'upstream/master' into RC2_DEV 2020-03-17 08:43:58 +01:00
Pairi Daiza
77478ca30f
Merge pull request #2117 from hpwamr/mui
MUI - Minor update in "Command Line Help" list
2020-03-16 21:51:54 +01:00
Pairi Daiza
1ab41ce1fe + upd: Versioning files 2020-03-16 21:32:27 +01:00
Pairi Daiza
61b0acb427 MUI - Minor update in "Command Line Help" list
- translation added loine in es-ES, fr-FR and nl-NL
2020-03-16 21:31:05 +01:00
Pairi Daiza
e35e425e97
Merge pull request #2116 from hpwamr/mui
+upd: Minor update in "KeyboardShortcuts.txt"
2020-03-16 17:30:01 +01:00
Pairi Daiza
1c44eb1966 +upd: Minor update in "KeyboardShortcuts.txt"
- add "Oniguruma_RE.txt" in Installer and NotepadPortable doc
2020-03-16 17:22:05 +01:00
Rainer Kottenhoff
66f5407bdf
Merge pull request #2115 from RaiKoHoff/NewFeatures
Update to current RC3/Release DEV
2020-03-16 17:07:55 +01:00
RaiKoHoff
e69e45c2f2 Merge remote-tracking branch 'upstream/master' into NewFeatures
# Conflicts:
#	src/Edit.c
#	src/Notepad3.c
#	src/Notepad3.h
2020-03-16 17:03:50 +01:00
RaiKoHoff
7e10a03049 Merge remote-tracking branch 'upstream/master' into RC2_DEV 2020-03-16 16:51:43 +01:00
Rainer Kottenhoff
57239f0903
Merge pull request #2113 from RaiKoHoff/RC2_DEV
Try "hardening" selection undo/redo behavior
2020-03-16 16:50:27 +01:00
RaiKoHoff
6be020d7b5 + chg: try "hardening" selection undo/redo behavior 2020-03-16 16:33:08 +01:00
RaiKoHoff
6326680ae0 + upd: Keyboard Shortcut Doc 2020-03-16 10:32:14 +01:00
RaiKoHoff
42263fc246 + upd: Oniguruma current DEV (2020-03-16) 2020-03-16 10:06:25 +01:00
RaiKoHoff
1704659b48 Merge remote-tracking branch 'upstream/master' into NewFeatures 2020-03-16 09:31:57 +01:00
RaiKoHoff
2e4bed6668 Merge remote-tracking branch 'upstream/master' into RC2_DEV 2020-03-16 09:31:04 +01:00
Pairi Daiza
804ebc157f
Merge pull request #2112 from hpwamr/mui
Mui
2020-03-15 22:22:54 +01:00
Pairi Daiza
6a0f100aa1 Merge branch 'mui' 2020-03-15 22:20:28 +01:00
Pairi Daiza
e364e447d8
Merge pull request #2111 from hpwamr/mui
+upd: Update "KeyboardShortcuts.txt"
2020-03-15 22:18:41 +01:00
Pairi Daiza
af2f248ab2 +upd: Update "KeyboardShortcuts.txt" 2020-03-15 22:16:58 +01:00
Pairi Daiza
3cde251e7b +upd: Update "KeyboardShortcuts.txt" 2020-03-15 22:06:59 +01:00
Pairi Daiza
46993ea512
Merge pull request #2108 from maboroshin/master
Translation: menu_ja_jp.rc DPI
2020-03-14 16:44:50 +01:00
Pairi Daiza
2c6d406ab8
Merge pull request #2110 from hpwamr/mui
+ upd: Version files for ja-JP translation
2020-03-14 16:44:32 +01:00
Pairi Daiza
9eae8b6af2 + upd: Version files for ja-JP translation 2020-03-14 16:37:27 +01:00
Rainer Kottenhoff
1af54e49dc Merge branch 'RC2_DEV' into NewFeatures 2020-03-14 15:42:17 +01:00
Rainer Kottenhoff
26db77298c + fix: some compiler warnings 2020-03-14 15:41:20 +01:00
Rainer Kottenhoff
5f70dd8d33 + fix: compiler warnings 2020-03-14 15:09:57 +01:00
Rainer Kottenhoff
f57cbdef1b Merge branch 'RC2_DEV' into NewFeatures 2020-03-14 15:02:31 +01:00
Rainer Kottenhoff
6b1b29fa9d
Merge pull request #2109 from RaiKoHoff/RC2_DEV
Fix: smarter delimiter detection for CSV Rainbow Lexer
2020-03-14 15:01:09 +01:00
Rainer Kottenhoff
9e6179f5f1 + add: CSV Rainbow test file 2020-03-14 14:46:50 +01:00
Rainer Kottenhoff
3f6b97c7da + fix: smarter delimiter detection for CSV Rainbow Lexer 2020-03-14 14:43:17 +01:00
maboroshin
0450da5b8f
Translation: menu_ja_jp.rc 2020-03-14 19:17:49 +09:00
Rainer Kottenhoff
5200bab7be + add: ToDo BackLog text file 2020-03-14 10:42:17 +01:00
Rainer Kottenhoff
935fbe229e Merge remote-tracking branch 'notepad3_orig_rizone/master' into NewFeatures 2020-03-13 20:56:50 +01:00