rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,454 Commits 7 Branches 123 Tags
cc8c525dabcf000f0de90588e329ae30daa75b6c
Commit Graph

1454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
J-Jamet
2c8e3e9c8e Merge branch 'develop' into feature/Education 
# Conflicts:
#	app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.java
#	app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java
#	app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java
#	app/src/main/java/com/kunzisoft/keepass/fileselect/FileSelectActivity.java
#	app/src/main/java/com/kunzisoft/keepass/password/PasswordActivity.java
#	app/src/main/java/com/kunzisoft/keepass/utils/MenuUtil.java
#	app/src/main/res/values/donottranslate.xml
 2018-04-10 10:33:52 +02:00
J-Jamet
ccbc6c07ed Update supportVersion libraries 2018-04-10 09:59:33 +02:00
J-Jamet
47e820e3d8 (Implementation) Merge branch 'justintime4tea-kunzi-develop' into develop 2018-04-10 09:49:24 +02:00
J-Jamet
13dea4b567 New icon pack importer 2018-04-09 21:37:28 +02:00
Justin Gross
70d1ce715e Change compile to implementation 2018-04-08 16:20:07 -04:00
J-Jamet
cc41545c0a create Classic Icon Pack 2018-04-08 12:45:25 +02:00
J-Jamet
aded8fab0a Rebuild classic icons (Add apple icon and remove numbers) 2018-04-07 15:41:52 +02:00
J-Jamet
9cb4d28ad8 Upgrade Readme 2018-04-07 10:31:59 +02:00
J-Jamet
a1b2235fb3 Merge tag '2.5.0.0beta8' into develop 
2.5.0.0beta8
 2018-04-06 20:29:47 +02:00
J-Jamet
161923c808 Merge branch 'release/2.5.0.0beta8' 2.5.0.0beta8 2018-04-06 20:29:26 +02:00
J-Jamet
d5a03424d0 Solve fab color 2018-04-06 20:27:33 +02:00
J-Jamet
3e87c1ab9d Change password layout 2018-04-06 19:39:58 +02:00
J-Jamet
a6046bc49a Add sorting by last access and by creation time 2018-04-06 19:02:31 +02:00
J-Jamet
db98f4b30c Remove db name for v3 2018-04-06 17:15:36 +02:00
J-Jamet
60eff63569 Add dialogs to save Db name and description 2018-04-06 16:51:25 +02:00
J-Jamet
b8e97ec53b Change rounds_fix_explanation 2018-04-06 08:43:33 +02:00
J-Jamet
c2b60b2268 Entry edit as menu, Launch in lowercase 2018-04-06 08:34:53 +02:00
J-Jamet
cac1f923cc Change url icon by launch icon 2018-04-06 08:06:37 +02:00
J-Jamet
b4ac0ef21f Move donation in menu 2018-04-06 07:56:57 +02:00
J-Jamet
8b85c22f25 Remove font 2018-04-05 20:31:27 +02:00
J-Jamet
582faab29d Base64Coder as dependency 2018-04-05 20:28:47 +02:00
J-Jamet
a9f6fa3441 commons-collections as dependency 2018-04-05 20:21:47 +02:00
J-Jamet
54740c1ba2 Change packages and solve dependencies 2018-04-05 20:11:08 +02:00
J-Jamet
94a8ecbdf1 GPL2 to GPL3 2018-04-05 18:41:49 +02:00
J-Jamet
46855e0b70 Merge branch 'feature/EncryptionSettings' into develop #9 2018-04-05 17:25:07 +02:00
J-Jamet
2d3eabe07e Update changelogs 2018-04-05 17:24:11 +02:00
J-Jamet
48bda000e9 Add database name, description and version, encapsulate db methods 2018-04-05 17:20:17 +02:00
J-Jamet
8aea6fa2da Remove keepassdroid assets 2018-04-05 13:26:00 +02:00
J-Jamet
c46aa0e5c8 remove .idea files from being tracked 2018-04-05 13:17:13 +02:00
Justin Gross
ed7f6e4b68 Update icons to font awesome 2018-04-04 16:49:40 -04:00
J-Jamet
825d88014d Set Key Rounds for database V4 2018-04-04 20:37:23 +02:00
J-Jamet
b3ff38fb35 Get rounds from KdfParameters 2018-04-04 17:25:45 +02:00
Justin Gross
1ebba9d8be Merge pull request #1 from Kunzisoft/develop 
Merge upstream changes
 2018-04-04 11:00:37 -04:00
J-Jamet
1e4deb2182 Refactor rounds 2018-04-04 14:42:58 +02:00
J-Jamet
d5acd04a19 Merge branch 'develop' into feature/EncryptionSettings 2018-04-04 13:38:48 +02:00
J-Jamet
fe73a951e3 Upgrade version 2018-04-04 13:38:05 +02:00
J-Jamet
415094154d Upgrade description 2018-04-04 13:31:07 +02:00
J-Jamet
347522b9a6 Add lock, field copy, sort and donation 2018-04-03 20:40:52 +02:00
J-Jamet
918f563faa Change Education for Password layout and fix translations 2018-04-03 17:11:46 +02:00
J-Jamet
3b88b0fea6 Keep long in DateToKDBX4 2018-04-03 13:49:23 +02:00
J-Jamet
d8e3d52f21 Catch OutOfMemoryError when writing 2018-04-03 13:07:05 +02:00
J-Jamet
041f3eb568 Solve visual bugs and translation 2018-04-02 12:59:02 +02:00
J-Jamet
4a1d97a622 Add entry edit screens preference 2018-04-01 16:34:54 +02:00
J-Jamet
cd0d712f56 Add reset education screens preference 2018-04-01 00:37:30 +02:00
J-Jamet
761d9a1883 Add education to "add button" 2018-03-31 21:59:05 +02:00
J-Jamet
2c9a6d7c26 Add education to database selection 2018-03-31 21:24:39 +02:00
J-Jamet
8105f89088 New FileSystem screen 2018-03-31 16:29:34 +02:00
J-Jamet
90084ed2f7 Solve protected field display 2018-03-31 14:57:01 +02:00
J-Jamet
496725a8fd Add encryption settings 2018-03-30 21:04:33 +02:00
J-Jamet
72b0cdf0d7 Add changelogs 2018-03-30 16:07:37 +02:00