Commit Graph

1087 Commits

Author SHA1 Message Date
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
tom79 a22d61c63d Manages eomjis in helper 2017-10-20 07:11:44 +02:00
tom79 6cdfcd49c1 updates API 2017-10-20 06:57:53 +02:00
tom79 abd399a2da updates classes 2017-10-20 06:54:21 +02:00
tom79 25fde58655 Improves cross actions 2017-10-18 18:58:02 +02:00
tom79 01fc898c04 Changes the url for media which are unknown 2017-10-18 17:12:40 +02:00
tom79 098da433bd Detects unknown media 2017-10-18 17:07:50 +02:00
tom79 8bd6da0d6e Merge branch 'upgrade_android_job' into bug_fix 2017-10-18 17:06:04 +02:00
tom79 30cbb89f23 manages unknown type of media 2017-10-18 16:59:47 +02:00
tom79 2cdb21c33d Adds control on battery 2017-10-18 14:50:52 +02:00
tom79 f8696b129b Upgrades lib & some codes 2017-10-18 14:46:54 +02:00
tom79 1ad15d5e02 Merge branch 'bug_fix' into develop 2017-10-18 14:32:49 +02:00
tom79 8c7ec2b0f3 Fixes null pointer exceptions 2017-10-18 14:31:29 +02:00
tom79 d4842eda35 Fixes index of bound 2017-10-18 14:25:51 +02:00
tom79 ab2fe48b8c Fixes Issue #28 2017-10-18 09:42:20 +02:00
tom79 4dabcd1720 Merge branch 'bug_fix' into develop 2017-10-18 09:21:45 +02:00
tom79 4dad2bc4fb Avoids a bad cast 2017-10-18 09:15:19 +02:00
tom79 dfb84622bd Avoids deleted toots to be dealt 2017-10-18 09:10:07 +02:00
tom79 5c739d499a Moves my account to mastodon.social 2017-10-17 19:20:56 +02:00
PhotonQyv 1a9abb9965 Merged in PhotonQyv/mastodon_etalab/DutchTranslationFix (pull request #144)
Corrected Dutch translation.
2017-10-17 16:57:19 +00:00
tom79 37cbb10a59 Merge branch 'bug_fix' into develop 2017-10-17 18:52:24 +02:00
tom79 652551fa87 Remove ugly button 2017-10-17 18:52:05 +02:00
tom79 faf995f0c9 Use String instead of Integer 2017-10-17 18:44:24 +02:00
PhotonQyv 1744d9613a Corrected Dutch translation, removed a couple of string arrays that are no longer in base strings.xml. 2017-10-17 17:39:21 +01:00
tom79 b5a142b46a possible null pointer ... 2017-10-17 18:35:10 +02:00
tom79 06afafc934 Merge branch 'bug_fixes_61' into develop 2017-10-17 18:28:36 +02:00