Commit Graph

1726 Commits

Author SHA1 Message Date
Jonathan White
82ace81974 Merge pull request #57 from JosefVitu/lock-on-minimize
Implement automatic locking when minimizing
2016-10-28 10:31:25 -04:00
Jonathan White
13c3743ff5 Merge branch 'develop' into lock-on-minimize 2016-10-28 10:24:21 -04:00
Jonathan White
46904fb110 Merge pull request #65 from JosefVitu/fix-#34
Fix advanced HTTP settings (close #34)
2016-10-28 10:22:51 -04:00
Josef Vitu
8f3ffdcc2a
Fix advanced HTTP settings (close #34) 2016-10-28 15:25:57 +02:00
Josef Vitu
6c3c0087dd
🔒 Implement automatic locking when minimizing 2016-10-28 13:22:17 +02:00
Jonathan White
2e9b42688f Merge pull request #62 from keepassxreboot/feature/docs-#24
Update CONTRIBUTING.md with Branch Strategy
2016-10-27 15:07:47 -04:00
thez3ro
589b6465f8
📝 Update CONTRIBUTING.md with Branch Strategy. close #24 [ci skip] 2016-10-27 19:28:39 +02:00
TheZ3ro
6c7c5443d4 Updated Pull Request Template and Contribute documents
* 📝 Update Installation instruction from the Wiki
* 📝 Update PR template with emojis 🎉
* 📝 Update CONTRIBUTING.md with CodeStyle
2016-10-26 08:19:28 -04:00
Jonathan White
fdad028e73 Merge pull request #59 from jkt628/develop
search directory configured via environment
2016-10-26 08:10:30 -04:00
Jack Thomasson
3ec29d3b52 search directory configured via environment
use absolute path to database file
2016-10-25 10:18:23 -06:00
Jonathan White
e97add0c46 Merge pull request #55 from jkt628/develop
utility to launch keepassx with database passwords fetched from kdewa…
2016-10-24 21:14:41 -04:00
Jack Thomasson
0138209004 utility to launch keepassx with database passwords fetched from kdewallet 2016-10-24 18:20:17 -06:00
Jonathan White
f7fd78d715 Merge pull request #53 from keepassxreboot/feature/fix-win-build
Fix winsock and autotype error when compiling on Windows
2016-10-24 19:09:39 -04:00
Jonathan White
bbd8447afa Merge branch 'develop' into feature/fix-win-build 2016-10-24 19:04:16 -04:00
Jonathan White
cf2bbbfef1 Merge pull request #54 from jkt628/develop
add command line option --pw-stdin to accept password from stdin
2016-10-24 18:15:41 -04:00
Jack Thomasson
7000e80465 add command line option --pw-stdin to accept password from stdin 2016-10-24 12:22:02 -06:00
thez3ro
24a17c05ab
🏁 Fix winsock and autotype error when compiling on Windows 2016-10-24 19:45:35 +02:00
Jonathan White
7c4129033a Merge pull request #52 from pugaoffitlh/develop
Added issues link to Readme
2016-10-21 11:16:18 -04:00
David Puga
83e3267f0e 📝 added issues link to issues
[ci skip]
2016-10-20 20:08:01 -07:00
Jonathan White
62cfbf73e1 Merge pull request #46 from keepassxreboot/feature/trayicon-#37
Show locked tray icon when database is locked
2016-10-19 22:45:56 -04:00
TheZ3ro
f539d69984 Add PNG tray-icons for locked db [ci skip] 2016-10-18 11:44:37 +02:00
TheZ3ro
ba86c1e1da Institute CONTRIBUTING, ISSUE template, and PR template
* DOC: Add ISSUE and PR template, add CONTRIBUTING
* DOC: incorporated feedback from @samrocketman, @Manko10, and @droidmonkey
* README now points to CONTRIBUTING instead of repeating it
* Added code style link and minor tweaks to CONTRIBUTING
2016-10-17 22:16:37 -04:00
Jonathan White
cfb7de0fe9 Updated transifex configuration and translation files (#35) 2016-10-13 18:32:13 -04:00
Jonathan White
334859726c Updated readme 2016-10-11 20:06:28 -04:00
Manolis Agkopian
119af3d760 Fetch favicon from the root of the website and use Google as a fallback (#36)
* Replace favicon fetching using Google with fetching from the root of the website
* Follow up to 3 http redirects for the favicon
* Add download favicon from Google as fallback
* Move code responsible for fetching the favicon from Google on its own function to reduce repetitiveness.
2016-10-11 18:04:44 -04:00
thez3ro
3bbf11e26f Unlocked tray icon #37 2016-10-10 00:02:28 -04:00
Jonathan White
5bb27b2989 Fixed Travis image link 2016-10-05 23:15:58 -04:00
Jonathan White
c4b3f08618 Download favorite icon of entry url and add to the custom icon registry (#30)
* Favicon download button.
* Simplified icon grabbing code
2016-10-05 23:10:06 -04:00
Jonathan White
6ac773d5ae Updated readme file 2016-10-05 23:03:13 -04:00
Jonathan White
e19559fe81 Merge pull request #29 from Manko10/develop
Update link to new upstream repository for pull requests
2016-10-05 18:51:34 -04:00
Janek Bevendorff
7dd30d4db1 Update link to new upstream repository for pull requests 2016-10-05 18:21:26 +02:00
Jonathan White
9b8b7b490a Merge branch 'keepassx_203' into develop 2016-10-02 21:51:08 -04:00
Felix Geyer
5ec9d0685d Finalize changelog. 2016-10-02 21:50:15 -04:00
Felix Geyer
004c412501 Update translations. 2016-10-02 21:50:15 -04:00
Felix Geyer
f05caf7623 Prepare for 2.0.3 release. 2016-10-02 21:50:15 -04:00
Jonathan White
7d165f133a Merge branch 'keepassx_master' into develop 2016-10-02 21:49:24 -04:00
Felix Geyer
fff9e7ac46 Convert Q_FOREACH loops to C++11 for loops.
Q_FOREACH will de deprecated soon.
2016-10-02 21:45:55 -04:00
Felix Geyer
ad834f0f58 Merge branch '2.0' 2016-10-02 21:45:55 -04:00
Felix Geyer
8a50ee8b22 Close database without asking when unmodified.
Don't ask for confirmation when closing/locking a database and
- it's in edit entry mode
- there haven't been any modifications

Refs #511
2016-10-02 21:45:54 -04:00
Felix Geyer
cf8186312a Refactor parts of EditEntryWidget::saveEntry() into updateEntryData(). 2016-10-02 21:45:54 -04:00
Felix Geyer
8f87b5cfd4 Split EditWidgetIcons::save() into state() and reset(). 2016-10-02 21:45:54 -04:00
Felix Geyer
61ce733c6f Make Entry::endUpdate() return whether the entry has been modified. 2016-10-02 21:45:54 -04:00
Felix Geyer
c78822f6e6 Merge branch '2.0' 2016-10-02 21:45:54 -04:00
Felix Geyer
a10a30f390 Fix name of Qt translation file.
In Qt5 it's qtbase_<lang> instead of qt_<lang>
2016-10-02 21:44:33 -04:00
Felix Geyer
7c7014d951 Drop obsolete GCRYPT_HAS_SALSA20 ifdef. 2016-10-02 21:44:33 -04:00
Jonathan White
dee331d52d Fixed Travis CI build process 2016-10-02 21:30:17 -04:00
Jonathan
2146392a2f Merge pull request #8 from daniellandau/save-with-ctrl-return
Save entry with ctrl+return keyboard shortcut
2016-10-02 10:10:33 -04:00
Jonathan White
e011a6eb25 Fixed typo from merge 2016-10-02 10:02:54 -04:00
Jonathan White
5eadd10612 Merge remote-tracking branch 'origin/keepassx_merge' 2016-09-29 22:37:45 -04:00
Felix Geyer
c2a80ce570 Remember auto-type window size.
Resize columns once when the entry list is set.

Based on https://github.com/keepassx/keepassx/pull/158

Closes #478
2016-09-29 22:08:37 -04:00