1849 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
michael starke	cd0b41e012	using currente KeePassKit (fixes issues with deleted nodes)	2017-09-02 14:53:01 +02:00
michael starke	7dea82a3a2	using fixed KeePassKit	2017-09-02 10:07:11 +02:00
michael starke	c60fe5e39a	using current KeePassKit	2017-09-02 10:00:54 +02:00
michael starke	76383d6d9d	Added merge action to file menu	2017-09-02 10:00:10 +02:00
michael starke	f8b86a386a	removed unnecessary weak references in blocks	2017-09-02 09:42:28 +02:00
michael starke	e8bdd3b2b8	added missing localizations	2017-09-02 09:42:12 +02:00
michael starke	1ed9bc2856	minor changes to localization	2017-09-01 19:35:16 +02:00
michael starke	70650fc20f	completed simple merge workflow. Made passwordInputController better reusabel	2017-09-01 16:41:33 +02:00
michael starke	716a822dc0	reordered export actions in file menu	2017-09-01 16:38:32 +02:00
michael starke	e4a86ef0df	fixed generic “window” title for password generator window	2017-09-01 16:38:21 +02:00
michael starke	ff28775a5d	using properties	2017-09-01 10:58:49 +02:00
michael starke	826644c852	Updated KeePassKit for better merge support	2017-08-30 17:09:05 +02:00
michael starke	1d53f0fbee	using class properties where possible	2017-08-30 11:18:14 +02:00
michael starke	46b9b15338	converting to properties	2017-08-30 11:17:10 +02:00
michael starke	258f165cee	Using NSFileCoordinator to manage file access in presentedItemDidChange	2017-08-29 15:59:53 +02:00
michael starke	0166c183c7	use properties where possible	2017-08-29 14:58:42 +02:00
michael starke	a0b94312ed	using properties where possible	2017-08-29 14:58:25 +02:00
michael starke	aeeca850c2	using class properties where possible	2017-08-29 14:58:13 +02:00
michael starke	801889865f	Added spanish localization. Extended english and german localization.	2017-08-25 14:01:40 +02:00
michael starke	dbb44bbc85	Added ui for strategy on file changes	2017-08-24 17:02:47 +02:00
michael starke	b5c3b1f2ce	fixed wrong unbound settings key	2017-08-24 17:02:47 +02:00
Carlos Filipe Simões	02c6f40da9	Update README.md (#625)	2017-08-06 00:23:47 +02:00
Chester Liu	f1224b8a38	Convert all Localizable.strings to UTF-8 (#623)	2017-08-02 19:35:53 +02:00
Chester Liu	c4ecf73b58	Use UTF-8 for Localizable.strings in zh-Hans (#621) ... * Use UTF-8 for Localizable.strings in zh-Hans * Restore #611 * Missing semicolon	2017-08-01 17:37:07 +02:00
Michael Starke	a9561a0ad0	Merge pull request #608 from patchao2000/master ... Updated Simplified Chinese localization in Preferences and Group/EntryInspectorView	2017-07-26 18:05:39 +02:00
Zhao Peng	b3ea9ce270	Merge branch 'master' into master	2017-07-26 23:55:33 +08:00
Michael Starke	6335d8a610	Merge pull request #611 from skyline75489/zh-hans-localization ... Added more zh-Hans localization strings	2017-07-25 16:14:40 +02:00
skyline75489	08a101afa6	Added more zh-Hans localization strings	2017-07-15 19:58:26 +08:00
Zhao Peng	ed238a3bfb	updated Simplified Chinese localization in preferences and Group/EntryInspectorView	2017-07-09 17:21:56 +08:00
Zhao Peng	1d6b78bfe6	Merge pull request #1 from mstarke/master ... update from origin 20170708	2017-07-08 01:18:00 +08:00
michael starke	47c9491e71	added option to lock on user logout	2017-07-02 09:22:20 +02:00
michael starke	90ca759e67	fixed #600 by removing bad binding	2017-06-17 09:30:04 +02:00
michael starke	da62667620	minor cleanup in xib file	2017-06-16 10:15:01 +02:00
michael starke	ae36b9fb32	Mergen custom fields view into general tab	2017-06-16 10:09:56 +02:00
michael starke	1d1d444da3	cleaned up .travis.yml	2017-06-13 16:18:40 +02:00
michael starke	4e4b0f06f6	Added NO_SPARKLE environment ot preprocessor for customization	2017-06-13 11:30:22 +02:00
michael starke	4ac7cf1a91	Merge branch 'master' into develop	2017-06-12 19:40:39 +02:00
michael starke	984fe768ad	Fixed #594. Inner header in KDBX4 file stored corrupted binary sizes.	2017-06-12 19:40:26 +02:00
Michael Starke	749df8334e	Merge pull request #595 from sitsofe/spelling ... Minor spelling/typo fixes	2017-06-12 11:52:48 +02:00
Sitsofe Wheeler	c1a6789150	Minor spelling/typo fixes	2017-06-10 05:08:09 +01:00
michael starke	294c367306	Merge branch 'master' into develop ... # Conflicts: # .travis.yml	2017-06-08 19:55:25 +02:00
michael starke	5524d1eb5c	removed .travis.yml on master branch	2017-06-08 19:54:56 +02:00
michael starke	20cd994ac8	Merge branch 'master' into develop	2017-06-08 18:39:08 +02:00
Michael Starke	3ecff0f8a5	Added link to continuous releases in downloads	2017-06-08 18:38:09 +02:00
michael starke	68e3c8fb06	removed wrong character in shell script	2017-06-08 18:23:40 +02:00
michael starke	654869d2bc	fixed versioning to use travis CI env var.	2017-06-08 17:19:22 +02:00
michael starke	b5c8936a2a	added removal of history items	2017-06-08 17:09:30 +02:00
michael starke	8dd465866e	Added duplicate entry with options	2017-06-08 15:40:08 +02:00
michael starke	6771d68454	disabled more actions and controls in history view	2017-06-08 15:39:29 +02:00
michael starke	68ed110c4c	restore history entries added	2017-06-07 18:19:19 +02:00