Commit Graph

381 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 d2f2bfd8d3 correctly unmute accounts 2019-05-01 09:57:54 +05:30
tom79 0a8d3d21c9 BBCode support for Pleroma 2019-04-28 18:03:37 +02:00
tom79 e819e8d004 Issue #903 - Undo action 2019-04-27 18:05:11 +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 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 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
Kasun e977ecac68 add an option to disable new badge on unread statuses 2019-04-22 14:42:42 +05:30
Kasun b0dcf967eb remove old strings 2019-04-22 00:17:50 +05:30
Kasun 0ac930036a update notification settings design
change the design of the category labels in notification settings 
fragment to match the settings fragment
2019-04-21 23:46:45 +05:30
Kasun 20d8464bdf add translations disabled toast 2019-04-21 22:19:11 +05:30
tom79 28ef97d4cd Add peertube column 2019-04-21 09:12:10 +02:00
tom79 2078455090 Polls in notifications 2019-03-26 19:07:25 +01:00
tom79 9d3c2583c3 Fix typo 2019-03-25 17:48:36 +01:00
tom79 738d33d1f9 Fix typo 2019-03-25 17:45:11 +01:00
tom79 9022862780 Update en strings 2019-03-25 17:39:54 +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 4c54271a70 Manage votes 2019-03-24 16:38:12 +01:00
tom79 c0f6352604 add alert 2019-03-23 17:23:02 +01: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 349cd9be31 add hide notification delete button 2019-03-19 09:04:09 +08:00
tom79 dc4be3b3d3 Merge branch 'featured_tags' into develop 2019-03-01 18:57:31 +01:00
tom79 2450f19ba2 some improvements 2019-03-01 18:50:52 +01:00
tom79 e5b69dd73e Fix issue #833 2019-02-28 17:45:10 +01:00
tom79 35c8715a77 featured tags 2019-02-27 19:17:39 +01:00
stom79 d4c3ffed58 Fix export 2019-02-23 14:16:15 +01:00
stom79 007c0c8c8b Fix issue #816 2019-02-22 11:29:23 +01:00
ivan agosto c24dd6ab06 Added queet in TootActivity 2019-02-21 13:04:16 -06:00
stom79 2d06ca921a Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
2019-02-15 19:35:30 +01:00
stom79 a4adef24ed Improve ads blocker 2019-02-15 18:19:32 +01:00
crockwave c9eda8e81f Merge branch 'develop' of https://gitlab.com/tom79/mastalab into develop-curate_content 2019-02-15 10:12:31 -06:00
crockwave f05aa0fb2f - Custom Sharing feature fix string compatibility with Crowdin 2019-02-14 17:50:05 -06:00
stom79 7bb586225c Tracking database 2019-02-14 17:46:38 +01:00
stom79 7fbafa5ae4 Disable conscrypt in login page 2019-02-14 10:06:18 +01:00
stom79 da1b128daa Last fixes 2019-02-13 18:36:29 +01:00
stom79 fa67ec9969 Improve login activity 2019-02-13 14:32:54 +01:00
stom79 be873f203e Fix issue #805 2019-02-13 09:30:45 +01:00
stom79 edc317f97b Fix issue #805 2019-02-13 09:26:35 +01:00
stom79 eee60f107a Some improvements 2019-02-09 08:42:30 +01:00
stom79 9138dbd1b6 Include opencollective 2019-02-07 19:47:53 +01:00
stom79 94c1e4a029 Rename app and change logo 2019-02-06 14:29:55 +01:00
stom79 7e01c841e1 Start splitting notification Fragment 2019-02-03 12:07:43 +01:00
stom79 2655319e02 Fix #783 2019-02-02 11:01:24 +01:00
stom79 a181683355 Logout current user only 2019-01-29 11:56:01 +01:00
stom79 f4c828eaee Markdown feature 2019-01-26 20:01:11 +01:00
stom79 fe17eae351 Fix issue #755 2019-01-25 16:54:48 +01:00
stom79 c7fca0f640 Add comments 2019-01-25 16:15:35 +01:00
stom79 8c4b4f85aa export / import data 2019-01-25 11:41:39 +01:00
stom79 88f8637e23 Frontend notifications 2019-01-24 17:41:53 +01:00
stom79 701b310a37 Frontend for notifications 2019-01-24 15:44:01 +01:00
stom79 da2602c298 Add contact issue #668 2019-01-23 19:23:26 +01:00
Kasun a53f88f9bf categorize tablet ui 2019-01-23 18:22:47 +05:30
Kasun e667b93169 categorize settings 2019-01-23 14:24:26 +05:30
stom79 fa9723bc99 Fix issue #535 2019-01-22 16:31:54 +01:00
stom79 f048eea4e1 Schedule update remove 2019-01-20 15:20:07 +01:00
stom79 0411b878c2 First step scheduling 2019-01-19 19:41:55 +01:00
stom79 8201b49343 webrtc 2019-01-18 14:48:42 +01:00
stom79 559439193d Last fixes for Pixelfed 2019-01-16 11:33:18 +01:00
stom79 3e096aedfb Prepare frontend 7 - Add boosts 2019-01-15 16:36:30 +01:00
stom79 5c2708abef Prepare frontend 4 - Improves Pixelfed layout 2019-01-15 11:00:54 +01:00
stom79 45fb620f0d Fix #723 - Add more details in confirmation popup 2019-01-13 14:33:34 +01:00
stom79 e97250e8b4 Improve Overview for Peertube 2019-01-12 19:04:12 +01:00
stom79 f5a10775b9 Peertube NSFW filter 2019-01-12 18:12:11 +01:00
stom79 155a56dac5 Some improvements 2019-01-12 17:55:18 +01:00
stom79 cf27cb06c0 Some fixes 2019-01-12 17:36:24 +01:00
stom79 3d47531c79 Upload videos 2019-01-09 16:04:14 +01:00
stom79 de98ca8d79 Front end + back end video updates 2019-01-09 10:13:35 +01:00
stom79 4ea77d489a Back end for edition of videos 2019-01-08 16:24:02 +01:00
stom79 e9e4f51d56 Front end edit video 2019-01-08 10:50:43 +01:00
stom79 0c1d123196 Front end display user videos 2019-01-07 17:00:03 +01:00
stom79 e38f458245 Frontend for upload 2019-01-07 15:27:06 +01:00
stom79 3f25556742 Settings 2019-01-06 15:36:01 +01:00
stom79 8111b85efb Exoplayer fullscreen 2019-01-06 13:20:06 +01:00
stom79 13785b0db3 Rate videos + comments - #692 2019-01-04 16:41:47 +01:00
stom79 f9300c7af6 Front end for tabs - #690 2019-01-03 12:15:42 +01:00
stom79 7bad216013 Handle no apps installed for xmpp - #682 2018-12-31 12:13:40 +01:00
stom79 4c00ba823b Following Misskey - step 1 2018-12-29 12:09:02 +01:00
stom79 6b4c77f0b8 Allow to change column names 2018-12-28 10:41:40 +01:00
stom79 4f82c52855 Front end 2018-12-27 18:40:18 +01:00
stom79 911d500e4f Prepares DB migration + back end 2018-12-27 17:49:50 +01:00
stom79 ebdf48df70 Follow PixelFed instances 2018-12-26 15:43:36 +01:00
stom79 3ef5473c2c Bot accounts detection 2018-12-22 11:08:04 +01:00
stom79 593fc547ee Special entry for translations and language picker 2018-12-22 10:16:45 +01:00
stom79 c5e2cb780b Add Norwegian - prepares 1.50-beta-3 2018-12-21 19:25:51 +01:00
stom79 a37bed8009 Prepares frontend for notification date range #370 2018-12-16 15:23:27 +01:00
stom79 cf1dc7518c Change frontend 2018-12-15 17:13:06 +01:00
stom79 2a742807e3 Languages in their original names 2018-12-15 10:59:43 +01:00
stom79 6d7f0cba6d Add languages in their own locale 2018-12-15 09:16:41 +01:00
stom79 86dc89e764 Login helper 2018-12-11 19:17:14 +01:00
stom79 71a83ea35d More xml - #623 2018-12-10 14:58:45 +01:00
stom79 93cd7048e8 some more content descriptions - #623 2018-12-10 09:37:04 +01:00
stom79 a75afcdd79 some more content descriptions - #623 2018-12-10 09:22:50 +01:00