Commit graph

982 commits

Author SHA1 Message Date
Conny Duck
d5e535fe1c update German translation 2018-04-14 14:33:45 +02:00
Conny Duck
28a85639ed upgrade minSdkVersion to 19 2018-04-14 13:56:48 +02:00
Marcin Mikołajczak
8b93b4379e i18n: Update Polish translation (#572)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-04-14 08:57:58 +02:00
Konrad Pozniak
27eefbf65a
ComposeActivity improvements (#548)
* do not add media urls to status text

* add scrolling to content

* add arrow icon and animation to replying-to toggle

* remove unnecessary compose_button_colors.xml

* improve toot button

* improve bottom bar, add bottom sheet for compose options, dedicated cw button

* fix crash on Android < API 21

* move media picking from dialog to bottom sheet

* add small style tootbutton

* fix colors/button background for light theme

* add icons to media chose bottom sheet

* improve hide media button, delete unused styles

* fix crash on dev build when taking photo

* consolidate drawables

* consolidate strings and ids, add tooltips to buttons

* allow media only toots

* change error message to show max size of upload correctly

* fix button color

* add emoji

* code cleanup

* Merge branch 'master' into compose_activity_refactoring

# Conflicts:
#	app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java

* fix hidden snackbar

* improve hint text color

* add SendTootService

* fix timeline refreshing

* toot saving and error handling for sendtootservice

* restructure some code

* convert EditTextTyped to Kotlin

* fixed pick media button disabled color

* force sensitive media when content warning is shown

* add db cache for emojis & fix tests

* reorder buttons to match mastodon web

* add possibility to cancel sending of toot

* correctly delete sent toots

* refresh SavedTootActivity after toot was sent

* remove unused resources

* correct params for toot saving in SendTootService

* consolidate strings

* bugfix

* remove unused resources

* fix notifications on old android for SendTootService

* fix crash
2018-04-13 22:37:21 +02:00
Conny Duck
8a23f034f0 prevent soft keyboard from opening automatically in EditProfileActivity 2018-04-11 19:15:22 +02:00
Conny Duck
066c46b2e4 fix tamil string 2018-04-11 19:07:31 +02:00
Manimaran.K
c5f6c070dc Translation for Tamil language (#569) 2018-04-10 22:47:06 +02:00
Conny Duck
1232bfe18d update support lib 2018-04-09 16:44:58 +02:00
Conny Duck
54d45585e6 improve spoiler warning button & detailed status text size 2018-04-09 16:44:57 +02:00
Christian Paul
289954e7d4 Make German translation more consistent (#567)
* German translation: der Toot becomes der Beitrag

* German translation: Toot! becomes Teilen!

* German translation: berichtet becomes gemeldet

* German translation: NSFW-Inhalte become Heikle Inhalte

* German translation: Followers become Folgende

* German translation: Followanfrage becomes Folgeanfrage
2018-04-09 12:40:12 +02:00
Conny Duck
e8ec2bc274 fixed avatar_default not displaying correctly on the light theme 2018-04-07 16:09:07 +02:00
Conny Duck
6120072730 add disk cache for images 2018-04-06 22:04:14 +02:00
Gareth Murphy
6d6c9575c4 Add regular expression feed filtering (#557)
* Initial implementation of regex feed filtering

Mimics Mastodon web's functionality, but in a simpler form; a single
regular expression is shared across the home, local and federated feeds.

Strings are currently only provided in English and will need to be
translated.

* Fix buggy behaviour on filter regex update

* Validate regex filter input

Fixes buggy behaviour on inputting a regular expression feed filter by
testing the expression continuously as the user types, displaying an
error and disabling the 'OK' button of the dialog at any time it's not a
valid regular expression. Disables spelling suggestions in the input to
make the experience less frustrating and error prone.

Also fixes some generally buggy behaviour upon preference change,
specifically in cases where no Matcher was set prior to a new pattern
being set, which would cause the app to crash.

* Apply regex filter to spoiler text

* Get rid of empty catch block in regex filter code

* Make regex filter error string translatable
2018-04-05 22:58:44 +02:00
Conny Duck
21344866d3 fix note not displaying correctly in EditProfileActivity 2018-04-05 21:46:34 +02:00
Konrad Pozniak
8bca651f53 make text in detailed toots selectable 2018-04-01 15:45:08 +02:00
Konrad Pozniak
3708421362 add new avatar placeholder 2018-03-30 19:46:36 +02:00
Konrad Pozniak
2851e4d38b make avatar rounding independent of image size 2018-03-30 19:08:24 +02:00
Konrad Pozniak
1af0b6fd48 fixes a bug where the ProgressBar in NotificationsFragment would not show up 2018-03-30 09:56:09 +02:00
Conny Duck
3628b8431d add possibility to un/lock accounts 2018-03-27 20:46:53 +02:00
Conny Duck
361352c2e1 upgrade avatar size for Mastodon 2.3 2018-03-27 20:13:24 +02:00
Conny Duck
92d688523b upgrade gradle & dependencies 2018-03-27 20:12:43 +02:00
Ivan Kupalov
a5cffe0fea Add Dagger (#554)
* Add Dagger DI

* Preemptively fix tests

* Add missing licenses

* DI fixes

* ci fixes
2018-03-27 19:47:00 +02:00
Conny Duck
720f7c6a0c fix issue where scrolling wont stop after jumping to top 2018-03-17 19:46:01 +01:00
Conny Duck
98b652b7a1 fix crash in StatusBaseViewHolder 2018-03-15 22:08:12 +01:00
Levi Bard
043ac58254 improve content warning button
* Use the entire content warning text + button as the hitbox for the "Show more/less" toggle

* Move the content warning toggle button to its own line and give it a little more space

* Move content warning elements into parent layout, remove now-superfluous FlowLayout

* Use marginTop/Bottom instead of Vertical, which is only in sdk 26+

* Update minimum width for content warning toggle button
2018-03-15 19:15:12 +01:00
aka-rin
c50d0319f3 Fix zh-xx translations (#551)
* Update strings.xml

* Update strings.xml

* Fix zh-cn, zh-sg, zh-hk translations.

* Update strings.xml

* Fix zh-mo, zh-tw translations.
2018-03-12 21:31:33 +01:00
INAGAKI Hiroshi
82021939b4 l10n: update Japanese translation (#549)
Update japanese translations for some new functions.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-03-11 09:42:21 +01:00
Ivan Kupalov
28e46c9cc0 Add ComposeActivity tests. Add ServiceLocator (#542) 2018-03-09 22:02:32 +01:00
Conny Duck
4e617dccc7 change the color of all SwipeRefreshLayouts to match the Tusky theme 2018-03-09 20:39:08 +01:00
Conny Duck
9e64bd1307 fix crash in LoginActivity 2018-03-09 19:54:24 +01:00
Conny Duck
44b79e31d4 fail silently when status card cannot be loaded for compatibility with Pleroma 2018-03-09 18:56:05 +01:00
Conny Duck
d4d764ab2d fix production build after upgrading okhttp 2018-03-08 23:04:04 +01:00
Ivan Kupalov
e82c9dcd2a Compose close dialog + focus fix (#539) 2018-03-05 22:43:13 +01:00
Conny Duck
49e61bab83 fix strings 2018-03-05 15:02:26 +01:00
Conny Duck
37c5fe150e remove unused view from activities 2018-03-05 14:53:33 +01:00
Conny Duck
6e3faa8957 update dependencies, use new scheduleAsync of job library 2018-03-03 13:54:58 +01:00
Konrad Pozniak
71954a277e
convert entity classes to Kotlin data classes (#526)
* convert entity classes to Kotlin data classes

* more data classes, code style
2018-03-03 13:24:03 +01:00
Conny Duck
bbbe71174a Release 34 2018-03-03 12:30:20 +01:00
ButterflyOfFire
2f7014e05a Improving arabic translation (#523)
Improving arabic translation
2018-03-03 10:33:26 +01:00
Conny Duck
59d254455d prevent saving of incomplete account information to database 2018-03-02 21:25:58 +01:00
Conny Duck
fec1dbc470 fix link header handling in AccountActivityFragment
- fixes douplication of users after undoing unblocks/unmutes
- removes unnecessary loading when scrolled to end of list
2018-03-02 20:56:09 +01:00
nailyk
a81f691689 Translates: FR: Do not use plural for follows_you (#537) 2018-03-02 20:53:01 +01:00
Conny Duck
1a34934cdf fix build 2018-03-01 22:18:50 +01:00
Conny Duck
ed60cc3a78 gracefully handle null statuses in notifications 2018-03-01 21:10:10 +01:00
Conny Duck
550235d40b only alert once on multiple notifications, fix order of notifications 2018-03-01 19:05:47 +01:00
Conny Duck
c2c607270a improve proguard configuration 2018-03-01 19:01:44 +01:00
Conny Duck
254be4b21c make it possible to switch accounts when active account fails to load 2018-02-27 19:38:32 +01:00
Conny Duck
d5ed2f9a40 fix a crash in MediaUtils 2018-02-25 15:46:32 +01:00
Conny Duck
49a74f57a5 fix a crash in ComposeActivity when trying to share images while logged out 2018-02-25 15:41:45 +01:00
Conny Duck
1f9eb41a9a update Tusky urls 2018-02-25 14:51:06 +01:00
nailyk
da54ab5890 Update FR translations (#533)
* Translation: FR: Correct media upload sentences

Signed-off-by: nailyk-fr <jenkins@nailyk.fr>

* Translation: FR: Make follow request sentence innumerable

Signed-off-by: nailyk-fr <jenkins@nailyk.fr>
2018-02-21 22:45:22 +01:00
Marcin Mikołajczak
eb15631c10 Update Polish translation (#532) 2018-02-19 17:43:25 +01:00
Conny Duck
14439c016c increase text size of detailed toot 2018-02-17 13:54:27 +01:00
Conny Duck
c766a203bf fix bug in rtl layout, remove unneeded xml attributes & dimen resources 2018-02-16 22:14:25 +01:00
Conny Duck
2176ac684f remove unnecessary build flavors 2018-02-15 19:59:25 +01:00
Conny Duck
1e7725a4a0 fix rare crash when resizing image in EditProfileActivity & prevent upscaling of image 2018-02-15 19:29:03 +01:00
aka-rin
5ebb057828 Add Chinese Translations (#528)
* Add zh-CN translations (first version).

满眼生机转化钧, 天工人巧日争新。

* Add zh-TW translations (converted by OpenCC).

幹,我到底寫了三小……

* Add zh-HK translations (converted by OpenCC).

呢個翻譯真喺 On9!

* Fix some translations in zh-CN.

点一下,玩一年,装备不花一分钱~

* Fix some translations in zh-TW, too.

油條要超越板凳當凶器之首了嗎?

* Fix some translations in zh-HK, too...

大家小心流感

* Minor fixes in zh-CN translations.

翻譯比想象中要難啊……

* Add zh-SG translations (the same as zh-CN).

* Update zh-TW translations.

* Update zh-HK translations, too.

Still needs to be improved...

* Add zh-MO translations (the same as zh-HK).

Now it's all set!

* Fix a character in zh-CN translations...

Don't mind, don't mind...

* Fix the same character in zh-SG translations...

It's all my fault. 😂
2018-02-14 22:29:38 +01:00
Conny Duck
6fca92b056 Release 33 2018-02-12 22:49:20 +01:00
Konrad Pozniak
17a122b293
Rewrite EditProfileActivity in Kotlin (#525)
* rewrite EditProfileActivity in Kotlin

* fix bug in MainActivity where profiles would duplicate

* fix code style
2018-02-12 22:04:18 +01:00
Konrad Pozniak
0b59b8d0ac
notification improvements (#522)
* correctly filter notifications on Api >= 26, other fixes and refactoring

* use correct areNotificationsEnabled method in MainActivity

* change notification led color
2018-02-12 22:03:08 +01:00
nailyk
c502e001d7 Translates: FR: Improve translations (#524)
* Add new translate related to multi account,
 * Adjust some translates notification related.

Signed-off-by: nailyk-fr <nailyk_git@nailyk.fr>
2018-02-10 21:13:54 +01:00
Conny Duck
e6d1e3278d fix wrong navbar color in ViewMediaActivity & ViewVideoActivity on Android 8.1+ 2018-02-09 23:25:48 +01:00
Conny Duck
1de45e7dd7 hide follow button on own profile correctly, code optimizations 2018-02-09 22:49:20 +01:00
Conny Duck
1a3907936d fix crash in ComposeActivity when account has no profile picture set 2018-02-08 19:17:08 +01:00
Conny Duck
5dbe3c927e fix timeline filtering not working after app restart 2018-02-08 19:12:02 +01:00
Conny Duck
274343a064 set the correct default theme in preferences 2018-02-05 11:29:08 +01:00
Conny Duck
6dd8c7a3ec fixes a crash when trying to share via Tusky while not logged in 2018-02-05 11:27:32 +01:00
Evgeny Petrov
ba46e90140 Russian translation for Tusky 1.5 (#513)
* Russian translation for Tusky 1.5
* Added multiaccount strings
* Added licence strings
* Added media caption strings
* Added lists strings
* Added HTTP proxy strings
* Added theme strings
* Some small fixes

* Tusky-RU: A small fix for "visually_impaired" strings

* Tusky-RU: Some fixes for "Proxy" strings.
"Blind" translating is bad :(
2018-02-04 15:16:01 +01:00
Conny Duck
5b8cbeb7e9 Release 32 2018-02-04 10:31:50 +01:00
Conny Duck
b5baaa89cf add database migration 2018-02-04 10:12:01 +01:00
Conny Duck
f76d90affd set proxy setting to default off 2018-02-04 09:32:05 +01:00
Conny Duck
305d67fd2c improve german translation 2018-02-04 09:30:29 +01:00
Conny Duck
9b6ca7ff42 remove unused resources 2018-02-03 23:43:06 +01:00
Conny Duck
f08efec0b6 simplify theme handling 2018-02-03 23:26:53 +01:00
Konrad Pozniak
92ae463b38
Multi account feature (#490)
* basic implementation

* improve LoginActivity

* darken drawer background image

* add current avatar in ComposeActivity

* add account name to logout dialog

* multi account support for notifications

* multi account support for notifications

* bugfixes & cleanup

* fix bug where somethings notifications would open with the wrong user

* correctly set active account in SFragment

* small improvements
2018-02-03 22:45:14 +01:00
Conny Duck
c9004f1d54 adjust follow button font size 2018-02-03 13:34:40 +01:00
Conny Duck
3524a67a7f simplify list_item layout 2018-02-03 13:24:12 +01:00
Conny Duck
1bf977b80a update dependencies 2018-02-02 20:49:10 +01:00
Conny Duck
adc91235ee reorganize manifest permissions 2018-01-31 22:24:08 +01:00
Conny Duck
3c795c6eef upgrade to minSdkVersion 18, fix some lint warnings 2018-01-31 21:57:50 +01:00
nailyk
2eaf727a1d Translate: Polish: Correct typo (#511)
* Add missing '!'. Should unbreak the build.
2018-01-30 18:24:08 +01:00
Conny Duck
6305f19f0c fix bug where sometimes a mention would be underlined 2018-01-29 22:11:32 +01:00
Marcin Mikołajczak
f18f759c10 Update Polish translation (#510)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-27 22:25:28 +01:00
remi6397
11105f4aac Theming improvements (#502)
* Split theme definitions into day and night

* Add support for Night Mode in code

* Add theme chooser in preferences

* Fix translations

* Adjust IDs

* Adjust preferences for custom themes

* UI tweaks for custom theme support

* Added code for custom theme support 🍅

* Fixed resource display in Kotlin 🍅

* Restored styles

* Updated strings

* Fixed getIdentifier() to fit into setTheme()

* Removed redundant resources

* Reset default theme to "Dusky"

* Fixed night mode handler to maintain compatibility

* Refactor functions to use helper methods

* Added license block

* Added preview to theme selector

* Added color identifier getter helper method

* Fixed reference in AccountMediaFragment

* Cleanup

* Fixed navbar foreground not changing color

* Fix fallback theme switch(){}

* Enable location-based daylight trigger

* Cleanup

* Modified theming strategy to reduce clutter in preferences

* Updated translations for latest version

* Removed "Default" theme flavor from settings

* Updated Polish translations 🇵🇱

* Modified TwilightManager handling code to support Android M's UiModeManager features and moved it to its own function

* Updated Polish translations 🇵🇱

* Cleanup; Fixed hardcoded string

* Added missing escape in string

* Removed permission request dialog.

As we now use native UiModeManager APIs that don't need special permission for Android 6.0 and above, we no longer need to bother user with Android M+ specific location permission request dialog.

* Increased readability of ThemeUtil class

* Refactored ThemeUtils.setAppNightMode method

* Cleanup
2018-01-20 13:39:01 +01:00
Conny Duck
8fa1320afe prevent crash in NotificationsAdapter when avatar url is not set 2018-01-15 17:06:21 +01:00
Ivan Kupalov
0426e8725a Set caption for media (#500) 2018-01-08 23:16:21 +01:00
Ivan Kupalov
6152043df3 Add basic lists support (#501) 2018-01-06 19:01:37 +01:00
ButterflyOfFire
dd9bba94bb Update Arabic translation #499) 2018-01-04 16:46:56 +03:00
Sergio López
7c83e0f87d implement support for HTTP proxy (#489)
This change allows the user to manually enter an unauthenticated proxy
configuration to be used for all API connections. This is mainly
intended for using Tusky with Tor (via Orbot or a local proxy).
2017-12-26 21:45:08 +01:00
Conny Duck
73342d38cf update arabic translations 2017-12-16 11:06:26 +01:00
Conny Duck
2e4fef69a1 add navigation bar color for API >= 27 2017-12-13 19:35:12 +01:00
Conny Duck
3bd855d4c4 set tab indicator height to 3dp 2017-12-09 21:34:04 +01:00
Conny Duck
2899114f66 add new debug build so two tusky versions can be run on the same device 2017-12-08 12:15:46 +01:00
Conny Duck
2b477f4eea new icon & improved functionality for quick settings tile 2017-12-07 20:21:02 +01:00
Joan Montané
9602888ad3 Update Catalan strings (#480) 2017-12-05 21:59:58 +01:00
Conny Duck
fbf64fa1e9 fix NPE in MediaUtils.getMediaSize 2017-12-05 21:48:17 +01:00
Conny Duck
e5516749ed stop cursor from jumping when upload finishes while composing toot 2017-12-05 20:56:42 +01:00
Conny Duck
13ed5da741 fix error in german strings 2017-12-05 20:36:08 +01:00
Koyu Berteon
c2bf0ffbda Updated German translation (#478)
* Updated German translation
2017-12-04 10:51:22 +01:00
Conny Duck
91c73a0b74 fix crash in SavedTootActivity when deleting drafts rapidly 2017-12-03 21:56:47 +01:00
Conny Duck
416ff38e12 Release 31 2017-12-02 14:59:24 +01:00
Conny Duck
ab4525ac38 fix ConcurrentModificationException when notification arrives 2017-12-02 14:34:47 +01:00
Evgeny Petrov
c7ecf352cf Russian language updated (#475)
• Added new strings for status text sizes.
• Added new strings for status privacy values.
• Added new string about hidden media.
2017-12-02 13:14:57 +01:00
Konrad Pozniak
4743c85d82 fix crash on Android 4 2017-12-02 12:22:52 +01:00
Conny Duck
03f866f8c2 fix toot button and characters left text size 2017-12-01 22:44:18 +01:00
Conny Duck
b2f9f87fc8 make medium the default font size on startup 2017-12-01 22:43:48 +01:00
Conny Duck
7abd8c8d70 fix some lint warnings 2017-12-01 22:31:34 +01:00
Conny Duck
c20ee1d593 make content warning button smaller 2017-12-01 22:15:26 +01:00
Conny Duck
7cc1ed9844 fix problem with spark buttons behaving weirdly 2017-12-01 22:13:47 +01:00
Conny Duck
bf4d0bb722 change handling of font size, introduce font size setting 2017-12-01 21:52:10 +01:00
Conny Duck
8f8d49f421 update dependencies 2017-11-30 21:05:56 +01:00
Conny Duck
b33740d74e fix IndexOutOfBoundsException in ViewThreadFragment 2017-11-30 21:04:47 +01:00
Conny Duck
08d01e6046 improve german translation, strings 2017-11-30 20:58:56 +01:00
Konrad Pozniak
41233a837b
UI Improvements (#445)
UI Improvements
2017-11-30 20:12:09 +01:00
nailyk
0077388c65 Correct array translations (#470) 2017-11-29 07:26:17 +01:00
Conny Duck
1c2a647569 improve default post privacy to work like web mastodon, add default post privacy option 2017-11-27 20:11:31 +01:00
Conny Duck
1351c8b885 move string arrays into string.xml files so they do not get forgotten by translators 2017-11-27 19:47:31 +01:00
Joan Montané
ce90862041 Add Catalan translation (#464)
* Create strings.xml

* Create array.xml
2017-11-22 22:00:55 +01:00
Ivan Kupalov
2575b16dad Save reply info in draft, refactor (#449)
* Save reply info in draft, refactor

* Handle replying to deleted status
2017-11-16 19:18:11 +01:00
Evgeny Petrov
a859ef0432 Tweaks to Russian translation (#454)
• Added missing translations to timestamps (1s, 2m, 3h etc);
• Renamed "bio" section (now it's translated as "about me" since "biography" means something large and detailed);
• Renamed "thread" sections (now it uses more native word "Discussion", rather than transliterated "Thread" word);
• Changed notification string about new notifications. This change may look a bit ugly, but it solves a problem with declension of numeric values.
2017-11-16 01:01:07 +03:00
Conny Duck
3055e6176e upgrade libraries, fix DrawerImagerLoader deprecated warning 2017-11-15 21:50:15 +01:00
Conny Duck
c664cb000f add Java 8 support 2017-11-15 21:28:49 +01:00
Konrad Pozniak
3204223af7
fix clear notifications crash (#458) 2017-11-15 21:18:35 +01:00
Konrad Pozniak
ed22d65c68 simplify MainActivity back press handling (#456) 2017-11-13 22:43:16 +03:00
Ivan Kupalov
ddc4954f8a Cancel notifications on opening notifications tab (#450) 2017-11-13 19:05:23 +01:00
ButterflyOfFire
b13a27a777
Update strings.xml 2017-11-11 13:55:26 +01:00
Conny Duck
8bdc200311 Release 29 v1.3.1 2017-11-10 09:47:04 +01:00
Conny Duck
8e59d2d524 fix a crash on application start when no domain was saved in "domain" shared pref 2017-11-10 09:26:25 +01:00
Conny Duck
dec7da9655 upgrade to API Level 27, fix nullability problems with new support library 2017-11-09 14:35:52 +01:00
Conny Duck
0cad3831c6 Release 28 v1.3.0 2017-11-09 10:42:26 +01:00
Conny Duck
97546e79d9 fix a bug where a thread was not shown completely 2017-11-09 10:08:52 +01:00
Conny Duck
f35ff105e9 fix crash when AccountMediaFragment was recreated 2017-11-07 23:33:17 +01:00
Conny Duck
59bcb6f0bf fix bug where account timeline showed only media toots 2017-11-07 23:06:06 +01:00
Ivan Kupalov
2816d9f929
Merge pull request #439 from charlag/status-notifications-behavior
Status notifications behavior (closes #322, partly #292)
2017-11-07 23:12:37 +02:00
charlag
76c7a7e462 Display CWs in notifications correctly 2017-11-08 00:09:44 +03:00
Anna e só
53de82bced pt-rBR translation updated (#438) 2017-11-07 21:37:11 +01:00
Ivan Kupalov
b11e88cf46
Merge pull request #437 from MasterGroosha/patch-1
Russian language updated
2017-11-07 21:41:26 +02:00
Evgeny Petrov
424f38a5fa Russian language: translated numeric values for notification check timeout, some other small improvements. 2017-11-07 22:39:35 +03:00
charlag
92fb55cb3a Open status from notifications 2017-11-07 22:36:19 +03:00
Conny Duck
305d28a5c1 fix some lint warnings, remove unused code 2017-11-07 15:31:44 +01:00
Conny Duck
a2c361914b fix a crash in ComposeActivity where a dialog was canceled that was already removed from the window 2017-11-07 15:01:20 +01:00
Conny Duck
26834b36ed update german translation 2017-11-07 14:52:43 +01:00
Evgeny Petrov
d0bd68f3e2
Russian language updated 2017-11-07 15:56:04 +03:00
Conny Duck
5fff9e2bdc increase okhttp timeouts so posting large images works 2017-11-07 13:27:35 +01:00
Conny Duck
3053e097a7 upgrade room library to 1 (fix merge problem) 2017-11-07 13:12:57 +01:00
Konrad Pozniak
21de60f739
Merge branch 'master' into timeline-improvement 2017-11-07 13:03:49 +01:00
Conny Duck
52dd9559d6 fix placeholder not resetting itself after a load failed 2017-11-07 12:59:46 +01:00
charlag
74d6736afc Make status placeholder abstraction cleaner 2017-11-07 12:44:19 +01:00
charlag
0dede1ba7d Make more clear representation of placeholder in notifications 2017-11-07 12:44:19 +01:00
Ivan Kupalov
dc1a60cc12 Implement media tab (#430) 2017-11-05 22:32:36 +01:00