Commit Graph

334 Commits

Author SHA1 Message Date
Kasun e55bf64bf0 Display detailed undo messages 2019-05-10 01:25:08 +05:30
tom79 7a67b672e8 Honour media default privacy for accounts + add option in settings 2019-05-08 17:50:17 +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
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