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
|
eb9f2695d3
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-04-25 18:43:28 +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 |
|
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
|
fe500fad72
|
minor layout fix
|
2019-04-21 22:41:30 +05:30 |
|
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 |
|
Kasun
|
22a1c12159
|
fit content description preview image to viewer
|
2019-04-20 21:59:18 +05:30 |
|
Thomas
|
bc0cff18d6
|
Merge branch 'fdroid_listing' into 'develop'
Add more metadata for fdroid listing
See merge request tom79/mastalab!2154
|
2019-04-19 21:22:11 +00:00 |
|
Kasun
|
f49ecadab7
|
update screenshots for fdroid
|
2019-04-19 22:07:56 +05:30 |
|
Kasun
|
ac336724d4
|
add more metadata for fdroid listing
|
2019-04-19 21:47:13 +05:30 |
|
tom79
|
2b4fc03db2
|
Prepares release 1.79.0
|
2019-04-19 17:44:57 +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
|
f811a58fa6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-04-19 13:16:25 +02:00 |
|
tom79
|
be081cfa56
|
fix poll issue when no votes
|
2019-04-19 13:16:16 +02:00 |
|
Thomas
|
85953dcd44
|
Merge branch 'l10n_crowdin_localization_gitlab' into 'develop'
New Crowdin translations
See merge request tom79/mastalab!2143
|
2019-04-19 11:15:24 +00: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 |
|
Thomas
|
dfabf0809b
|
New translations strings.xml (Greek)
|
2019-04-17 22:46:36 +00:00 |
|
Thomas
|
7cb9e4c47a
|
New translations strings.xml (Greek)
|
2019-04-17 22:34:12 +00:00 |
|
Thomas
|
844ead40bb
|
New translations strings.xml (Greek)
|
2019-04-17 22:28:15 +00:00 |
|
Thomas
|
3b37a8cf8c
|
New translations strings.xml (Greek)
|
2019-04-17 22:17:02 +00:00 |
|
Thomas
|
3f172c11a7
|
New translations strings.xml (Greek)
|
2019-04-17 22:09:41 +00:00 |
|
Thomas
|
3229544d32
|
New translations strings.xml (Greek)
|
2019-04-17 21:59:23 +00:00 |
|
Thomas
|
a19e2103fd
|
New translations strings.xml (Greek)
|
2019-04-17 21:43:08 +00:00 |
|
Thomas
|
82a7693cd2
|
New translations strings.xml (Greek)
|
2019-04-17 21:40:14 +00:00 |