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

4455 commits

This branch
This branch
All branches
Author SHA1 Message Date
kPherox
9b40cf43d8
fix height for emoji panel of settings modal 2020-07-04 18:42:15 +09:00
Shpuld Shpludson
76de4a3132 Merge branch 'bookmarks' into 'develop' 
Bookmarks

Closes #472

See merge request pleroma/pleroma-fe!903
 2020-07-03 19:45:49 +00:00
Eugenij
de291e2e33 Add bookmarks 
Co-authored-by: jared <jaredrmain@gmail.com>
 2020-07-03 19:45:49 +00:00
lain
7bd89b579f Merge branch 'fix_BE_1586_provide_index_md' into 'develop' 
FE part of BE issue 1586 provide index md

See merge request pleroma/pleroma-fe!1154
 2020-07-03 10:17:42 +00:00
Ilja
08b593746f FE part of BE issue 1586 provide index md 
* I added an index.md which will be the landing page for the docs. It has an explanation of Pleroma-FE from the user point of view
* See also BE MR: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2669
* And issue: https://git.pleroma.social/pleroma/pleroma/-/issues/1586
 2020-07-03 10:17:42 +00:00
Shpuld Shpludson
e1cf6bd41c Merge branch 'fix/follow-requests-usercard-crash' into 'develop' 
Fix #877 Follow request user card crash

Closes #877

See merge request pleroma/pleroma-fe!1167
 2020-07-02 09:28:57 +00:00
Shpuld Shpuldson
f0668c9ff8 add follow request users to store 2020-07-02 12:19:33 +03:00
lain
beb160bd53 Merge branch 'fix/use-backend-reply-filtering' into 'develop' 
Make use of backend reply filtering

See merge request pleroma/pleroma-fe!1163
 2020-07-01 12:46:42 +00:00
Shpuld Shpuldson
38d8526660 change Show New text to Reload when flushing 2020-06-30 17:37:36 +03:00
Shpuld Shpuldson
ea09bbecf8 Make use of backend reply filtering 2020-06-30 17:02:38 +03:00
lain
82944f862d Merge branch '812-subject-separation' into 'develop' 
StatusContent: Better separate subject from status content.

Closes #812

See merge request pleroma/pleroma-fe!1150
 2020-06-29 07:53:12 +00:00
lain
d0c9aef668 Merge branch 'weblate-pleroma-pleroma-fe' into 'develop' 
Translations update from Weblate

See merge request pleroma/pleroma-fe!1158
 2020-06-28 12:00:23 +00:00
Fristi
195e83d0c8 Translated using Weblate (Dutch) 
Currently translated at 100.0% (626 of 626 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nl/
 2020-06-28 06:24:57 +00:00
lain
391f796cb4 Merge branch 'feat/preload-data-from-html' into 'develop' 
Add basic preloading for nodeinfo/config

See merge request pleroma/pleroma-fe!1155
 2020-06-27 10:21:06 +00:00
Shpuld Shpuldson
46cf50a4d6 rename variable requestJson when it's not actually json 2020-06-27 12:59:24 +03:00
Shpuld Shpuldson
a8cb5e71d9 don't block ui with stickers or tos 2020-06-27 12:32:01 +03:00
Shpuld Shpuldson
5ab62c4cb8 make use of api/v1/instance 2020-06-27 12:26:19 +03:00
Shpuld Shpludson
4d52b8bf56 Merge branch 'remove-twitterapi-config' into 'develop' 
Remove StatusNet config endpoint usage

See merge request pleroma/pleroma-fe!1084
 2020-06-27 09:19:43 +00:00
Shpuld Shpuldson
58f9c1cc49 fix conflict in after_store 2020-06-27 12:10:02 +03:00
Shpuld Shpuldson
3113d904b9 update changelog with profile fields 2020-06-27 10:34:28 +03:00
Shpuld Shpludson
c658f57abb Merge branch 'iss-149/profile-fields-setting' into 'develop' 
Profile fields setting

See merge request pleroma/pleroma-fe!997
 2020-06-27 07:32:59 +00:00
Shpuld Shpludson
8150899a73 Merge branch 'weblate-pleroma-pleroma-fe' into 'develop' 
Translations update from Weblate

See merge request pleroma/pleroma-fe!1152
 2020-06-27 07:21:32 +00:00
translate
4528b31256 Translated using Weblate (Italian) 
Currently translated at 72.7% (452 of 621 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
 2020-06-27 07:21:32 +00:00
Shpuld Shpludson
ea0a12f604 Merge branch 'develop' into 'iss-149/profile-fields-setting' 
# Conflicts:
#   src/components/settings_modal/tabs/profile_tab.vue
 2020-06-27 07:19:49 +00:00
Shpuld Shpuldson
8c3106c588 Change the show/hide strings about, remove subjected status toggle when 'collapse' option not used 2020-06-26 18:20:32 +03:00
Shpuld Shpuldson
a2c5175d14 add basic preloading for nodeinfo/config 2020-06-26 14:47:02 +03:00
Shpuld Shpuldson
44edb730c1 rip restyle subject, fix some issues with long subject 2020-06-26 14:07:39 +03:00
lain
504d48fc5a After Store: Remove last statusnet vestiges. 2020-06-24 17:54:35 +02:00
lain
143da55c56 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into remove-twitterapi-config 2020-06-24 17:50:05 +02:00
lain
bbb91d8ae3 Merge branch 'feature/bot-flag' into 'develop' 
Add 'Bot' settings option and badge

Closes #832

See merge request pleroma/pleroma-fe!1153
 2020-06-22 12:51:51 +00:00
Sergey Suprunenko
2b6d16900b
Use more correct class name for user badges 2020-06-21 15:36:20 +02:00
Sergey Suprunenko
c04f8b2ccb
Show a 'bot' badge on the service account page 2020-06-21 15:06:07 +02:00
Sergey Suprunenko
2451956d83
Add 'bot' flag to Profile settings 2020-06-21 14:59:05 +02:00
lain
1afa0f0044 Merge branch 'notification-unification-experiments' into 'develop' 
Notification unification / WebPush i18n.

See merge request pleroma/pleroma-fe!1142
 2020-06-19 13:34:04 +00:00
lain
ed908e0195 Changelog: Add info about push notifications. 2020-06-19 15:25:57 +02:00
lain
aa725010c5 ServiceWorker: Use clearer variable names 2020-06-19 15:24:06 +02:00
HJ
267102809d Merge branch 'fix-username-emoji' into 'develop' 
fix huge emoji in usernames

See merge request pleroma/pleroma-fe!1151
 2020-06-19 13:15:22 +00:00
Henry Jameson
5aa65e32ef fix huge emoji in usernames 2020-06-19 16:09:44 +03:00
kPherox
bad3dacfac
implement user suggestor for profile fields 2020-06-19 21:18:36 +09:00
kPherox
fd2157efe4
Fix emoji input error 2020-06-19 20:51:53 +09:00
lain
4da0a0c0bf StatusContent: Fix greentext. 2020-06-19 12:49:42 +02:00
lain
a79bad5cdb StatusContent: Better separate subject from status content. 2020-06-19 12:46:48 +02:00
Shpuld Shpludson
95f5c7fff6 Merge branch 'iss-149/profile-fields-display' into 'develop' 
Display profile fields

See merge request pleroma/pleroma-fe!1004
 2020-06-19 08:04:54 +00:00
Shpuld Shpludson
6343ee929c Merge branch '589-poll-options' into 'develop' 
Polls: Construct an html field during normalization.

Closes #589

See merge request pleroma/pleroma-fe!1146
 2020-06-18 13:33:00 +00:00
lain
b0b33be9dd Poll, StatusContent: Move emoji css to status body. 2020-06-18 14:41:40 +02:00
lain
2ea5bff3a7 Merge branch 'feat/tweak-autocomplete-search' into 'develop' 
Autocomplete tweaks: remove search blocker, fix debounce params #869

See merge request pleroma/pleroma-fe!1149
 2020-06-18 11:29:50 +00:00
Shpuld Shpuldson
4e0b4427a9 remove recentqueries thing 2020-06-18 14:19:21 +03:00
kPherox
eed58a7b97
fix width of long field value 2020-06-18 20:13:44 +09:00
kPherox
bb513dd961
change key-value to look like one 2020-06-18 20:08:00 +09:00
Shpuld Shpuldson
f1175b4e9b revert import style 2020-06-18 13:41:04 +03:00