Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity
13,322 Commits 26 Branches 66 Tags 556 MiB
Commit Graph

2634 Commits

Author SHA1 Message Date
tom79 0b373c53f5 Fix channel issue for playlist 2019-05-28 07:46:07 +02:00
tom79 ed05ef141e Improve playlists 2019-05-27 19:42:41 +02:00
tom79 6793bce724 Allow to add/remove videos in playlist 2019-05-27 19:22:54 +02:00
tom79 0847a67063 Manage playlists 2019-05-26 19:41:04 +02:00
tom79 9487dc4182 Change some layouts 2019-05-26 18:05:27 +02:00
tom79 f76750420d Add layout for playlists 2019-05-26 17:56:02 +02:00
tom79 00c8c4fa88 Start playlist support 2019-05-26 15:56:02 +02:00
tom79 a6586e38c8 Add history for Peertube 2019-05-26 12:04:00 +02:00
tom79 8b055d38de Fix bookmark issue 2019-05-25 19:12:04 +02:00
tom79 7d14a0ad85 Allow to disable bookmark 2019-05-25 18:58:31 +02:00
tom79 736d9d3a43 Refresh token for Peertube 2019-05-25 16:00:35 +02:00
tom79 8c1536b660 Fix a crash when restoring Pleroma accounts 2019-05-25 15:44:55 +02:00
tom79 67de52883b Merge branch 'k-a-s-u-n/mastalab-working' into develop 
# Conflicts:
#	app/src/main/res/values/strings.xml
 2019-05-25 15:36:36 +02:00
tom79 9bd22a4a0d Fix decoration issue with compact mode with conversations 2019-05-25 15:34:19 +02:00
tom79 cf38922b4e Apply for gnu 2019-05-25 14:27:21 +02:00
tom79 d7a0b37e5e Switch filters 2019-05-25 14:20:17 +02:00
tom79 e1ae2e9c9d Add filters 2019-05-25 12:37:50 +02:00
tom79 04d1ffa2c1 Prepares db and some layout 2019-05-25 11:29:58 +02:00
tom79 4cc67f3f60 Fix issues and upgrade libs 2019-05-25 09:47:14 +02:00
Kasun 0d4989ecbf add option to toggle bot icon 2019-05-24 22:47:44 +05:30
tom79 48ff9a99a2 Fix media attachment with cross-account posts 2019-05-24 18:18:28 +02:00
tom79 ae9a44b15f Merge branch 'develop' of https://gitlab.com/tom79/mastalab into develop 2019-05-24 17:26:55 +02:00
Kasun be2ba9a7cd hide video controller when hiding top bar 2019-05-24 20:30:46 +05:30
tom79 58eb31f6b2 Merge branch 'develop' of https://gitlab.com/tom79/mastalab into develop 2019-05-24 15:59:59 +02:00
tom79 6a908ea5fd Merge branch 'guess_protocol' into develop 2019-05-24 15:59:48 +02:00
tom79 764078d446 Fix some crashes 2019-05-24 15:37:56 +02:00
tom79 bb158d821d Improve proxy 2019-05-24 15:13:28 +02:00
Kasun 6c24ad5369 make booster name clickable 2019-05-24 18:40:54 +05:30
Kasun 142dc2c780 use system time format when scheduling 2019-05-24 18:40:43 +05:30
tom79 67ab25a60a Some changes 2019-05-23 21:36:02 +02:00
tom79 29f10a594e Merge branch 'ssl_tor_onion' into develop 2019-05-23 19:05:32 +02:00
tom79 78762bef1b Fix potential crashes 2019-05-23 18:51:40 +02:00
tom79 48979dd110 Fix issue #934 2019-05-23 18:51:17 +02:00
tom79 52559ca7b6 Disable SSL verification for onion 2019-05-23 07:46:34 +02:00
tom79 38b0a806e3 Manage with the instance for ignoring certificates 2019-05-22 19:13:21 +02:00
tom79 ccebf75327 Add factory accepting all certificates, will be used only with *.onion URL 2019-05-22 19:03:45 +02:00
tom79 0344a2e88f Fix issue #931 2019-05-22 18:08:43 +02:00
tom79 d625837222 Allow to customize split size for messages 2019-05-22 17:33:52 +02:00
tom79 d56ad78ff4 Automatically clean cached statuses having more then 10 days 2019-05-21 18:21:58 +02:00
tom79 0f24de142f Prepares new release 2019-05-20 17:56:59 +02:00
tom79 a3fd7828f5 Merge branch 'develop' of https://gitlab.com/tom79/mastalab into develop 2019-05-20 17:49:08 +02:00
tom79 aadcb5a63b Remove donation links for Google Release 2019-05-20 17:48:16 +02:00
Kasun 1d4190fb42 fix quick undo issue 2019-05-20 15:50:22 +05:30
tom79 23a184e6c7 Fix potential crashes due to cash clean 2019-05-19 18:52:36 +02:00
tom79 1de938fc32 Avoid to display immediately the button when setting on in settings 2019-05-19 14:47:10 +02:00
tom79 9d7d1841b2 Quick access to pinned TL 2019-05-19 14:33:24 +02:00
tom79 00ca2c4061 Avoid duplicate toots from cache. 2019-05-19 13:16:21 +02:00
tom79 ec7b074574 Fullscreen for media 2019-05-19 11:44:07 +02:00
tom79 bfd4eaacec Remove divider 2019-05-18 17:09:17 +02:00
tom79 d5050a0ba5 test 2019-05-18 16:47:49 +02:00
tom79 61dfdc9bd6 Merge branch 'bug_fixes' into develop 
# Conflicts:
#	app/src/main/res/layout/drawer_status.xml
 2019-05-18 15:01:16 +02:00
tom79 fd922e7034 Fix an issue with notifications 2019-05-18 14:58:54 +02:00
tom79 0385a7131e Fix an issue with notifications 2019-05-18 14:52:12 +02:00
Thomas ea5201ce7c Merge branch 'working' into 'develop' 
some changes

Closes #466

See merge request tom79/mastalab!2421
 2019-05-18 12:35:35 +00:00
Kasun 12b4477acb show account address when muting from a status 2019-05-18 17:43:55 +05:30
tom79 08eda577ef Fix divider issue 2019-05-18 12:44:44 +02:00
tom79 8a4f7f65a2 Update cache with actions 2019-05-18 12:10:08 +02:00
tom79 486f5af333 Change package name + app id 2019-05-18 11:10:30 +02:00
tom79 2332497c79 Remove from cache 2019-05-16 19:29:07 +02:00
tom79 f95a18c647 Fix a crash 2019-05-16 19:14:53 +02:00
tom79 e65c541906 Fix a crash 2019-05-14 18:26:49 +02:00
tom79 7114839418 Fix a crash 2019-05-13 19:38:48 +02:00
tom79 ee2b397a8e Forward tags in replies 2019-05-13 18:15:45 +02:00
tom79 61c492fd0d Fix bugs 2019-05-13 17:51:43 +02:00
tom79 e38e198888 Merge branch 'develop' of https://gitlab.com/tom79/mastalab into develop 2019-05-13 07:22:36 +02:00
tom79 b246dbf738 Fix potential crashes 2019-05-13 07:21:09 +02:00
Kasun 7ac5d8c1f6 layout changes in side butons of a toot 2019-05-13 00:09:46 +05:30
tom79 0e830b99f4 Add a bot icon 2019-05-12 18:06:33 +02:00
tom79 4514592eb2 #915 comment - Click on the indicator for forcing a refresh. 2019-05-12 17:35:14 +02:00
tom79 ddea5e1653 #915 comment - Change layout for statuses 2019-05-12 14:48:23 +02:00
tom79 a894a75a82 #915 comment - Add indicators in toots 2019-05-12 11:39:25 +02:00
tom79 452c7ba2b0 #915 comment - fetch cache 2019-05-12 09:53:10 +02:00
tom79 ed2acd165d #915 comment - filter with id for avoiding visibility issues with accounts 2019-05-12 09:52:56 +02:00
tom79 4381d1d7f6 #915 comment - add a param in status entity for cache 2019-05-12 09:42:01 +02:00
tom79 6350841ccb #915 comment - cache status in db 2019-05-12 09:36:28 +02:00
tom79 feff53ccb0 #915 comment - Disable home streaming 2019-05-12 09:21:42 +02:00
tom79 a350932365 #915 comment - Prepare db for cache 2019-05-12 09:17:22 +02:00
Thomas df34c65ff9 Merge branch 'fix_tracking_domains' into 'develop' 
fix 'blocked tracking domains'

See merge request tom79/mastalab!2332
 2019-05-12 06:29:24 +00:00
NickFreeman 4233e7ddfe
fix 'blocked tracking domains' 
replaced fetch2 with AsyncTask
 2019-05-11 21:43:31 +02:00
tom79 3629f4a137 Follow GNU Social instances 2019-05-11 19:58:41 +02:00
tom79 f8d823360e Remove screenshot in mentions 2019-05-11 19:29:39 +02:00
tom79 5a7f431f25 Improve bookmark 2019-05-11 18:33:15 +02:00
tom79 2a918556cb Improve bookmark 2019-05-11 13:35:37 +02:00
tom79 edcf2279e3 Fix a crash for click on boosted media 2019-05-11 12:51:13 +02:00
tom79 928062358f Merge branch 'develop' into improve_bookmark 2019-05-10 18:15:23 +02:00
tom79 8ba37f8895 Merge branch 'develop' of https://gitlab.com/tom79/mastalab into develop 2019-05-10 07:37:15 +02:00
tom79 2b33c044b7 Fix a crash for click on boosted media 2019-05-10 07:34:49 +02:00
Kasun c1a22a1320 theming the undo bar 2019-05-10 01:29:32 +05:30
Kasun e55bf64bf0 Display detailed undo messages 2019-05-10 01:25:08 +05:30
tom79 93a08fcb4f Remove items 2019-05-09 19:03:02 +02:00
tom79 aa7d4ab054 Fix an issue with media when sensitive with boost 2019-05-09 17:55:24 +02:00
tom79 ab3a9a9302 Honour media default privacy for accounts + add option in settings 2019-05-08 17:52:05 +02:00
tom79 7a67b672e8 Honour media default privacy for accounts + add option in settings 2019-05-08 17:50:17 +02:00
tom79 ead0d36cf9 Fix layout when few icons are visible in the top bar 2019-05-08 16:33:39 +02:00
tom79 26d434e577 Allow to search on Peertube instances 2019-05-08 16:22:19 +02:00
tom79 1672135415 Fix an issue when adding followed instances 2019-05-08 15:05:54 +02:00
tom79 761d6ee2c5 Automatically federate account if not known. 2019-05-08 12:24:15 +02:00
tom79 2c71ce1371 Fix sentence 2019-05-08 11:44:16 +02:00
tom79 95bf2b5bc6 Fix for wifi only or ask for media 2019-05-08 11:17:42 +02:00
tom79 8a88975d6a Fix for all 2019-05-08 09:37:17 +02:00
tom79 09bb853bf3 Fix for not cropped media 2019-05-07 19:28:14 +02:00
tom79 71b2f15483 Fix for not cropped media 2019-05-07 19:20:00 +02:00
Thomas adccbe790d Merge branch 'working' into 'develop' 
some changes and fixes

Closes #662

See merge request tom79/mastalab!2247
 2019-05-07 16:11:49 +00:00
tom79 e1228f15c8 Fix for not cropped media 2019-05-07 18:10:49 +02:00
Kasun ddaa638b45 Some changes in account viewer 
- add a back button
- make the menu button dark in light theme
 2019-05-07 16:17:24 +05:30
Kasun b74c256e53 changes in follow request item 
- Show display name and full username
- change buttons position to give more space to long usernames
 2019-05-07 04:18:36 +05:30
tom79 ec28de29ec Add coding 2019-05-06 18:56:44 +02:00
tom79 249fac6b8b Prepares layouts 2019-05-06 18:32:38 +02:00
tom79 25a2972e89 Allow the long press for download in another activities 2019-05-06 07:44:47 +02:00
tom79 f06052e1b0 Allow to favorite a Peertube video 2019-05-05 17:58:28 +02:00
tom79 e9db8a4655 Fix vote on polls from a reblog. 2019-05-05 17:28:19 +02:00
tom79 4077802949 Affect polls 2019-05-05 17:26:30 +02:00
tom79 c7a3ad91fe Fix file name issue when uploading 2019-05-05 17:11:23 +02:00
tom79 c3847398df Fix issue #919 - Long press on the fetch more button to retrieve all missing toots 2019-05-05 16:53:35 +02:00
tom79 f5dbfe2517 Fix issue #918 2019-05-05 12:41:45 +02:00
tom79 b57831b01b Fix a null pointer exception 2019-05-05 11:46:52 +02:00
tom79 1d7f401cd9 Fix crashes with notification counter 2019-05-05 11:35:34 +02:00
tom79 5b9116bdab Fix issue #914 2019-05-04 19:15:03 +02:00
tom79 a55465ae82 Fix color issues for tabs 2019-05-04 19:06:24 +02:00
tom79 f6f1768d53 Fix remove issue 2019-05-04 18:35:36 +02:00
tom79 7d1bbe5e5e Merge remote-tracking branch 'origin/develop' into develop 2019-05-04 18:28:55 +02:00
tom79 1adfa71875 Allow to add followed instance in the reorder tabs activity 2019-05-04 18:28:47 +02:00
Kasun 1198664c6f poll notifications 3/3 
add polls filter to notifications tab
 2019-05-04 16:38:23 +05:30
Kasun d55b7aac1b poll notifications 2/3 
fix notifications not showing for polls
 2019-05-04 16:37:09 +05:30
Kasun 3b96fb9bb7 poll notifications 1/3 
add polls to notification settings
 2019-05-04 16:28:58 +05:30
Kasun 16c2936d5a Typo (POOL --> POLL) 2019-05-04 13:31:38 +05:30
Thomas e34d1e3c94 Merge branch 'fix_unmute' into 'develop' 
correctly unmute accounts

Closes #908

See merge request tom79/mastalab!2208
 2019-05-01 09:58:16 +00:00
Kasun d2f2bfd8d3 correctly unmute accounts 2019-05-01 09:57:54 +05:30
tom79 41eaf45ff1 Fix some crashes 2019-04-29 19:16:36 +02:00
tom79 0b62272203 Fix issue #909 & #904 2019-04-29 18:18:40 +02:00
tom79 ce925fedaf Fix issue #905 2019-04-28 18:41:30 +02:00
tom79 0a8d3d21c9 BBCode support for Pleroma 2019-04-28 18:03:37 +02:00
tom79 4cbd225388 Fix theme issue when switching from settings 2019-04-28 16:13:18 +02:00
tom79 79f13c9b59 Hide poll when status is null 2019-04-28 16:09:10 +02:00
tom79 c50bd79cb7 Merge branch 'improve_polls' into develop 2019-04-28 14:58:47 +02:00
tom79 ad30d91d74 #903 - Fix a crash when restarting the app for applying some changes. 2019-04-28 14:58:33 +02:00
tom79 fc966d4964 Allow polls for private messages 2019-04-28 14:30:37 +02:00
tom79 9b102a87a6 Improve polls by allowing more choices 2019-04-28 11:15:57 +02:00
tom79 00e9756525 Fix #903 - Few fixes with previous values 2019-04-27 18:26:38 +02:00
tom79 27696312b7 Fix #903 - Hide compose button is not honoured for specific timelines. 2019-04-27 18:13:06 +02:00
tom79 b2fc6439c4 Remove history when browsing with back button 2019-04-27 18:10:48 +02:00
tom79 96fb867740 Issue #903 - Undo action 2019-04-27 18:01:13 +02:00
tom79 20c66087a7 Issue #903 - Keep 2 timelines visible at least 2019-04-27 17:37:52 +02:00
tom79 1e5e9e98d9 Issue #903 - Display undo layout when moving elements 2019-04-27 12:54:01 +02:00
tom79 50e91b373c Issue #903 - Fix an issue when syncing remote TL 2019-04-27 12:10:57 +02:00
tom79 b6abafd329 Issue #903 - New tabs don't get the popup menu for deleting them 2019-04-27 11:51:19 +02:00
tom79 501abd85d4 Issue #903 - fix notification tabs not refreshing after filtering 2019-04-27 11:34:51 +02:00
tom79 9b9afb8f69 Issue #903 - fix issue when jumping to art timeline a tag timeline 2019-04-27 10:03:33 +02:00
tom79 8de1fdaef8 Issue #903 - some improvements 2019-04-26 19:05:09 +02:00
tom79 42b250779b Issue #903 - some improvements 2019-04-26 15:50:26 +02:00
tom79 81d8b4df33 Issue #903 - some fixes 2019-04-26 14:59:52 +02:00
tom79 cb025d1a29 Issue #903 - Allow to drag timelines with the right handle & Avoid "swipe-to-remove" for main tabs 2019-04-26 13:55:18 +02:00
tom79 e3aba567cd Reorder to the end and hide when swipping 2019-04-26 13:19:46 +02:00
tom79 c9c89dada0 Merge branch 'k-a-s-u-n/mastalab-working' into develop 
# Conflicts:
#	app/src/main/res/values/strings.xml
 2019-04-25 18:52:52 +02:00
tom79 77cb513857 Merge branch 'reorder_timeline' into develop 2019-04-25 18:43:16 +02:00
tom79 f604d5c270 Remove useless settings 2019-04-25 18:42:25 +02:00
tom79 cca48acf27 Some improvements 2019-04-25 18:40:10 +02:00
tom79 248b7e98b1 Fix some issues 2019-04-25 07:38:34 +02:00
tom79 a7ad3f8c9d Fix issue when not tags or followed instances 2019-04-24 06:57:21 +02:00
tom79 69762e650c Sync tabs after moving them. 2019-04-23 18:42:15 +02:00
tom79 6e91768343 Sync timelines 2019-04-23 18:14:12 +02:00
tom79 3b2cd6b533 Sync timelines 2019-04-22 19:10:07 +02:00
tom79 e4711dc7e5 Add filters 2019-04-22 18:13:44 +02:00
tom79 291a500d1d Enable drag / Move 2019-04-22 15:10:32 +02:00
tom79 94aba5f3a0 Drag to move timelines 2019-04-22 14:32:07 +02:00
tom79 a528d878e5 Add all timeline in tabs 2019-04-22 13:16:35 +02:00
Kasun e977ecac68 add an option to disable new badge on unread statuses 2019-04-22 14:42:42 +05:30
tom79 ed13333b89 Allow downgrade 2019-04-22 09:43:09 +02:00
tom79 2df9d3193d Loop through tl 2019-04-21 19:04:08 +02:00
tom79 2cd43b4142 Loop through tl 2019-04-21 18:50:56 +02:00
Kasun 20d8464bdf add translations disabled toast 2019-04-21 22:19:11 +05:30
tom79 c045d3ab32 Revert values 2019-04-21 12:26:10 +02:00
Kasun 220275dc54 fix lock icon not having correct colors 2019-04-21 15:51:58 +05:30
tom79 c4ad9c9132 Sync the timeline 2019-04-21 12:09:30 +02:00
Kasun b6deaf7212 move locked account icon to the end of username 2019-04-21 14:21:37 +05:30
tom79 f59c53f711 Manage in db timelines 2019-04-21 10:22:07 +02:00
tom79 28ef97d4cd Add peertube column 2019-04-21 09:12:10 +02:00
Thomas 22df7fedec Merge branch 'working' into 'develop' 
add polls category to notification tab

See merge request tom79/mastalab!2153
 2019-04-19 14:44:45 +00:00
tom79 733c217c53 Fix notification sound issue 2019-04-19 16:05:00 +02:00
Kasun 04032a2a76 add polls category to notification tab 2019-04-19 19:33:54 +05:30
tom79 be081cfa56 fix poll issue when no votes 2019-04-19 13:16:16 +02:00
tom79 92f5ce0165 Some cleaning 2019-04-19 13:05:20 +02:00
tom79 d6ef3e4382 Some changes 2019-04-18 18:01:44 +02:00
tom79 a85ca83386 Merge branch 'develop' into pixelfed_oauth 2019-04-18 12:59:57 +02:00
tom79 28ebf3b72b Fix issue #886 - Add live notifications for Pleroma 2019-04-17 17:56:33 +02:00
tom79 12b76915c8 Fix issue #882 2019-04-17 17:40:11 +02:00
tom79 ef7dd73a22 Move to the last version 2019-04-17 17:23:42 +02:00
tom79 55d73c67db Move to the last version 2019-04-17 17:23:03 +02:00
tom79 78c3d7c660 Fix version name 2019-04-17 17:22:27 +02:00
tom79 8d6444b46b Improve utm parameters detection 2019-04-17 16:25:42 +02:00
tom79 0d49cfaa4e fix spacing 2019-04-17 15:53:33 +02:00
tom79 9cd9b890fb Merge branch 'develop' into pixelfed_oauth 2019-04-17 13:23:31 +02:00
tom79 eebfc17de8 fix spacing 2019-04-16 18:44:51 +02:00
tom79 03ac93b9c7 Clear filename 2019-04-16 18:32:38 +02:00
tom79 9ed45ad3c7 Allow spacing 2019-04-16 18:29:19 +02:00
tom79 ed41dae64b Fix issue #876 2019-04-16 17:40:44 +02:00
tom79 c7e5bfc911 Fix issue #889 2019-04-16 17:18:10 +02:00
tom79 f6cf4f8227 Log for pixelfed 2019-04-16 17:07:51 +02:00
tom79 9352346ec5 Log for pixelfed 2019-04-06 17:12:35 +02:00
tom79 2f160ddf25 Fix issue #877 2019-04-06 16:10:20 +02:00
tom79 3290dacb2b Fix keyboard not open when opening compose activity 2019-04-01 18:57:32 +02:00
tom79 ddf156144a Some improvements 2019-03-31 19:10:31 +02:00
tom79 0b58fba5dc Fix refresh token + improve search layout 2019-03-31 18:57:53 +02:00
tom79 76e10fccf8 Fix issue #862 2019-03-31 18:29:02 +02:00
tom79 5e869958e1 Merge branch 'develop' of https://gitlab.com/tom79/mastalab into develop 2019-03-31 17:53:45 +02:00
tom79 101849a07c Some fixes with pagination 2019-03-31 15:15:46 +02:00
Len Chan aba93a3874 Merge remote-tracking branch 'origin/develop' into develop 2019-03-31 20:28:16 +08:00
Len Chan f3eac9967a cleanup 2019-03-31 20:28:00 +08:00
tom79 18cc3a13f9 Divide searches 2019-03-31 14:25:40 +02:00
Len Chan 73143f3236 cleanup 2019-03-31 20:22:38 +08:00
Len Chan 1a04181f78 cleanup 2019-03-31 19:52:48 +08:00
Len Chan 3544b04680 scroll up and down can dismiss media activity 2019-03-31 19:16:00 +08:00
tom79 2622a75906 Change the way to retrieve results for searches 2019-03-31 12:40:51 +02:00
tom79 805aa74229 Prepares the new search feature 2019-03-31 11:58:40 +02:00
Len Chan e06a3bad73 fullscrren mode by click on activity_media 2019-03-31 17:48:47 +08:00
tom79 cf874f6ef2 poll changes 2019-03-31 09:52:35 +02:00
tom79 250e052b8f Refresh statuses after an action 2019-03-30 18:48:38 +01:00
tom79 c00adf53c1 Merge branch 'develop' of https://gitlab.com/tom79/mastalab into develop 2019-03-30 16:48:49 +01:00
tom79 6f205f3214 Fix notification with polls 2019-03-30 16:43:03 +01:00
Len Chan bec6569af5 update button style on compose activity 2019-03-30 20:27:16 +08:00
Len Chan 8aefa82386 scale button size on compose activity 2019-03-30 14:17:38 +08:00
tom79 881db26670 Fix notification with polls 2019-03-29 17:58:54 +01:00
Len Chan 404f06def5 fix shared content's length shows 0. 2019-03-27 16:38:49 +08:00
Len Chan e798707fdf change refresh/extend animation to fade-out/fade-in in ShowConversationActivity 2019-03-27 16:18:26 +08:00
tom79 2078455090 Polls in notifications 2019-03-26 19:07:25 +01:00
tom79 32bd42da95 Refresh token when expired 2019-03-26 18:09:39 +01:00
tom79 8df3ec044c New way for Peertube 2019-03-25 19:19:35 +01:00
tom79 cceace8e65 Fix typo 2019-03-25 18:50:48 +01:00
tom79 f46f49f661 Release 1.77.1 2019-03-24 19:53:36 +01:00
tom79 b97d52be41 Release 1.77.1 2019-03-24 19:49:17 +01:00
tom79 44d93159f1 improve poll 2019-03-24 19:06:53 +01:00
tom79 60b5c01b10 improve poll 2019-03-24 19:06:03 +01:00
tom79 13bcdff30b Merge branch 'poll_api' into develop 
# Conflicts:
#	app/src/main/res/values/strings.xml
 2019-03-24 17:35:35 +01:00
tom79 58efaf1d00 Fix last issues 2019-03-24 17:21:13 +01:00
tom79 4c54271a70 Manage votes 2019-03-24 16:38:12 +01:00
tom79 7e16caea9e Fix Peertube follow instance feature 2019-03-23 18:15:29 +01:00
tom79 c0f6352604 add alert 2019-03-23 17:23:02 +01:00
Len Chan 08cb4486b8 add option for compose: user can disable retrieve metadata if URL from other app 2019-03-23 17:23:09 +08:00
Len Chan 840ad0024f add option for compose: user can disable retrieve metadata if URL from other app 2019-03-23 17:09:25 +08:00
Len Chan e054ce1501 add hide notification delete button 2019-03-19 09:12:29 +08:00
Len Chan 349cd9be31 add hide notification delete button 2019-03-19 09:04:09 +08:00
tom79 65362865ed Merge branch 'develop' of https://gitlab.com/tom79/mastalab into develop 2019-03-15 18:13:35 +01:00
Kasun 89e00914ce fix import file type on login page 2019-03-14 15:14:33 +05:30
tom79 164c0b6f84 Fix mention 2019-03-02 19:14:24 +01:00
tom79 fde6bdcde6 Fix some crashes 2019-03-02 18:48:25 +01:00
tom79 8cde45a301 Fix import/export feature 2019-03-02 15:43:40 +01:00
tom79 90763435a3 improve db export 2019-03-02 11:40:46 +01:00
tom79 73fd2a50c9 Remove useless choice with the optin popup 2019-03-02 11:15:52 +01:00
tom79 dc4be3b3d3 Merge branch 'featured_tags' into develop 2019-03-01 18:57:31 +01:00
tom79 c4af6cfa96 Fixes 2019-03-01 18:57:19 +01:00