Philipp Crocoll
ede97fc726
update InputStick Plugin to 1.31
2015-06-23 17:25:27 +02:00
Philipp Crocoll
26686ed8a7
Merge branch 'master' of https://git01.codeplex.com/forks/wlawski/keepass2android into wlawski
...
Conflicts:
.gitignore
src/java/InputStickAPI/gen/com/inputstick/api/R.java
src/java/PluginInputStick/gen/com/inputstick/api/R.java
src/java/PluginInputStick/gen/keepass2android/plugin/inputstick/R.java
src/java/PluginInputStick/gen/keepass2android/pluginsdk/R.java
src/keepass2android/Resources/Resource.designer.cs
2014-12-14 07:29:29 +01:00
Philipp Crocoll
fa8b53793a
Merge branch 'master' of https://git01.codeplex.com/keepass2android
2014-12-12 06:25:23 +01:00
Philipp Crocoll
3963191930
Merge branch 'kp2aforsync'
...
Conflicts:
src/AndroidFileChooserBinding/AndroidFileChooserBinding.csproj
src/AndroidFileChooserBinding/Transforms/Metadata.xml
src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
src/KeePassLib2Android/KeePassLib2Android.csproj
src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
src/java/InputStickAPI/gen/com/inputstick/api/R.java
src/java/InputStickAPI/src/com/inputstick/api/BTConnectionManager.java
src/java/InputStickAPI/src/com/inputstick/api/PacketManager.java
src/java/InputStickAPI/src/com/inputstick/api/bluetooth/BTService.java
src/java/InputStickAPI/src/com/inputstick/api/layout/KeyboardLayout.java
src/java/InputStickAPI/src/com/inputstick/init/BasicInitManager.java
src/java/InputStickAPI/src/com/inputstick/init/InitManager.java
src/java/JavaFileStorage/bin/javafilestorage.jar
src/java/KP2AKdbLibrary/bin/kp2akdblibrary.jar
src/java/Keepass2AndroidPluginSDK/bin/keepass2androidpluginsdk.jar
src/java/PluginInputStick/AndroidManifest.xml
src/java/PluginInputStick/gen/com/inputstick/api/R.java
src/java/PluginInputStick/gen/keepass2android/plugin/inputstick/R.java
src/java/PluginInputStick/res/values/strings_activity_settings.xml
src/java/PluginInputStick/src/keepass2android/plugin/inputstick/ActionReceiver.java
src/keepass2android/PasswordActivity.cs
src/keepass2android/Resources/Resource.designer.cs
src/keepass2android/keepass2android.csproj
2014-12-12 06:08:11 +01:00
Philipp Crocoll
2a2c8b0c0f
more inputstick updates from Jakup
2014-12-10 22:33:27 +01:00
Philipp Crocoll
82c8b124bd
Merge branch 'master' of https://git01.codeplex.com/keepass2android into HEAD
...
Conflicts:
src/java/JavaFileStorage/bin/javafilestorage.jar
2014-12-09 06:22:27 +01:00
Philipp Crocoll
b65f0bce43
updated input stick api & plugin version
2014-12-07 05:15:21 +01:00
Philipp Crocoll
ac55c1fd86
changed to Google Play Services (ICS) component and up-to-date Support V4 library
2014-11-30 21:43:38 +01:00
Philipp Crocoll
3239131a84
Key files can be opened from deliberate locations
...
TODO: fix a problem with .kdb-files and key files
Added very basic and not yet functional AndroidContentStorage.cs
2014-11-08 21:29:36 +01:00
Philipp Crocoll
3c5c9105b7
updated InputStick API and added more languages (change by Jakub)
...
updated version code
2014-09-29 21:29:52 +02:00
Wiktor Lawski
f367bdfe33
.gitignore: Do not track R.java files
...
These files are automatically generated by aapt tool from resources.
There is no point to track their changes in version control system.
Already tracked files were removed from version control system.
2014-09-13 16:12:12 +02:00
Philipp Crocoll
52c5c5aa89
+InputStick plugin
...
+ "PluginA" (sample plugin)
+ icons and updated text for PluginQR
2014-06-01 07:06:58 +02:00
