Commit Graph
26 Commits
Author SHA1 Message Date
Ernir Erlingsson 73c67e2e82 tweaked proguard 2016-02-02 12:21:08 +01:00
Ernir Erlingsson d340d69742 added proguard and cleaned dependencies 2016-02-02 12:20:26 +01:00
Ernir Erlingssonandakwizgran dae29eecce Navigation drawer (squashed and rebased). 2016-01-21 16:49:21 +00:00
Ernir Erlingsson 13de33c329 fixed target 2015-12-15 13:57:08 +01:00
Ernir Erlingsson bd42661422 improved the crash handler and refactored the manifest 2015-12-15 11:53:03 +01:00
Ernir Erlingsson cdf8392725 code nitpicks and color fix 2015-12-14 22:22:49 +01:00
Ernir Erlingsson 6ac999c113 Added AppCompatBar and fixed dependencies 2015-12-14 14:03:55 +01:00
Ernir Erlingsson f033f4fae0 Merge branch '40-forgotten-password' of https://code.briarproject.org/akwizgran/briar into 40-forgotten-password
Conflicts:
	briar-android/res/values/strings.xml
	briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java
2015-12-10 11:12:10 +01:00
Ernir Erlingsson b33d8d1ee5 fixed missing string 2015-12-10 11:07:10 +01:00
Ernir Erlingsson a5fd7ff9dc Added dependency injections for FileUtils and removed redundant code 2015-12-10 11:07:10 +01:00
Ernir Erlingsson fb2a44c478 code re-structure, mostly nitpicks :) 2015-12-10 11:02:15 +01:00
Ernir Erlingsson 886cad91f0 Added a dialog and refactored code 2015-12-10 11:02:15 +01:00
Ernir Erlingsson ca00b414e7 Fixed lost code from merge 2015-12-10 11:01:00 +01:00
Ernir Erlingsson 27edc2e3e8 code and ui refactoring in the Password activity, encapsulation and wrappers. 2015-12-10 11:01:00 +01:00
Ernir Erlingsson 0fe514606f removed sneaky iml file 2015-12-10 10:51:09 +01:00
Ernir Erlingsson 8c0f295879 Added dependency injections for FileUtils and removed redundant code 2015-12-10 10:49:28 +01:00
Ernir Erlingsson b83fe85910 code re-structure, mostly nitpicks :) 2015-12-09 11:50:26 +01:00
Ernir Erlingsson 7e9cff3118 Merge branch 'master' of https://code.briarproject.org/akwizgran/briar into 40-forgotten-password
Conflicts:
	.gitignore
	briar-android/briar-android.iml
2015-12-09 11:47:53 +01:00
Ernir Erlingsson 2052c8456f Added a dialog and refactored code 2015-12-09 10:29:34 +01:00
Ernir Erlingsson 105b627152 Merge branch '160-improve-gitignore' of https://code.briarproject.org/akwizgran/briar into 160-improve-gitignore
Conflicts:
	.gitignore
2015-12-09 00:35:50 +01:00
Ernir Erlingsson 2a61fa94d1 modified .gitignore and removed *.iml from git 2015-12-09 00:33:22 +01:00
Ernir Erlingsson 74298de1ac improved git ignore 2015-12-09 00:14:13 +01:00
Ernir Erlingsson 428c3dd1b2 Fixed lost code from merge 2015-12-09 00:08:08 +01:00
Ernir Erlingsson 43f562a7bc code and ui refactoring in the Password activity, encapsulation and wrappers. 2015-12-09 00:05:48 +01:00
Ernir Erlingsson 6d13c4e095 improved git ignore 2015-12-08 23:58:59 +01:00
Ernir Erlingsson 6d07a66063 improved git ignore 2015-12-08 11:05:03 +01:00