Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
4715 commits 59 branches 16 tags 15 MiB
Commit graph

4715 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shpuld Shpludson
e768ec1fca Merge branch '2.1.0-rc0' into 'master' 
2.1.0 into master

See merge request pleroma/pleroma-fe!1217
 2020-08-27 14:45:03 +00:00
Shpuld Shpuldson
d09f43ba7a Merge branch '2.1.0-rc0' of git.pleroma.social:pleroma/pleroma-fe into 2.1.0-rc0 2020-08-27 17:13:43 +03:00
Shpuld Shpuldson
748c4d8c71 fix boomarks mistake in changelog 2020-08-27 17:13:14 +03:00
Shpuld Shpludson
c7ddfefe34 Merge branch 'master' into '2.1.0-rc0' 
# Conflicts:
#   CHANGELOG.md
#   src/services/api/api.service.js
 2020-08-27 13:59:56 +00:00
Shpuld Shpuldson
c0205d582a add missing release to changelog to fix conflicts 2020-08-27 16:56:47 +03:00
Shpuld Shpuldson
4ac882a3b0 add back unreleased/patch 2020-08-27 16:51:16 +03:00
Shpuld Shpuldson
bdbc4b27b6 set 2.1.0 date and remove rc from changelog 2020-08-27 16:49:01 +03:00
Shpuld Shpuldson
42598fc675 change changelog 2020-08-26 14:28:43 +03:00
lain
65ac71139e Merge branch 'fix/long-poll-words' into 'develop' 
fix long poll labels overflowing

See merge request pleroma/pleroma-fe!1216
 2020-08-25 09:32:11 +00:00
Shpuld Shpuldson
c9ea2db69d fix long poll labels overflowing 2020-08-25 12:17:42 +03:00
lain
ff328e7c55 Merge branch 'fix/user-card-avatar-too-small' into 'develop' 
Fix some Avatar related css bugs

See merge request pleroma/pleroma-fe!1215
 2020-08-25 08:50:28 +00:00
Shpuld Shpuldson
f0ac40a428 change more animated gif avatars to work properly 2020-08-25 11:40:02 +03:00
Shpuld Shpuldson
06159101cf fix avatar overwrite classes in usercard 2020-08-25 11:33:38 +03:00
lain
0ed5d40ad7 Merge branch 'fix/fix-tests' into 'develop' 
Fix tests

See merge request pleroma/pleroma-fe!1214
 2020-08-19 13:28:57 +00:00
Shpuld Shpuldson
a0c17e1fd0 fix tests by removing only and adding empty func for notification tests 2020-08-19 16:19:36 +03:00
Shpuld Shpludson
7599244968 Merge branch 'support-thumbnails' into 'develop' 
EntityNormalizer: Normalize thumbnail url.

See merge request pleroma/pleroma-fe!1213
 2020-08-19 13:01:33 +00:00
lain
c649f28faf EntityNormalizer: Normalize thumbnail url. 2020-08-19 14:54:00 +02:00
lain
45add8f5bc Merge branch 'weblate-pleroma-pleroma-fe' into 'develop' 
Translations update from Weblate

See merge request pleroma/pleroma-fe!1208
 2020-08-19 12:09:38 +00:00
Ben Is
a26fc61efa Translated using Weblate (Italian) 
Currently translated at 100.0% (663 of 663 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
 2020-08-19 12:00:19 +00:00
lain
54b7e986a7 Merge branch 'fix/tag-timeline-title' into 'develop' 
Fix #928 show tag name in title for tag timelines

Closes #928

See merge request pleroma/pleroma-fe!1212
 2020-08-19 12:00:12 +00:00
HJ
ddeeb240ac Merge branch 'css-fixes' into 'develop' 
Css fixes

See merge request pleroma/pleroma-fe!1211
 2020-08-19 10:20:38 +00:00
Shpuld Shpuldson
54b619dfec show tag name in title for tag timelines 2020-08-19 13:06:46 +03:00
Henry Jameson
800047b81f fixed 2020-08-19 12:14:00 +03:00
Henry Jameson
d7c42f1469 lint 2020-08-19 00:38:54 +03:00
Henry Jameson
61966d290a fix lain's bug 2020-08-19 00:22:08 +03:00
Henry Jameson
36c9368ae5 fix reply popovers being too slim 2020-08-19 00:18:52 +03:00
Henry Jameson
815f230ac7 fixed some issues related to user avatar 2020-08-18 23:57:42 +03:00
Henry Jameson
7de78b1401 revert change to form resize logic 2020-08-18 23:50:23 +03:00
Henry Jameson
a6223cec0c Fix last line having slightly cut-off low-hanging parts of characters 2020-08-18 00:52:51 +03:00
Henry Jameson
ecbbec7b97 work around incorrect styles ordering in status popover 2020-08-18 00:26:44 +03:00
Henry Jameson
30219098a6 fix issues with reply-link 2020-08-18 00:26:31 +03:00
Henry Jameson
2fa050b163 Fix muted notifications 2020-08-18 00:26:02 +03:00
lain
1a8840c7c3 Merge branch 'fix/treat-field-name-as-text' into 'develop' 
treat field name as text

See merge request pleroma/pleroma-fe!1210
 2020-08-13 14:01:30 +00:00
Shpuld Shpuldson
ae4dc3e439 treat field name as text 2020-08-13 16:29:12 +03:00
HJ
b9d1ecec44 Merge branch 'stylelint-rscss-1' into 'develop' 
Stylelint + RSCSS initial approach

See merge request pleroma/pleroma-fe!1205
 2020-08-06 13:38:07 +00:00
lain
3e6e6096bf Merge branch 'feat/separate-timeline-navigation-from-navpanel' into 'develop' 
Separate timeline navigation from navpanel

See merge request pleroma/pleroma-fe!1172
 2020-08-06 10:17:44 +00:00
Shpuld Shpludson
9a10ad3826 Merge branch 'mobile-setting-modal-fix' into 'develop' 
Mobile setting modal behavior fixes

Closes #908

See merge request pleroma/pleroma-fe!1200
 2020-08-06 09:53:24 +00:00
Shpuld Shpludson
7bd6846703 Merge branch 'chat-list-single-line-fix' into 'develop' 
Fix single line status content mode in the chat list

See merge request pleroma/pleroma-fe!1202
 2020-08-06 09:46:19 +00:00
Henry Jameson
0feab1d97c more broken reply improvements 2020-08-04 19:41:03 +03:00
Henry Jameson
a962ca6065 lint 2020-08-04 19:34:18 +03:00
Henry Jameson
0d02b04726 bring back red stripe 2020-08-04 19:32:47 +03:00
Henry Jameson
10bb2b288d remove unnecessary border-radius 2020-08-04 19:26:07 +03:00
Henry Jameson
24fd9372ce i am an idiot sandwich 2020-08-04 19:18:13 +03:00
Henry Jameson
dce057f24e lint 2020-08-04 19:16:55 +03:00
Henry Jameson
839681bbc7 add stylelint to CI/npm, only one file for now. 2020-08-04 19:12:13 +03:00
Henry Jameson
2a1c9e094c more fixes 2020-08-04 19:08:49 +03:00
Henry Jameson
4c8e9bc0c2 Merge remote-tracking branch 'origin/develop' into stylelint-rscss-1 
* origin/develop:
  Let's serve the README image from GitLab
 2020-08-04 18:01:09 +03:00
feld
b3f3e87411 Merge branch 'chore/readme-image-link' into 'develop' 
Let's serve the README image from GitLab

See merge request pleroma/pleroma-fe!1206
 2020-07-28 21:18:05 +00:00
Mark Felder
fbdcec1a22 Let's serve the README image from GitLab 2020-07-28 16:08:36 -05:00
Shpuld Shpuldson
e57562959f fix oops 2020-07-28 09:41:00 +03:00