J-Jamet
|
0bfc395986
|
Merge branch 'feature/Merge_Data' into develop #840
|
2022-01-19 20:40:47 +01:00 |
|
J-Jamet
|
60c536f444
|
Fix save database info
|
2022-01-19 20:33:54 +01:00 |
|
J-Jamet
|
8129e6e0c1
|
First code to merge KDB and add doc
|
2022-01-19 20:10:50 +01:00 |
|
J-Jamet
|
223a8e9a5e
|
Fix concurrent modification exception
|
2022-01-19 19:12:44 +01:00 |
|
J-Jamet
|
0e21c75007
|
replace updateGroup by addGroupIndex
|
2022-01-19 18:28:21 +01:00 |
|
J-Jamet
|
6ca031e8fd
|
Merge custom data
|
2022-01-19 16:33:15 +01:00 |
|
J-Jamet
|
f02e86fb50
|
Confirm reload dialog if local modification #1196
|
2022-01-19 15:11:17 +01:00 |
|
J-Jamet
|
b17f8244da
|
Remove merge menu in read only mode
|
2022-01-18 14:41:12 +01:00 |
|
J-Jamet
|
4c02ce138b
|
Remove merge with kdb database
|
2022-01-18 14:37:46 +01:00 |
|
J-Jamet
|
5eba208b00
|
Upgrade to 3.2.0 and update CHANGELOG
|
2022-01-18 13:09:28 +01:00 |
|
J-Jamet
|
2a4fbbfb35
|
Merge branch 'develop' into feature/Merge_Data
|
2022-01-18 13:05:07 +01:00 |
|
J-Jamet
|
7f3a1c9a7d
|
Merge tag '3.1' into develop
3.1
|
2022-01-18 12:44:57 +01:00 |
|
J-Jamet
|
8413d2b31a
|
Merge branch 'release/3.1'
3.1.0
|
2022-01-18 12:44:44 +01:00 |
|
J-Jamet
|
04a03da382
|
Merge branch 'master' into release/3.1
|
2022-01-18 12:44:30 +01:00 |
|
J-Jamet
|
e3274657ea
|
/bin/bash: q: command not found
|
2022-01-18 12:13:03 +01:00 |
|
J-Jamet
|
f3b25cb792
|
Merge branch 'develop' of https://hosted.weblate.org/git/keepass-dx/strings into translations
|
2022-01-18 12:08:48 +01:00 |
|
J-Jamet
|
d181f886fe
|
Update CHANGELOG
|
2022-01-18 12:02:33 +01:00 |
|
J-Jamet
|
616d073395
|
Capture duplicate error exception
|
2022-01-18 11:44:45 +01:00 |
|
J-Jamet
|
d36fc19585
|
Add try catch exception when populate view
|
2022-01-18 11:32:11 +01:00 |
|
J-Jamet
|
95d9e07e2f
|
TODO fix meta stream
|
2022-01-17 23:51:37 +01:00 |
|
J-Jamet
|
25077a7b9a
|
Fix history merge
|
2022-01-17 23:33:20 +01:00 |
|
J-Jamet
|
6971cd1a6b
|
Start merge database v1
|
2022-01-17 22:35:27 +01:00 |
|
J-Jamet
|
1e43a65743
|
Do not close the database when a merge failed
|
2022-01-17 22:18:46 +01:00 |
|
J-Jamet
|
2f2cbf343e
|
Fix object deletion
|
2022-01-17 22:07:32 +01:00 |
|
J-Jamet
|
3426b3cdeb
|
Better algorithm implementation
|
2022-01-17 21:31:05 +01:00 |
|
J-Jamet
|
e1d4c172f4
|
Merge settings
|
2022-01-17 20:29:10 +01:00 |
|
J-Jamet
|
4c4a67afaf
|
Merge icons
|
2022-01-17 17:23:33 +01:00 |
|
J-Jamet
|
d33f210940
|
Add TODO and copyright
|
2022-01-15 22:31:28 +01:00 |
|
J-Jamet
|
ead59bd410
|
Merge entry history
|
2022-01-15 21:37:24 +01:00 |
|
J-Jamet
|
f9445de71f
|
Merge database metadata
|
2022-01-15 21:03:40 +01:00 |
|
J-Jamet
|
c26995779a
|
Change strings
|
2022-01-15 20:31:41 +01:00 |
|
J-Jamet
|
c6277453a3
|
Better binary management
|
2022-01-15 20:31:31 +01:00 |
|
solokot
|
91ebf2ba6f
|
Translated using Weblate (Russian)
Currently translated at 100.0% (571 of 571 strings)
Translation: KeePassDX/Strings
Translate-URL: https://hosted.weblate.org/projects/keepass-dx/strings/ru/
|
2022-01-15 11:13:08 +01:00 |
|
J-Jamet
|
0f87bdd5a3
|
Merge branch 'develop' into feature/Merge_Data
|
2022-01-14 18:52:55 +01:00 |
|
J-Jamet
|
9e97042dd1
|
Larger database color view
|
2022-01-14 18:42:32 +01:00 |
|
J-Jamet
|
b7c4a99e71
|
Upgrade README Year
|
2022-01-14 18:37:29 +01:00 |
|
J-Jamet
|
48e315453e
|
Smooth counter
|
2022-01-14 18:11:36 +01:00 |
|
J-Jamet
|
a8a6d14ca3
|
Merge branch 'feature/Entry_Color' into develop
|
2022-01-14 18:05:21 +01:00 |
|
J-Jamet
|
e895dd3430
|
Upgrade CHANGELOG
|
2022-01-14 18:05:03 +01:00 |
|
J-Jamet
|
f59859137a
|
Upgrade libs
|
2022-01-14 18:03:00 +01:00 |
|
J-Jamet
|
dee92e9e40
|
Upgrade libs
|
2022-01-14 18:01:35 +01:00 |
|
J-Jamet
|
6701f4f95e
|
Fix color in KitKat
|
2022-01-14 17:55:54 +01:00 |
|
J-Jamet
|
e20f769854
|
Fix theme refresh
|
2022-01-14 16:00:36 +01:00 |
|
J-Jamet
|
4f762a9432
|
Change background color icon
|
2022-01-14 15:54:41 +01:00 |
|
J-Jamet
|
3c49eb1635
|
Fix color picker
|
2022-01-14 15:45:54 +01:00 |
|
J-Jamet
|
bdc6a282e2
|
Colorize entry view
|
2022-01-14 14:25:06 +01:00 |
|
J-Jamet
|
8392ab2cc4
|
Fix icon color
|
2022-01-14 01:13:37 +01:00 |
|
Allan Nordhøy
|
93c7c09f8c
|
Translated using Weblate (Norwegian Bokmål)
Currently translated at 90.0% (514 of 571 strings)
Translation: KeePassDX/Strings
Translate-URL: https://hosted.weblate.org/projects/keepass-dx/strings/nb_NO/
|
2022-01-14 00:53:27 +01:00 |
|
Allan Nordhøy
|
120116414f
|
Translated using Weblate (Danish)
Currently translated at 91.5% (523 of 571 strings)
Translation: KeePassDX/Strings
Translate-URL: https://hosted.weblate.org/projects/keepass-dx/strings/da/
|
2022-01-14 00:53:24 +01:00 |
|
J-Jamet
|
11794e5819
|
Add color change listener
|
2022-01-14 00:39:20 +01:00 |
|