sam/pleroma-fe
sam/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
1875 commits 3 branches 15 tags 109 MiB
Commit graph

1875 commits

This branch
This branch
All branches
Author SHA1 Message Date
lambda
85e2ca4a0a Merge branch 'reply-detection' into 'develop' 
Remove reply detection hack

See merge request pleroma/pleroma-fe!464
 2019-01-15 20:15:28 +00:00
scarlett
de8dfef252 Remove reply detection hack 2019-01-13 13:41:02 +00:00
Shpuld Shpludson
52579b09b1 Merge branch 'translate-korean' into 'develop' 
Add Korean translation

See merge request pleroma/pleroma-fe!457
 2019-01-10 14:56:25 +00:00
kjwon15
d4eb3cb36b Add Korean translation 2019-01-10 14:56:05 +09:00
Shpuld Shpludson
a51167fa72 Merge branch 'fix-265-fix-user-profiles-again' into 'develop' 
fixes #265 and also that thin line below gradient on chrome (UGH)

Closes #265

See merge request pleroma/pleroma-fe!456
 2019-01-09 20:57:00 +00:00
Shpuld Shpludson
499c6b85d4 Merge branch 'fix/user-timeline-not-loading' into 'develop' 
Fix #262 user timelines bugging

Closes #262

See merge request pleroma/pleroma-fe!454
 2019-01-09 20:56:09 +00:00
Shpuld Shpludson
4fbaffef53 Merge branch 'fix-262-load-older' into 'develop' 
fix #262 part of user profiles not being able to load previous posts

Closes #262

See merge request pleroma/pleroma-fe!455
 2019-01-09 20:55:36 +00:00
shpuld
b8b18b198d Change emptlyTl to take userId 2019-01-09 22:19:02 +02:00
Henry Jameson
f4b499b044 better fix 2019-01-09 16:31:53 +03:00
Henry Jameson
d13f36a2ad fixes #265 and also that thin line below gradient on chrome (UGH) 2019-01-09 15:36:09 +03:00
Henry Jameson
0b8f616af1 fix #262 part of user profiles not being able to load previous posts 2019-01-09 14:18:36 +03:00
shpuld
a8f6099be2 Retain userId on clearing user timeline, don't flush when empty timeline 2019-01-08 23:09:03 +02:00
Shpuld Shpludson
1fb9ceb59b Merge branch 'feature/add-about-page-for-mobile' into 'develop' 
Add instance information page for mobile

See merge request pleroma/pleroma-fe!451
 2019-01-07 17:26:47 +00:00
Hakaba Hitoyo
a60fc390a0 Add instance information page for mobile 2019-01-07 17:26:47 +00:00
HJ
2184334ad9 Merge branch 'avoid-duplicates-in-who-to-follow-panel' into 'develop' 
[Debug] Avoid duplicates in the who to follow panel

See merge request pleroma/pleroma-fe!441
 2019-01-04 08:43:00 +00:00
Hakaba Hitoyo
702f013225 [Debug] Avoid duplicates in the who to follow panel 2019-01-04 08:43:00 +00:00
Shpuld Shpludson
35d75be1d6 Merge branch 'develop' into 'develop' 
updated German translation

See merge request pleroma/pleroma-fe!449
 2019-01-03 21:00:21 +00:00
Shpuld Shpludson
d0414dcd2f Merge branch 'readme-update' into 'develop' 
Update README

See merge request pleroma/pleroma-fe!446
 2019-01-03 20:58:40 +00:00
Shpuld Shpludson
1ef913a128 Merge branch 'fix/captcha-string-typo' into 'develop' 
Fix translation typo in registration.vue

Closes #257

See merge request pleroma/pleroma-fe!448
 2019-01-03 20:58:04 +00:00
Vinzenz Vietzke
681b4e665d updated German translation 
* added theme settings
 * added various missing single strings
 2019-01-03 19:53:53 +01:00
rinpatch
c25cf29533 Fix translation typo in registration.vue 2019-01-03 19:42:43 +01:00
Francis Dinh
7ad3cff862 Update README 
Mention that the Pleroma frontend is already included with the Pleroma backend.
Also explicitly use `Pleroma-FE` when referring to the frontend.
 2019-01-01 18:10:48 -05:00
Shpuld Shpludson
76cfb15b3c Merge branch 'feature/replace-panel-switcher' into 'develop' 
Mobile side drawer

See merge request pleroma/pleroma-fe!443
 2018-12-31 17:35:31 +00:00
HJ
7aa42c01eb Merge branch 'fix/profile-with-no-statuses-not-loading' into 'develop' 
Fix profiles without statuses not loading

See merge request pleroma/pleroma-fe!445
 2018-12-31 01:57:22 +00:00
Shpuld Shpludson
fb8f774383 Fix profiles without statuses not loading 2018-12-31 01:57:22 +00:00
HJ
1316ed43a5 Merge branch 'fix/conversation-headings-in-user-profile' into 'develop' 
Fix conflicting styles in conversation panels under user profile

See merge request pleroma/pleroma-fe!444
 2018-12-31 01:41:37 +00:00
shpuld
354fd32e7b Fix conflicting styles 2018-12-30 22:41:31 +02:00
HJ
a974d2ab85 Merge branch 'scope-copy-default' into 'develop' 
scopeCopy → true by default

See merge request pleroma/pleroma-fe!439
 2018-12-30 15:12:03 +00:00
shpuld
ace042015e Remove commented out back button 2018-12-29 23:42:01 +02:00
shpuld
16c7bd0199 merge develop, fix conflicts, fix logged out bug 2018-12-29 16:25:45 +02:00
lambda
1555a5fef3 Merge branch 'restore-routes' into 'develop' 
Restore old routes, enable user route as fallback.

See merge request pleroma/pleroma-fe!440
 2018-12-29 13:27:59 +00:00
shpuld
747e4090ca Cleanup and remove divider element in side drawer 2018-12-29 12:44:21 +02:00
shpuld
650655709d fix conflict in user card content 2018-12-28 21:44:09 +02:00
shpuld
85c058e95c New routes, notifications, other impovements in side drwaer 2018-12-28 21:39:54 +02:00
HJ
a86b80b054 Merge branch 'feature/no-attachment-links' into 'develop' 
No attachment links

Closes #175

See merge request pleroma/pleroma-fe!442
 2018-12-27 17:13:17 +00:00
Maxim Filippov
0f530de397 Add "noAttachmentLinks" to src/modules/instance.js 2018-12-27 19:59:56 +03:00
Maxim Filippov
85c487b933 Make "noAttachmentLinks" configurable 2018-12-27 13:25:11 +03:00
Maxim Filippov
13855f46e2 No attachment links 2018-12-27 02:37:36 +03:00
HJ
754cb23f35 Merge branch 'improve_push' into 'develop' 
Improve web push notifications

Closes #231

See merge request pleroma/pleroma-fe!438
 2018-12-26 13:58:11 +00:00
Lambda
f35dbaf064 Treat reserved users like external users in the frontend. 2018-12-26 14:50:48 +01:00
Shpuld Shpludson
9ba969d90c Merge branch 'fix_notifications' into 'develop' 
User Card Content fixes and updates

See merge request pleroma/pleroma-fe!437
 2018-12-26 09:19:25 +00:00
HJ
fa8ecb1c39 User Card Content fixes and updates 2018-12-26 09:19:25 +00:00
scarlett
f2f7e2e766 scopeCopy → true by default 2018-12-25 17:44:05 +00:00
Lambda
24eba26c5b Restore old routes, enable user route as fallback. 2018-12-25 18:43:52 +01:00
Egor Kislitsyn
c5847349e0 improve web push notifications 2018-12-25 20:43:18 +07:00
HJ
0ad837846a Merge branch 'push_fix' into 'develop' 
Fixes for push notifications

Closes #235

See merge request pleroma/pleroma-fe!433
 2018-12-25 11:33:00 +00:00
Henry Jameson
500b4bd374 fix 2018-12-25 14:28:49 +03:00
Shpuld Shpludson
2fe0af2af1 Merge branch 'update-japanese-translation' into 'develop' 
Update japanese translation

See merge request pleroma/pleroma-fe!435
 2018-12-25 09:03:05 +00:00
Hakaba Hitoyo
8ae3518a9a Update japanese translation 2018-12-25 09:03:05 +00:00
HJ
a80c8fd24c Merge branch 'refactor-recommendations' into 'develop' 
remove unneeded numbered variables who_to_follow

See merge request pleroma/pleroma-fe!436
 2018-12-25 02:35:30 +00:00