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 |