Commit Graph

1254 Commits

Author SHA1 Message Date
stom79 b0cff78a88 Prepares release 1.6.0-beta-4 2017-11-16 19:17:47 +01:00
stom79 30bc6089d9 Fixes issue #46 - Custom emoji are not displayed in notifications 2017-11-16 19:14:54 +01:00
stom79 4179995f11 Fixes issue #45 - Content Warnings are not displayed on boosted toots 2017-11-16 18:46:43 +01:00
stom79 5b8b8ff869 Fixes typo 2017-11-16 18:33:09 +01:00
stom79 0df7705a2b Avoids index of bound exceptions 2017-11-15 19:02:33 +01:00
stom79 733937c6f8 Fixes issue #41 - Range refresh wrong item count 2017-11-15 18:38:53 +01:00
stom79 742e6d2cd2 Fixes issue #40 - Missing table 2017-11-15 16:51:35 +01:00
stom79 bff2af7bd9 Prepares release 1.6.0-beta-2 2017-11-15 14:14:41 +01:00
stom79 1e240ecd42 Issue with descriptions and drafts 2017-11-15 14:05:41 +01:00
stom79 bf9a51d756 Fixes issue #38 - Picture is displayed in the background of the popup. 2017-11-15 11:15:33 +01:00
stom79 4ca705c4e2 Fixes issue #38 - Increases the number of lines in the popup. 2017-11-15 10:39:02 +01:00
stom79 843bf2641b Issue #41 - Fixes potential duplicate toots 2017-11-15 09:44:12 +01:00
stom79 e765c01e97 Issue when permission is not granted 2017-11-14 19:05:33 +01:00
stom79 6fd04c8718 Avoids null pointer 2017-11-14 15:27:26 +01:00
stom79 6c77c653f7 Catches all errors 2017-11-14 15:13:29 +01:00
stom79 1903fc14d5 Fixes bad cast depending of the streaming service 2017-11-14 15:11:31 +01:00
stom79 8608eed2da Issue #37 - Increases timeout 2017-11-14 14:59:09 +01:00
stom79 75d9a8f59f Fixes issue #39 2017-11-14 14:32:39 +01:00
stom79 961f0cdc33 Changes names in notif 2017-11-12 09:34:57 +01:00
stom79 342e3bf6de Cleans emoji class 2017-11-12 09:27:19 +01:00
stom79 5bf0472d18 Some cleaning and adds previous streaming service if user wants to stop the new one. 2017-11-12 08:33:24 +01:00
stom79 bf8d5eb734 Some changes 2017-11-12 07:57:48 +01:00
stom79 444f338d38 Prepares release 1.6.0-beta-1 2017-11-11 19:00:43 +01:00
stom79 6852d79744 Last improvements 2017-11-11 18:51:04 +01:00
stom79 7f0fc2d0e3 Last improvements 2017-11-11 18:49:59 +01:00
stom79 0323f4d833 Some changes to improve streaming api 2017-11-11 18:25:01 +01:00
stom79 73d567fdd3 Adds account acct 2017-11-11 14:59:16 +01:00
stom79 33280046a8 Improves service 2017-11-11 14:39:33 +01:00
stom79 31fdbf20e9 Improves service 2017-11-11 10:05:37 +01:00
stom79 542b677d65 Improves service 2017-11-11 08:56:19 +01:00
stom79 de02ac56f0 notify for other accounts when activity at top 2017-11-11 07:50:35 +01:00
stom79 268f86a688 enforce the service activation with general notifications 2017-11-11 07:45:53 +01:00
stom79 9cb365381f Keeps the service awaken when in live mode 2017-11-11 07:43:11 +01:00
stom79 4a7f2a16a3 Manages multi-accounts 2017-11-11 07:40:03 +01:00
stom79 dd35d23e47 Upgrade streaming service 2017-11-11 07:26:52 +01:00
stom79 684816f9af Hides menu icon 2017-11-09 19:09:00 +01:00
stom79 d5610abfc8 Potential null pointer 2017-11-09 18:56:38 +01:00
stom79 1a3983d65e Put a default value for version 2017-11-09 18:54:15 +01:00
stom79 7d1b2aae72 Prepares release 1.5.9 2017-11-08 17:50:14 +01:00
stom79 178d6cfe15 Change build tools 2017-11-08 17:37:50 +01:00
stom79 00b0d4deaa Fixes issue #32
Makes account names clickable in profiles
2017-11-08 17:36:33 +01:00
stom79 94ba412a1d Release 1.5.8 with build tools 27 2017-11-08 16:22:09 +01:00
stom79 f9ee09acb9 Allows to see pinned toots also from other users 2017-11-08 10:47:50 +01:00
stom79 b3ae6952a8 Fdroid apk - Release 1.5.8-new 2017-11-08 09:29:09 +01:00
stom79 c432e6bada Fdroid apk - Release 1.5.8 2017-11-08 09:16:49 +01:00
stom79 61f8b7ae5b Prepares release 1.5.8 2017-11-07 19:04:02 +01:00
stom79 11550b6a13 Prepares release 1.5.8 2017-11-07 18:13:08 +01:00
stom79 65685ddbfb Merge branch 'bug_fix' into develop 2017-11-07 16:09:34 +01:00
stom79 3deec52707 Fixes issue #23 2017-11-07 16:08:31 +01:00
stom79 bddb6d8672 Improves media 2017-11-07 11:09:09 +01:00
stom79 522b1d95e7 Fixes issue #27 2017-11-06 19:38:04 +01:00
stom79 e2b0fbbe5a Fixes some padding 2017-11-06 18:36:00 +01:00
stom79 b3e63f190c No need to go further 2017-11-06 18:30:52 +01:00
stom79 99ef945be2 Avoids null pointer 2017-11-06 18:08:22 +01:00
stom79 c31791ea80 Fixes notification issue 2017-11-06 12:59:42 +01:00
stom79 ada656e4ec Fixes notification issue 2017-11-06 07:20:52 +01:00
stom79 4ed8525e7e Fixes notification issue 2017-11-05 20:04:38 +01:00
stom79 a4136c496e Fixes notification issue 2017-11-05 18:12:58 +01:00
stom79 fecb850f5c Update custom lib + move some apk 2017-11-05 17:53:16 +01:00
stom79 c48112e3ee Fixes issue #18
Allows to select a different app for media
2017-11-05 08:20:19 +01:00
stom79 b2767716b1 Fixes issue #21
Adds a mention button in profile page
2017-11-05 08:06:23 +01:00
stom79 281cccadb8 Merge branch 'bug_fix' into develop 2017-11-05 07:39:28 +01:00
Thomas bca76d5949
Merge pull request #22 from SuperMeepBoy/patch-1
Correct typo
2017-11-05 07:28:40 +01:00
SuperMeepBoy 82c5b4badd
Correct typo 2017-11-04 23:47:29 +01:00
stom79 b6d5134229 Fixes issue #20 2017-11-04 19:04:04 +01:00
stom79 d7268c1ad0 Fixes an issue with dividers when toots are filtered 2017-11-04 12:43:15 +01:00
stom79 be20b86f87 Color for warning message should match this for tablets 2017-11-04 08:23:45 +01:00
stom79 24ddd0f469 Prepares release 1.5.7 2017-11-04 08:22:13 +01:00
stom79 3400fa9ecf Merge branch 'bug_fix' into develop 2017-11-04 08:10:08 +01:00
stom79 437ded0299 Merge branch 'ui_improvements' into develop 2017-11-04 08:10:00 +01:00
stom79 57009111be Fixes an issue when rendering media 2017-11-04 08:05:50 +01:00
stom79 cd1ae0813f Color issue with buttons on media activity 2017-11-04 07:53:07 +01:00
stom79 cd24c05399 Removes useless clickable 2017-11-04 07:48:36 +01:00
stom79 f87eede11a Some cleaning in code 2017-11-03 19:19:16 +01:00
stom79 9e703700a8 Improves profile page 2017-11-03 19:12:34 +01:00
stom79 0deffe02eb Fixes color issue with delete draft icons 2017-11-03 16:24:27 +01:00
stom79 d4e222cfcd Fixes issue with instance version 2017-11-03 15:20:50 +01:00
stom79 4c2c3880f3 Merge branch 'develop' into bug_fix 2017-11-03 15:18:33 +01:00
stom79 f5cc1b493a Fixes issue with translation 2017-11-03 15:18:25 +01:00
stom79 3ff8b50867 Merge branch 'bug_fix' into develop 2017-11-03 15:01:09 +01:00
stom79 a65e48f4dc Fixes issue with translation 2017-11-03 15:00:53 +01:00
stom79 3915efbd41 Merge branch 'ui_improvements' into develop 2017-11-03 13:55:46 +01:00
stom79 d76783d291 Custom emoji picker 2017-11-03 13:55:18 +01:00
stom79 fe29b83e2e Redo with control on context 2017-11-03 10:18:47 +01:00
stom79 ea10840893 Moves task in onAttach to avoid null context 2017-11-03 08:38:36 +01:00
stom79 eb15a19413 Fixes issue #16
When an account is from a different instance, a clickable warning message is displayed which opens the built-in browser.
2017-11-03 08:01:56 +01:00
stom79 5fd0ab6b45 Prepares release 1.5.6 2017-11-02 15:58:11 +01:00
stom79 3166350b97 Fixes some color issues 2017-11-02 15:55:14 +01:00
stom79 2bfb2935de Fixes spoilers for boosts 2017-11-02 15:35:23 +01:00
stom79 27cb5c565c Fixes an issue when appbar is not expanded 2017-11-02 15:22:47 +01:00
stom79 e3eff48e2e Removes tab indicators 2017-11-02 14:44:14 +01:00
stom79 d8eda5762d Another icon issue 2017-11-02 14:27:43 +01:00
stom79 74a7557a33 Removes useless elements 2017-11-02 14:16:48 +01:00
stom79 6cdcbda9a7 Fixes button color issue on some devices 2017-11-02 14:15:13 +01:00
stom79 dd4eb4a82d Fixes icon color issue on some devices 2017-11-02 14:06:59 +01:00
stom79 6f81606b20 Avoids to refresh some tabs when showing account 2017-11-02 08:24:29 +01:00
stom79 a541449a98 Removes useless listener 2017-11-02 08:22:04 +01:00
stom79 04a55579eb Found them! 2017-11-01 19:34:53 +01:00
stom79 1cbe5ce542 Tries to find them =) 2017-11-01 19:19:37 +01:00
stom79 69b8237853 Creates the table in db + stores/updates custom emojis when they are seen in a toot 2017-11-01 18:52:08 +01:00
stom79 bab4bfeffa Merge branch 'translation_in_edittext' into develop 2017-11-01 13:58:34 +01:00
stom79 8d2e4ced34 Changes delay between translations 2017-11-01 13:58:12 +01:00
stom79 575a0d79fc Adds a reference to Yandex Translate 2017-11-01 13:38:26 +01:00
stom79 49fb0eb630 Wait time for translations 2017-11-01 13:36:25 +01:00
stom79 9ffa5820b4 Updates the lib to fit my needs 2017-11-01 13:27:40 +01:00
stom79 0a1e908e4e Changes place in menu 2017-11-01 10:27:20 +01:00
stom79 14f30faa11 Fixes notifications issues (filter no longer shared between push & displayed) 2017-11-01 10:09:04 +01:00
stom79 7394b4e93b Merge branch 'bug_fix' into develop 2017-11-01 08:42:25 +01:00
stom79 c3f7324629 Fixes crashes with tablets when displaying profile page 2017-11-01 08:41:53 +01:00
stom79 18508ac1f8 Removes Google translate 2017-10-31 19:43:45 +01:00
stom79 f3063634c4 Avoids to open the dialog if no content 2017-10-31 19:09:47 +01:00
stom79 4889448fa1 Improves layout 2017-10-31 18:29:04 +01:00
stom79 309238fa2b Fixes an issue 2017-10-31 18:06:01 +01:00
stom79 7d8c299ab8 Translations in action 2017-10-31 15:57:19 +01:00
stom79 6c870b1a5a Adds the alertdialog to manage translations 2017-10-31 14:30:04 +01:00
stom79 fe0f282b18 Generic method for the implementation 2017-10-31 12:47:51 +01:00
stom79 1ced1f25d9 Adds blacklisted words (ie: starting with %) -> TODO: make this special char configurable 2017-10-31 11:43:49 +01:00
stom79 939c10f30a Removes mentions from translations 2017-10-31 11:37:47 +01:00
stom79 4d5d21df98 Removes drawer menu from conversation activity 2017-10-31 11:22:45 +01:00
stom79 91d30d6c71 Fixes background color issue for mentions 2017-10-30 18:57:59 +01:00
stom79 04906e830e fixes some margins 2017-10-30 18:09:44 +01:00
stom79 f4bc65dae1 Same action bar 2017-10-30 17:58:47 +01:00
stom79 75d49856d1 Fixes an issue with hidden content 2017-10-30 17:54:18 +01:00
stom79 6763d025f4 Improves retrieve replies number 2017-10-30 16:08:42 +01:00
stom79 705643dcce Removes lib cardview 2017-10-30 15:53:50 +01:00
stom79 6a184ef397 Fixes issue #11 2017-10-30 15:42:06 +01:00
stom79 43a5243e1d Decreases loader size 2017-10-30 14:02:47 +01:00
stom79 afe1a7c9c5 Preview replies improvement 2017-10-30 13:29:39 +01:00
stom79 92f6e577fb Fixes issue with an action bar 2017-10-30 13:26:22 +01:00
stom79 bccfb42ac8 Improves button colors with date & time pickers 2017-10-30 13:04:11 +01:00
stom79 3d9d69cd45 Improves notification tab 2017-10-30 10:50:53 +01:00
stom79 900cef8b7f Removes useless padding 2017-10-30 10:28:03 +01:00
stom79 b2dd831b78 Fixes issue #8 - Removes the splash screen 2017-10-30 10:00:14 +01:00
stom79 fc9b396183 Adds refresh icon in top bar for conversations 2017-10-30 08:14:38 +01:00
stom79 095916d3a5 Improves drafts (deletion) 2017-10-30 07:54:02 +01:00
stom79 48e20e4274 Fixes an issue when displaying scheduled toots 2017-10-30 06:49:24 +01:00
stom79 ae51800b68 Prepares release 1.5.5 2017-10-29 17:51:18 +01:00
stom79 49a1214ef5 Some improvements + updates change to tablets 2017-10-29 17:40:35 +01:00
stom79 5bb02a6d2e Improves retrieve accounts for a reply 2017-10-29 17:25:45 +01:00
stom79 1e4dead48d Improves upload 2017-10-29 17:10:09 +01:00
stom79 f44d50c1ed Improves upload 2017-10-29 16:53:32 +01:00
stom79 c14e2f9dd1 Color issue 2017-10-29 15:08:58 +01:00
stom79 ca5fa4a2a2 Fixes an issue pull to refresh 2017-10-29 10:55:20 +01:00
stom79 4289b82612 Fixes an issue with follow request 2017-10-29 10:20:08 +01:00
stom79 ad1147df68 Avoids refresh when not at the end 2017-10-29 09:53:27 +01:00
stom79 c49777a288 Removes useless margin 2017-10-29 09:48:44 +01:00
stom79 73471b6793 Good bye to last cardviews... 2017-10-29 09:39:29 +01:00
stom79 08d9c8014f Removes some cardViews 2017-10-29 09:30:08 +01:00
stom79 77992f93eb Fixes an issue with conversations & pull to refresh from the bottom of the screen 2017-10-29 08:13:21 +01:00
stom79 12207e105d Fixes an issue with conversations 2017-10-29 07:32:52 +01:00
stom79 c5b9074e33 Dedicates icons when writing toots 2017-10-29 07:15:13 +01:00
stom79 e04b997ffb Merge branch 'ui_improvements' into develop 2017-10-28 19:48:35 +02:00
stom79 6222265b9f Fixes color 2017-10-28 19:48:19 +02:00
stom79 7fd84b2c2c Merge branch 'ui_improvements' into develop 2017-10-28 19:41:19 +02:00
stom79 7f777b94e1 Bigger icon for pp 2017-10-28 19:40:55 +02:00
stom79 6fc46302e7 Material design for pinned icon 2017-10-28 19:22:02 +02:00
stom79 2d45f1fc06 Fixes an issue with boost color 2017-10-28 19:04:58 +02:00
stom79 a942b2f39e Adds actionbar in conversation activity 2017-10-28 18:58:34 +02:00
stom79 c29798935a Fixes an issue when hiding actionbar 2017-10-28 18:54:55 +02:00
stom79 2fafdaeab6 Merge branch 'ui_improvements' into develop 2017-10-28 18:17:09 +02:00
stom79 c062311b03 Changes icons with vectors - 4 2017-10-28 17:59:50 +02:00
stom79 52998d6689 Changes icons with vectors - 3 2017-10-28 17:15:06 +02:00
stom79 d4c7acb5e7 Changes icons with vectors - 2 2017-10-28 14:54:28 +02:00
stom79 b9d59a4b6c Changes icons with vectors 2017-10-28 14:32:18 +02:00
stom79 1e8c2ded46 Adds the possibility to block/mute from the account page. 2017-10-28 12:30:40 +02:00
stom79 0837f30b8b Removes some margins 2017-10-28 11:35:39 +02:00
stom79 3ffbff819e Merge branch 'ui_improvements' into develop 2017-10-28 11:25:57 +02:00
stom79 230598af35 Adds opacity for boosts/favs. 2017-10-28 11:25:33 +02:00
stom79 10bd9cc499 Some cleaning 2017-10-28 11:02:37 +02:00
stom79 b5e59398a2 Avoids bad icon colors 2017-10-28 10:47:04 +02:00
stom79 61ca865e18 Hides tool bar when scrolling on hashtag activity 2017-10-28 10:38:37 +02:00
stom79 d34a3c5dcd some cleaning 2017-10-28 10:30:30 +02:00
stom79 095cdc0c4c Merge branch 'improves_replies_async' into develop 2017-10-28 10:24:02 +02:00
stom79 424bb49932 Fixes an issue when no reply and number displayed 2017-10-28 10:23:24 +02:00
stom79 0dc29c7700 Avoids too much notifications 2017-10-28 10:17:08 +02:00
stom79 dd9784efa7 Avoid useless calls 2017-10-28 10:10:50 +02:00
Thomas 838d711d5a
Merge pull request #10 from PhotonQyv/AndroidStudio3_0-DeprecationFix
Android Studio 3.0 Deprecation Fix
2017-10-28 09:31:45 +02:00
stom79 bb4963b617 Fixes issue #6 2017-10-28 09:23:52 +02:00
PhotonQyv 911519535f Fixed deprecation warnings in build.gradle when using AndroidStudio 3.0. 2017-10-27 19:00:04 +01:00
stom79 02eb980f0d Fixes issue #7 2017-10-27 18:48:39 +02:00
stom79 f5480f1180 Fixes spaces with cardviews 2017-10-27 18:32:23 +02:00
stom79 66d09493ca Improves bubble counters 2017-10-27 18:14:02 +02:00
stom79 02675ecdb7 Removes bottom bar 2017-10-27 18:05:57 +02:00
stom79 b800dab0d3 Merge branch 'develop' into ui_improvements 2017-10-27 16:50:14 +02:00
stom79 f9e3584b97 Fixes a bug with remote follows 2017-10-27 16:35:01 +02:00
stom79 89562d900d Adds description to media 2017-10-27 16:00:54 +02:00
stom79 fb9e1e2521 Cleans code in Webview 2017-10-27 15:55:10 +02:00
stom79 400bf263ec Cleans code in activities 2017-10-27 15:34:53 +02:00
stom79 82a7b1a0c1 adds weak reference to context 2017-10-27 15:09:26 +02:00
stom79 8d7f627fb5 Some cleaning 2017-10-27 14:19:13 +02:00
stom79 d0538add5c Fixes some codes 2017-10-27 14:08:46 +02:00
stom79 aeafeb9079 Removes setOnTouchListener 2017-10-27 14:07:13 +02:00
stom79 f251892960 Adds description to media 2017-10-27 13:59:14 +02:00
stom79 1f90b26a34 Adds description to media 2017-10-27 13:24:01 +02:00
stom79 fa1d976678 Fixes input text 2017-10-27 11:45:37 +02:00
stom79 56af77cf2c Fixes API PUT call 2017-10-27 11:36:52 +02:00
stom79 7e6ad26348 updates description 2017-10-27 11:15:47 +02:00
stom79 42b8b74470 Prepares asynctask 2017-10-27 11:05:16 +02:00
stom79 e2347ac1d5 Update API to change media description 2017-10-27 10:54:28 +02:00
stom79 d320d54416 Updates API to read descriptions 2017-10-27 10:51:00 +02:00
stom79 ddc1647313 Prepares AlertDialog 2017-10-27 10:47:29 +02:00
stom79 c6598d619d Some translations 2017-10-27 10:44:50 +02:00
stom79 d5ddc319ee Store instance version + changes into long click 2017-10-27 10:38:22 +02:00
stom79 488fe43b0e Merge branch 'develop' into bug_fix 2017-10-26 18:09:38 +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 a34a00b07b Merge branch 'develop' into ui_improvements 2017-10-26 07:19:25 +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 0429d09ef5 Adds bottom action bar 2017-10-24 17:56:42 +02:00
stom79 f67aae65bf Merge branch 'develop' into ui_improvements 2017-10-24 17:22:15 +02:00
stom79 7112b45dfc Removes improvements which are not related to this branch 2017-10-24 16:02:21 +02:00
stom79 4d082107f3 Merge branch 'recyclerview' into ui_improvements 2017-10-24 14:39:31 +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 eed7de656e Changes boost color 2017-10-24 14:11:01 +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
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