Commit Graph

2414 Commits

Author SHA1 Message Date
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
tom79 2450f19ba2 some improvements 2019-03-01 18:50:52 +01:00
tom79 2a94870b4f Fix mention issue 2019-03-01 17:54:45 +01:00
stom79 b63724d48a Merge branch 'GNU_direct_messages' into develop 2019-02-28 14:05:20 +01:00
stom79 b662bd138a Restore accounts 2019-02-28 14:05:07 +01:00
tom79 b3217f693c Make description read only without HTML tags but use HTML format for submitting 2019-02-27 19:29:38 +01:00
tom79 ac037a259c Change url 2019-02-27 19:21:19 +01:00
tom79 35c8715a77 featured tags 2019-02-27 19:17:39 +01:00
tom79 8e16fc7e23 some logs #829 2019-02-27 11:05:59 +01:00
tom79 82aee9b79c Add conversations for private messages #829 2019-02-27 10:27:01 +01:00
tom79 baee599f4f Add private timeline #829 2019-02-27 09:54:38 +01:00
tom79 5bf074b8db Fix issue #825 2019-02-26 18:41:21 +01:00
tom79 d8fe5f11af support hubzilla 2019-02-26 17:45:26 +01:00
tom79 2614b67a95 use first entry in nodeinfo #827 2019-02-26 17:44:22 +01:00
crockwave 4684aaa6bd - Redefined bundle_source as the account URL of the toot creator, to be listed in the RSS feed with source value as the URL and creator value as the readable portion in the <source> tag of RSS feed
- Modified bundle_creator tag to always be formatted as account_name@instance to reference creator of toot in RSS feed, because the status.getAccount().getAcct() result value varies if the toot came from current Mastodon instance or not
- Added ${creator} and ${thumbnailurl} to custom sharing URL parameters, to improve customizability of custom sharing URL
- Modified default custom sharing URL value to include ${creator} and ${thumbnailurl}
- Fixed bug in Description field rendering in CustomSharingActivity, introduced by emoticon handling code adding HTML elements into bundle_content value
- Removed parameters from encodeCustomSharingURL() method of CustomSharingActivity, as those variables are accessible from the activity
2019-02-25 19:51:27 -06:00
crockwave 22310ccef1 - Redefined bundle_source as the account URL of the toot creator, to be listed in the RSS feed with source value as the URL and creator value as the readable portion in the <source> tag of RSS feed
- Modified bundle_creator tag to always be formatted as account_name@instance to reference creator of toot in RSS feed, because the status.getAccount().getAcct() result value varies if the toot came from current Mastodon instance or not
- Added ${creator} and ${thumbnailurl} to custom sharing URL parameters, to improve customizability of custom sharing URL
- Modified default custom sharing URL value to include ${creator} and ${thumbnailurl}
- Fixed bug in Description field rendering in CustomSharingActivity, introduced by emoticon handling code adding HTML elements into bundle_content value
- Removed parameters from encodeCustomSharingURL() method of CustomSharingActivity, as those variables are accessible from the activity
2019-02-25 16:27:44 -06:00
tom79 8c03324e96 Only targets from user 2019-02-24 11:18:39 +01:00
tom79 995bf9d37e Retrieve if the message is liked - #826 2019-02-24 11:08:15 +01:00
tom79 7df7cb585e add like instead of favorites - #826 2019-02-24 10:52:36 +01:00
tom79 2acee4570d Fix issue #806 2019-02-23 18:22:35 +01:00
tom79 23ca767841 Allow to change video mode for Peertube from other social networks 2019-02-23 18:13:41 +01:00