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
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
c25b3d52e0
Remove scheduled toots from server side for GNU and Friendica
2019-02-23 14:50:02 +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
21d7229a11
Fix pull to refresh for GNU
2019-02-22 14:06:39 +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
9c6f2b779f
Merge branch 'develop' of https://gitlab.com/tom79/mastalab into develop
2019-02-21 18:16:14 +01:00
stom79
a63ebb04f0
Fix url in cardview
2019-02-21 18:15:58 +01:00
stom79
4f66ebf64c
Add conversation for GNU/Friendica
2019-02-21 15:46:33 +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
ivan agosto
f2f9d80560
Fixed error in usernames and names on GNUSocial
2019-02-20 12:03:27 -06: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
6a745cf9b5
Merge remote-tracking branch 'origin/develop' into develop
2019-02-18 18:12:34 +01:00
stom79
545b6ccb7c
Fix pagination issue
2019-02-18 14:00:00 +01:00
crockwave
5b602817f4
- Custom Sharing feature fix string compatibility with Crowdin
2019-02-17 10:52:59 -06:00
stom79
5e1d0e305d
Fix a bug
2019-02-16 15:05:39 +01:00
stom79
3983bd7840
fix videos
2019-02-16 10:48:41 +01:00
stom79
d0621b7379
Some fixes with URL make it disabled by default
2019-02-15 19:52:44 +01:00
stom79
73133ea6ce
Custom sharing fixes
2019-02-15 19:39:17 +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
b0de582150
Fix menu entry in notifications
2019-02-15 18:50:26 +01:00
stom79
7e8d4749f8
Improve ads blocker
2019-02-15 18:43:48 +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
17e029ae70
Apply blocking
2019-02-14 18:14:20 +01:00
stom79
7bb586225c
Tracking database
2019-02-14 17:46:38 +01:00
stom79
5da0994eb2
Create table for blocking tracking domains
2019-02-14 11:49:52 +01:00
stom79
7d814d8ce3
Merge branch 'conscrypt_disable' into develop
2019-02-14 11:32:01 +01:00
stom79
5a77ea217f
Fix gnu date issue
2019-02-14 11:29:22 +01:00
stom79
03dabbdb1c
Disable conscrypt in login page
2019-02-14 10:43:26 +01:00
stom79
7fbafa5ae4
Disable conscrypt in login page
2019-02-14 10:06:18 +01:00
crockwave
dd075a5bf1
Merge branch 'develop' of https://gitlab.com/tom79/mastalab into develop-curate_content
2019-02-13 20:31:44 -06:00
crockwave
af61b59574
- Custom Sharing feature debugging
2019-02-13 20:31:28 -06:00
crockwave
edf084e42c
- Added Custom Sharing feature support to SettingsFragment and supporting XML
2019-02-13 14:31:08 -06:00
crockwave
db4d67af11
- Added Custom Sharing feature to allow Mastodon/Misskey status metadata to be shared to remote content aggregator
2019-02-13 14:08:53 -06:00
stom79
a6e18d1b7e
Fix image issue
2019-02-13 18:50:22 +01:00
stom79
da1b128daa
Last fixes
2019-02-13 18:36:29 +01:00
stom79
8b08c977d9
Last improvements
2019-02-13 14:47:28 +01:00
stom79
fa67ec9969
Improve login activity
2019-02-13 14:32:54 +01:00
stom79
828c407cda
Merge branch 'improve_login' into node_info
2019-02-13 12:55:47 +01:00
stom79
a48dbe27a4
Add classes
2019-02-13 12:55:39 +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
47ce52df39
Fix issue #804
2019-02-13 09:11:54 +01:00
stom79
4d5cda3bd2
Login improvements
2019-02-13 09:06:00 +01:00
stom79
9c3e436cdc
notification refresh
2019-02-12 17:29:18 +01:00
stom79
2380abb411
some fixes
2019-02-12 08:58:33 +01:00
stom79
a637287633
Improve login activity
2019-02-11 10:32:36 +01:00
stom79
cf7437e2da
Scroll to top when clicking notification tabs.
2019-02-10 17:57:24 +01:00
stom79
43086da4fb
Fix swiping issue with notifications tablayout
2019-02-10 11:09:17 +01:00
stom79
47412695aa
Add a custom viewpager for swiping
2019-02-09 09:36:56 +01:00
stom79
eee60f107a
Some improvements
2019-02-09 08:42:30 +01:00
stom79
dc99f1a1b9
Fix hidden menu
2019-02-09 08:30:19 +01:00
stom79
b9f03bc9d3
Fix icons
2019-02-09 08:25:34 +01:00
stom79
3c9c0a2057
Improvements with Friendica and GNU
2019-02-08 19:13:40 +01:00
stom79
70010afa92
Fix issue #787
2019-02-08 19:11:54 +01:00
stom79
dd4a7e1516
Fix issue #795
2019-02-08 17:33:08 +01:00
stom79
f21addefe6
Fix issue #794
2019-02-08 17:30:55 +01:00
stom79
9b7b499997
Avoid issue with Tokens
2019-02-08 15:07:46 +01:00
stom79
a205d072ca
Some improvements
2019-02-08 07:43:06 +01:00
stom79
6c987e611b
Include opencollective
2019-02-07 19:48:30 +01:00
stom79
9138dbd1b6
Include opencollective
2019-02-07 19:47:53 +01:00
stom79
7fe0d12ba4
Potential crashes
2019-02-06 18:03:47 +01:00
stom79
ef47c46171
Fix some errors
2019-02-06 17:53:49 +01:00
stom79
ecb5c0d50c
Fix pagination with GNU
2019-02-06 15:20:56 +01:00
stom79
893928985a
Fix crashes & improve GNUSocial urls
2019-02-06 14:59:52 +01:00
stom79
0c62d37574
Change about page
2019-02-06 14:36:21 +01:00
stom79
94c1e4a029
Rename app and change logo
2019-02-06 14:29:55 +01:00
stom79
ea86e070ba
Fix media
2019-02-05 18:05:21 +01:00
stom79
124b1698d5
Avoid multiple listeners
2019-02-04 18:00:12 +01:00
stom79
4c25ff1945
Pinned tag timelines
2019-02-03 19:18:04 +01:00
stom79
6b4ccc0f2f
Post media with GNUSocial + pagination
2019-02-03 18:29:34 +01:00
stom79
51a7cee34c
Remove direct timeline for GNU, it doesn't seem to work.
2019-02-03 16:35:31 +01:00
stom79
bac1d1a342
GNU Profiles
2019-02-03 16:06:06 +01:00
stom79
8bcc9ca5ce
Some fixes in API
2019-02-03 15:17:14 +01:00
stom79
7ddf7f7e1e
Some fixes in API
2019-02-03 15:16:48 +01:00
stom79
0f821c8f78
Fix login + notifications
2019-02-03 15:00:27 +01:00
stom79
7e01c841e1
Start splitting notification Fragment
2019-02-03 12:07:43 +01:00
stom79
8165f53e1c
Notification fight... I won't give up.
2019-02-03 11:15:21 +01:00
stom79
064a6545d1
Home timeline + fixes
2019-02-03 09:27:02 +01:00
stom79
ee3a835660
Connection
2019-02-02 19:47:21 +01:00
stom79
fed28e37d0
Change login activity
2019-02-02 14:53:08 +01:00
stom79
1822cadf4b
Start GNU API
2019-02-02 14:25:43 +01:00
stom79
1072fa671a
enable JS
2019-02-02 12:54:54 +01:00
stom79
ffc76e4fbe
Non split toots for Pleroma instances
2019-02-02 11:04:12 +01:00
stom79
2655319e02
Fix #783
2019-02-02 11:01:24 +01:00
stom79
c47dcdb8a3
Fix one char value issue
2019-02-02 10:26:58 +01:00
stom79
2b572ea41d
Fix issue #782
2019-02-01 18:03:18 +01:00
stom79
d97e4c9de7
Fix layout issue
2019-02-01 17:50:35 +01:00
stom79
4c2542cd09
Fix issue #781
2019-01-31 18:59:58 +01:00
stom79
137bba3741
Fix issue #780
2019-01-31 18:01:08 +01:00
stom79
942434e1bc
Fix issue #774
2019-01-30 17:39:10 +01:00
stom79
e048991fb8
Avoid the refresh token message
2019-01-30 17:24:19 +01:00
stom79
a266af5743
Fix counter issue
2019-01-30 17:04:20 +01:00
stom79
61557962c6
enable javascript for webview when logging in
2019-01-30 14:35:05 +01:00
stom79
869ebabfd8
Fix notification jumps
2019-01-30 14:07:37 +01:00
stom79
cd52e05d38
Upload button for Peertube
2019-01-30 10:01:26 +01:00
stom79
cebcfd3edc
Moderation feature in non compact mode
2019-01-30 09:50:07 +01:00
stom79
2c8d0fb6d0
Merge branch 'develop' into pleroma_admin
2019-01-29 18:06:10 +01:00
stom79
a920659622
Change layout
2019-01-29 18:03:53 +01:00
stom79
d9bb2f3155
Change layout
2019-01-29 16:07:39 +01:00
stom79
48d0646b83
Last fixes
2019-01-29 14:18:55 +01:00
stom79
1bfa28078a
Logout users
2019-01-29 14:08:02 +01:00
stom79
a181683355
Logout current user only
2019-01-29 11:56:01 +01:00
stom79
cb4409df69
DB changes + logout for user
2019-01-29 11:52:54 +01:00
stom79
2a1526d42b
Fix issue #771
2019-01-29 11:34:37 +01:00
stom79
8ae1052eaa
Remove application for Pleroma
2019-01-27 18:07:53 +01:00
stom79
115a596448
Some weird crashes
2019-01-27 17:58:19 +01:00
stom79
0e727ddde9
Fix follow label on Pleroma
2019-01-27 17:20:15 +01:00