Commit Graph

104 Commits

Author SHA1 Message Date
l3d00m 765810388d Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java
	QKSMS/src/main/res/values/strings.xml
2015-09-02 13:41:39 +02:00
l3d00m 93d477c4b3 Change string, readd flags 2015-09-02 13:34:35 +02:00
l3d00m 5ebfb4d67c Added option for #130 2015-08-26 14:31:49 +02:00
l3d00m 933b572b3d Fix for #142
Workaround for multiline mode with enter to send (
http://stackoverflow.com/a/6772713/4026792 )
2015-08-26 14:31:47 +02:00
l3d00m eb6caadd42 Merge remote-tracking branch 'qklabs/master' 2015-08-26 14:30:34 +02:00
Moez Bhatti eba2573c4b Merge pull request #174 from Allsimon/remove-nonfree-libs
Create a free flavor for F-Droid
2015-08-25 22:17:21 -04:00
BernardLePro 6f63ae530d Renamed variables 2015-08-24 21:14:49 +02:00
Moez Bhatti 88bd9d5379 Merge pull request #175 from qklabs/update-translations-fix
Updated translations
2015-08-24 13:48:24 -04:00
l3d00m 549845fd40 Fixed "bug" caused through rebasing
:(
2015-08-24 15:05:36 +02:00
l3d00m fe96a59144 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:

	QKSMS/src/main/java/com/moez/QKSMS/ui/delivery/DeliveryReportHelper.java
	QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java
2015-08-24 15:00:25 +02:00
l3d00m 2ae0885c4d Added option for #130 2015-08-24 14:48:06 +02:00
l3d00m d0956e6642 Fix for #142
Workaround for multiline mode with enter to send (
http://stackoverflow.com/a/6772713/4026792 )
2015-08-24 13:33:20 +02:00
Moez Bhatti 09255db59c Updated translations 2015-08-24 02:04:44 -04:00
Moez Bhatti dd5dc5a365 Added donottranslate.xml 2015-08-24 02:03:03 -04:00
Moez Bhatti 2525a9b9a0 Minor cleanup 2015-08-24 00:07:10 -04:00
Moez Bhatti 67a294bffb Remove redundant casts 2015-08-24 00:01:08 -04:00
Moez Bhatti 926394ce47 Merge branch 'develop' 2015-08-23 23:11:59 -04:00
Moez Bhatti 9571128e61 Merge pull request #146 from LanderN/dutch_trans
updated dutch translations
2015-08-23 23:04:13 -04:00
BernardLePro 9a10a5b151 Merge remote-tracking branch 'origin/remove-nonfree-libs' into remove-nonfree-libs 2015-08-24 01:12:13 +02:00
BernardLePro 3282ea850a Cleaned up the base application and added an interface for the analytics manager 2015-08-24 01:10:43 +02:00
BernardLePro 2fae440f18 Create two different flavors: with analytics disabled for a free (as in
"free-speech") flavors and the usual version for Google Play
2015-08-24 01:10:42 +02:00
BernardLePro 43f1dd518c Cleaned up the base application and added an interface for the analytics manager 2015-08-24 01:09:22 +02:00
BernardLePro 44c6deae16 Create two different flavors: with analytics disabled for a free (as in
"free-speech") flavors and the usual version for Google Play
2015-08-23 22:42:22 +02:00
l3d00m b06155d7b8 Fix for #142
Workaround for multiline mode with enter to send (
http://stackoverflow.com/a/6772713/4026792 )
2015-08-23 21:46:55 +02:00
Moez Bhatti ddc4c17c5e Update README.md 2015-08-23 15:46:31 -04:00
Moez Bhatti e9ca0e707a Added missing switch case 2015-08-23 15:28:08 -04:00
Moez Bhatti 054e4cfd8d Merge pull request #168 from mvdan/more-random-patches
More random patches
2015-08-23 15:24:13 -04:00
Daniel Martí 81dd0de8a1 Start using string switches (Java 1.7) 2015-08-23 12:17:52 -07:00
l3d00m 48b936d7b7 More lint fixes 2015-08-23 21:12:30 +02:00
Moez Bhatti e9743b616a Merge pull request #162 from sm4rk0/patch-2
Time picker should use system 12/24h format
2015-08-22 23:10:16 -04:00
Moez Bhatti 63168f7c3c Merge pull request #147 from LanderN/dateformat
Make date behave according to Locale
2015-08-22 23:03:29 -04:00
Daniel Martí 283408b922 Remove type duplicates in constructors (Java 1.7) 2015-08-22 20:01:09 -07:00
Daniel Martí 41dd23aeeb Compile with UTF-8 and Java 1.7 2015-08-22 20:01:09 -07:00
Daniel Martí e642cc127d Disable MissingTranslation lint warnings 2015-08-22 20:01:09 -07:00
Daniel Martí dded1591a3 Disable proguard obfuscation and remove mappings 2015-08-22 20:00:50 -07:00
Daniel Martí 0e53516211 Simplify .travis.yml 2015-08-21 17:53:18 -07:00
Moez Bhatti c425b3bc6b Merge branch 'develop'
Merge 'develop' into 'master'
2015-08-21 20:00:42 -04:00
Moez Bhatti eefc81eeb6 Merge pull request #159 from l3d00m/develop
small lint cleanup
2015-08-21 19:37:15 -04:00
Marko Stanković 52fb5f9fb0 Replace getActivity() with context
After some research, I found out that DateFormat.is24HourFormat actually accepts Context.
2015-08-20 23:09:10 +02:00
Marko Stanković 61ab77fe4b Timestamps should follow system 12/24h format
...unless the setting TIMESTAMPS_24H is set.
2015-08-20 22:50:30 +02:00
Marko Stanković db38994325 Time picker should use system 12/24h format
...if setting TIMESTAMPS_24H is not set.
2015-08-20 22:32:14 +02:00
l3d00m 8a8a18d1ae Further lint cleanup 2
Github Desktop isn't working as expected :(
2015-08-20 19:30:51 +02:00
l3d00m 8f881e23b2 Further lint cleanup 2015-08-20 19:29:46 +02:00
Lander Noterman 5007419855 Do not translate background color values 2015-08-20 15:19:24 +02:00
l3d00m 419ba50ab2 small lint cleanup
unused imports; strings; removed some deprecated methods
2015-08-20 14:55:53 +02:00
Lander Noterman 0571d4b3ed Also make getConversationTimestamp behave according to locale 2015-08-20 10:50:18 +02:00
Lander Noterman 487e833c67 Better way to account for locale 2015-08-20 10:16:40 +02:00
Moez Bhatti 324c3f70e8 Merge pull request #156 from qklabs/develop
Develop
2015-08-20 01:11:27 -04:00
Moez Bhatti afd058146c Fixed F-Droid link 2015-08-20 01:04:54 -04:00
Moez Bhatti d3a01d818c Update README
Remove bit asking devs to commit to develop, we'll use master now as per @mvdan's suggestion
2015-08-20 00:57:29 -04:00