a65b328239
remove unused code
2019-10-09 08:30:48 +03:00
f6c0e06884
Merge branch 'develop' into feature/following_reblogs
2019-10-09 08:15:37 +03:00
7d3330b7b6
Merge branch 'issue/679' into 'develop'
...
[#679 ] fix follow request on search page
See merge request pleroma/pleroma-fe!970
2019-10-08 19:06:57 +00:00
7fede8572d
change icon
2019-10-08 17:32:58 +03:00
78e8a49f40
fix follow request on search page
2019-10-08 17:07:01 +03:00
541a71c3a5
Merge branch 'develop' into feature/following_reblogs
2019-10-08 16:49:03 +03:00
a26d550137
updated user_card
2019-10-08 16:46:54 +03:00
9c305c5f93
Revert "added acccount_actions component"
...
This reverts commit 188b6f56ed
2019-10-08 10:21:40 +03:00
122323f35c
Merge branch 'docs/add-links' into 'develop'
...
Minor documentation improvements
See merge request pleroma/pleroma-fe!965
2019-10-04 14:30:29 +00:00
c07bf59da7
Move the epigraph after the heading so MkDocs can pick up the heading
2019-10-04 17:24:36 +03:00
2060dd8377
Add links to directions in the beginning of CONFIGURATION.md
2019-10-04 17:12:14 +03:00
e82405ae35
Merge branch 'docs-sync' into 'develop'
...
CI: trigger doc rebuild on commits to develop
See merge request pleroma/pleroma-fe!964
2019-10-03 16:09:54 +00:00
4b8c9a03f2
CI: trigger doc rebuild on commits to develop
2019-10-03 18:48:16 +03:00
84dbc86624
Merge branch 'admin-link' into 'develop'
...
Add Admin panel link to navigation for admins
See merge request pleroma/pleroma-fe!954
2019-10-02 20:12:44 +00:00
33759e4153
update admin url
2019-10-02 13:28:16 -04:00
7e5a3fa09f
update copy
2019-10-01 07:36:42 -04:00
503f086487
add trailing slash to admin url
2019-10-01 07:36:42 -04:00
d9b01643e2
open in a new tab
2019-10-01 07:36:42 -04:00
093fcee902
add admin link to the side drawer
2019-10-01 07:36:41 -04:00
4f75ad9905
add admin link to nav
2019-10-01 07:36:41 -04:00
57fedd63ca
add gauge icon
2019-10-01 07:36:41 -04:00
f3fdc92f15
Merge branch 'fix-regex-normalizer' into 'develop'
...
fix regex shortcode problem
Closes #675
See merge request pleroma/pleroma-fe!963
2019-10-01 06:29:31 +00:00
a2923570c3
fix regex shortcode problem
2019-09-30 23:45:03 +03:00
188b6f56ed
added acccount_actions component
2019-09-30 20:36:14 +03:00
bcfdd68e70
Merge branch 'i18n/update-ja_pedantic' into 'develop'
...
i18n/Update Pedantic Japanese Messages
See merge request pleroma/pleroma-fe!962
2019-09-30 05:09:05 +00:00
194979783e
i18n/Update Pedantic Japanese Messages
2019-09-30 05:09:05 +00:00
b90137631f
Merge branch 'i18n/update-ja' into 'develop'
...
i18n/Update Japanese Messages
See merge request pleroma/pleroma-fe!961
2019-09-30 05:07:57 +00:00
087a5b612d
i18n/Update Japanese Messages
2019-09-30 05:07:57 +00:00
767b965780
Merge branch '672' into 'develop'
...
Make post status modal state persistent unless reply user is changed
Closes #672
See merge request pleroma/pleroma-fe!959
2019-09-30 05:05:12 +00:00
50d9ed0007
reset post status form only when reply user is changed
2019-09-28 16:35:39 -04:00
aadd36f3ec
Merge branch 'refactor-who-to-follow' into 'develop'
...
Small refactoring in who to follow page
See merge request pleroma/pleroma-fe!932
2019-09-26 22:32:40 +00:00
bc17839e52
Small refactoring in who to follow page
2019-09-26 22:32:39 +00:00
9ef0e65b25
Merge branch 'feature/add-discoverable-preference' into 'develop'
...
Feature/Add _Allow user discovery services_ preference
See merge request pleroma/pleroma-fe!947
2019-09-26 22:31:28 +00:00
194dd88118
Feature/Add _Allow user discovery services_ preference
2019-09-26 22:31:28 +00:00
4369ce6f1b
Merge branch 'hide-followers-follows-count' into 'develop'
...
Added a setting to hide follow/follower count from the user profile
See merge request pleroma/pleroma-fe!951
2019-09-26 22:20:01 +00:00
19cb98b85f
Merge branch 'develop' into feature/following_reblogs
2019-09-26 21:14:31 +03:00
c02433b7e6
revert font
2019-09-26 16:35:00 +03:00
501208d350
Merge branch 'emoji-selector-update' into 'develop'
...
Emoji selector update
Closes #101
See merge request pleroma/pleroma-fe!895
2019-09-26 05:27:59 +00:00
836cb817d1
fix tests
2019-09-25 20:54:07 +03:00
a3305799c7
Merge remote-tracking branch 'upstream/develop' into emoji-selector-update
...
* upstream/develop: (42 commits)
Fix formatting in oc.json
avoid using global class
fix logo moving bug when lightbox is open
Reserve scrollbar gap when body scroll is locked
setting display: initial makes trouble, instead, toggle display: none using classname
lock body scroll
add body-scroll-lock directive
install body-scroll-lock
wire up props with PostStatusModal
rename component
recover autofocusing behavior
refactor MobilePostStatusModal using new PostStatusModal
add new module and modal to post new status
remove needless condition
add mention button
wire up user state with global store
collapse fav/repeat notifications from muted users
do not collapse thread muted posts in conversation
detect thread-muted posts
do not change word based muting logic
...
2019-09-25 20:26:49 +03:00
2f26e8acc5
eslint
2019-09-25 20:23:55 +03:00
e6d2cf77af
fix emoji inputs in user-settings, styles update
2019-09-25 20:11:06 +03:00
0b300e1708
bump z-index so that picker/suggest doesn't get overlapped by mobile button
2019-09-25 20:01:06 +03:00
e805303d3a
Scroll emoji picker into view if it's obstructed
2019-09-25 19:58:15 +03:00
e3ceae0989
very important fix
2019-09-25 19:32:30 +03:00
0d6a9f5a62
comment, cleanup and improve autoresize/autoscroll
2019-09-25 19:30:55 +03:00
e55645aec1
Fix formatting in oc.json
2019-09-25 10:25:44 +03:00
170372b2bc
Merge branch '616' into 'develop'
...
Lock body scroll when lightbox is open
Closes #616
See merge request pleroma/pleroma-fe!886
2019-09-25 07:16:23 +00:00
49ea63ddf3
Merge branch 'develop' into 'develop'
...
[i18n] Update for the Occitan language file
See merge request pleroma/pleroma-fe!901
2019-09-25 07:12:34 +00:00
7a1081aa66
Merge branch 'es-translate' into 'develop'
...
[i18n] Update es translate
See merge request pleroma/pleroma-fe!944
2019-09-25 07:10:11 +00:00
Maksim Pechnikov
HJ
rinpatch
taehoon
kaniini
Henry Jameson
Shpuld Shpludson
Hakaba Hitoyo
Shpuld Shpuldson