Commit graph

1864 commits

Author SHA1 Message Date
Henry Jameson ef2585e32b Remove all explicit and implicit conversions of statusId to number, changed
explicit ones so that they convert them to string
2019-01-11 02:40:17 +03: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
Hannah Ward ed2393c970
fix inconsistencies within who_to_follow_panel 2018-12-25 01:32:20 +00:00
HJ 698328dfbe Merge branch 'fix_textfields' into 'develop'
Fix textarea not resizing correctly and probably cursor position

Closes #230

See merge request pleroma/pleroma-fe!430
2018-12-25 01:29:18 +00:00
Henry Jameson 18d7684f32 fix for non-shrinking main post form 2018-12-25 04:25:19 +03:00
Henry Jameson e3cac42cc7 Merge remote-tracking branch 'upstream/develop' into push_fix
* upstream/develop:
  Add a translation to the captcha strings in the registration form
  Small UI improvements for the CAPTCHA field
  Add encrypted captcha_answer_data for stateless captcha
  fixes many problems related to user profile
2018-12-25 03:46:51 +03:00
Henry Jameson a4f0902926 small refactor, added push unsub notice for BE 2018-12-25 03:46:19 +03:00
Hannah Ward 6fa993c122
remove unneeded numbered variables who_to_follow 2018-12-25 00:34:33 +00:00
shpuld 4752081818 Add closed-check for touchmove 2018-12-23 20:14:40 +02:00
shpuld e46b560ead move closing logic to drawer, add swipe to close 2018-12-23 19:50:19 +02:00
shpuld f72b1d048e Merge branch 'develop' into feature/replace-panel-switcher 2018-12-22 17:32:35 +02:00
shpuld 4836c8ac74 Add some more routes to side drawer 2018-12-22 17:32:07 +02:00
Shpuld Shpludson e59b67e119 Merge branch 'captcha' into 'develop'
Make captcha stateless

See merge request pleroma/pleroma-fe!434
2018-12-22 06:17:56 +00:00