Commit Graph

1012 Commits

Author SHA1 Message Date
stom79 488fe43b0e Merge branch 'develop' into bug_fix 2017-10-26 18:09:38 +02:00
stom79 9edc71acf5 --xml 2017-10-26 18:09:21 +02:00
Thomas 80d2f3f544 Merge pull request #3 from jeroenpraat/patch-2
Update and fixing typo and mistake
2017-10-26 18:01:10 +02:00
Jeroen edd6410dda Fix typo and mistake 2017-10-26 16:38:43 +02:00
stom79 fe548dc1f1 Fixes flavorDimensions 2017-10-26 16:19:56 +02:00
stom79 3bf98eff19 Upgrades to Android Studio 3 2017-10-26 16:12:47 +02:00
stom79 50f822dca1 Fixes a translation issue 2017-10-26 11:53:28 +02:00
stom79 902c80d35c Fixes a bug with local timeline 2017-10-26 09:06:24 +02:00
stom79 28cc83faee Adds counters 2017-10-25 13:45:22 +02:00
stom79 d0ffd7449a Fixes screen shot with mentions 2017-10-25 13:28:45 +02:00
stom79 54ea7201b8 makes all content clickable 2017-10-25 11:05:26 +02:00
stom79 3988f7bc59 Changes title 2017-10-25 11:00:04 +02:00
stom79 f2de4e559d Adds picture 2017-10-25 10:51:36 +02:00
stom79 c5b087c7bc some cleaning 2017-10-25 09:46:05 +02:00
stom79 17f4a0aa9f Put cursor at the end 2017-10-25 09:43:38 +02:00
stom79 d908010955 Adds users in a list 2017-10-25 09:04:34 +02:00
stom79 6439090493 Manages accounts in context 2017-10-25 07:53:31 +02:00
stom79 7112b45dfc Removes improvements which are not related to this branch 2017-10-24 16:02:21 +02:00
stom79 41eaabf517 Updates listview into recyclerview 2017-10-24 14:35:19 +02:00
stom79 c490eba5b0 Update notification adapter 2017-10-24 14:33:14 +02:00
stom79 979423818b Update notification fragment 2017-10-24 14:30:07 +02:00
stom79 c0122eef63 Last improvements 2017-10-24 14:06:28 +02:00
stom79 f6ad7d74e2 Fixes some issues 2017-10-24 11:44:07 +02:00
stom79 f809094efa Applies recycler view to accounts 2017-10-24 11:38:58 +02:00
stom79 3c96ee66ca Fixes issue with filter 2017-10-24 11:29:56 +02:00
stom79 b4d0186662 Starting two actionbars 2017-10-24 11:03:36 +02:00
stom79 10ad34cfc3 Merge branch 'ui_improvements' into recyclerview 2017-10-24 10:42:59 +02:00
stom79 32b753b3d9 Merge branch 'develop' into recyclerview
# Conflicts:
#	app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
#	app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
#	app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
#	app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
2017-10-24 10:30:49 +02:00
stom79 ace213df6e Starting two actionbars 2017-10-24 10:11:07 +02:00
Thomas 5e3543a7c0 Merge pull request #1 from stom79/add-license-1
Add license 1
2017-10-23 07:20:31 +02:00
Thomas d7db174e90 Create LICENSE 2017-10-23 07:19:28 +02:00
tom79 ee75d58349 Merged in develop (pull request #145)
Release 1.5.4
2017-10-22 16:07:21 +00:00
tom79 39493986e2 Prepares release 1.5.4 2017-10-22 18:02:40 +02:00
tom79 519647caff Changes rate app issue 2017-10-22 11:58:07 +02:00
tom79 328f77d54c Fixes notifications on Android O 2017-10-22 11:55:49 +02:00
tom79 28f1cf0958 Merge branch 'improves_stream_tl' into develop 2017-10-21 19:24:00 +02:00
tom79 998e6869be Avoids jumps 2017-10-21 19:19:11 +02:00
tom79 586535840f some cleaning 2017-10-21 17:15:52 +02:00
tom79 cef711a897 improves known status 2017-10-21 17:09:10 +02:00
tom79 201afec571 Some cleaning 2017-10-21 16:56:17 +02:00
tom79 e8997edae1 Merge branch 'develop' into improves_conversations
# Conflicts:
#	app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
#	app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveContextAsyncTask.java
#	app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveContextInterface.java
2017-10-21 16:36:05 +02:00
tom79 7b92d0feff Merge branch 'develop' into improves_conversations
# Conflicts:
#	app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
#	app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveContextAsyncTask.java
#	app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveContextInterface.java
2017-10-21 14:41:12 +02:00
tom79 3874c3495a Fixes issues 2017-10-21 14:35:36 +02:00
tom79 7d08b745e5 improves showconversation 2017-10-21 14:02:39 +02:00
tom79 e7da61bdd3 Fixes issue 2017-10-21 12:34:59 +02:00
tom79 bb6dca8d73 Merge branch 'support_custom_emojis' into develop 2017-10-21 12:33:03 +02:00
tom79 90d7e6e3a6 Display more replies in context 2017-10-21 12:32:27 +02:00
tom79 2c3a925cc9 Improves emojis support 2017-10-21 08:43:57 +02:00
tom79 c32b394160 Improves emojis support 2017-10-21 08:07:04 +02:00
tom79 f36ddba6f9 Emojis support 2017-10-20 19:58:46 +02:00