Commit Graph

1089 Commits

Author SHA1 Message Date
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 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 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
Kasun 89e00914ce fix import file type on login page 2019-03-14 15:14:33 +05:30
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 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
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 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
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 f699f03ad8 Merge branch 'custom_sharing_improvements' into develop 2019-02-23 16:29:50 +01:00
tom79 077a468f38 Fixes with media 2019-02-23 16:27:05 +01:00
tom79 287a188361 Some fixes 2019-02-23 14:39:51 +01:00
tom79 4d61600ed2 Merge branch 'develop' of https://gitlab.com/tom79/mastalab into develop 2019-02-23 14:25:28 +01:00
tom79 f9f4b83e9f Friendica post issue 2019-02-23 14:25:21 +01:00
stom79 c19a4dadcc Restore accounts 2019-02-23 14:23:31 +01:00
stom79 d4c3ffed58 Fix export 2019-02-23 14:16:15 +01:00
stom79 f66e389275 Automatically add author and image 2019-02-23 09:54:05 +01:00
stom79 cb1f86ae11 make image smaller 2019-02-23 09:42:10 +01:00
stom79 57777563bb Add thumbnail from card when available 2019-02-23 09:21:29 +01:00
stom79 bf702b742e Only put the status for reblog. That avoids too much management 2019-02-23 09:14:09 +01:00
stom79 860d52d384 add desciption 2019-02-23 08:55:39 +01:00
stom79 b5e4e5e50f Add custom emoji image. 2019-02-23 08:51:57 +01:00
stom79 33bfb87d26 Merge branch 'develop' of https://gitlab.com/tom79/mastalab into develop 2019-02-23 08:42:22 +01:00
crockwave 8644f1170f - Moved reblog handling to Custom Sharing Activity from StatusListAdapter to fix null contentSpan issue
- Add Instance value to Source field when toots are shared from local instance
- Removed extraneous semicolon in CustomSharingActivity
- Rewrote encodeCustomSharingURL method in CustomSharingActivity to allow all parameters in the Custom Sharing URL to be passed through
- Changed default Custom Sharing URL value to emulate the new Content Sharing Server token method
2019-02-22 17:48:45 -06:00
stom79 bd51be594a Hide contacts for GNU 2019-02-22 14:30:04 +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 0d5223dff7 Fix Friendica conversation issue 2019-02-21 19:06:04 +01:00
stom79 19c76b82fe Remove useless logs 2019-02-21 15:10:24 +01:00
stom79 6da8084aab Add token management to custom share feature 2019-02-21 15:09:35 +01:00
stom79 214a7c78a5 Replace three dots by a char 2019-02-19 18:39:59 +01:00
crockwave 8fc44c9002 Modified Custom Sharing UI to increase quantity of lines allocated to edittext fields, add ellipsis on title field as required, truncate suggested title to 60 char, and include entire toot text in description field 2019-02-18 15:31:32 -06:00
stom79 5e1d0e305d Fix a bug 2019-02-16 15:05:39 +01:00
stom79 d0621b7379 Some fixes with URL make it disabled by default 2019-02-15 19:52:44 +01: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 7e8d4749f8 Improve ads blocker 2019-02-15 18:43:48 +01:00