6ee9b1c740
oof
2019-09-26 06:03:13 -05:00
4319a9f7f8
Merge remote-tracking branch 'upstream/develop' into develop
2019-09-26 05:52:11 -05: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
f271d4417c
Resolved merge conflict with index.html
2019-09-25 16:09:13 -05: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
4c55e0d1be
Merge branch 'eu-translate' into 'develop'
...
[i18n] update eu translate
See merge request pleroma/pleroma-fe!943
2019-09-25 07:09:57 +00:00
ccba92a27c
Merge branch '639-2' into 'develop'
...
Add "Mention user" button to user card
Closes #639
See merge request pleroma/pleroma-fe!955
2019-09-25 06:41:26 +00:00
61bb02ef06
Merge branch '657' into 'develop'
...
Collapse fav/repeat notifications from muted users
Closes #657
See merge request pleroma/pleroma-fe!945
2019-09-25 06:24:41 +00:00
0f55359b49
fix
2019-09-25 08:43:02 +03:00
4f563e6efb
account for parent padding, too
2019-09-25 08:36:30 +03:00
daa0e284c3
forgotten file
2019-09-25 00:21:55 +03:00
ca92e29401
WIP: fixed autoscroll, restructured Post Status Form's resize method "a bit"
2019-09-25 00:17:04 +03:00
f1af286707
build to copy over custom devault avi
2019-09-24 10:30:05 -05:00
2154152d08
fix some bugs
2019-09-24 00:06:53 +03:00
6f0257cd7d
autoscroll post form on typing + some minor improvements
2019-09-23 22:12:25 +03:00
7b4cb38734
split spam mode into two separate options (one in settings page)
2019-09-23 20:36:49 +03:00
a5f2ea4499
Bad idea. Breaks search.
2019-09-21 11:56:17 -05:00
4cbc11bf10
Merge remote-tracking branch 'upstream/develop' into develop
2019-09-21 10:58:13 -05:00
d105fd0104
Better story
2019-09-21 10:42:41 -05:00
27b44d9a83
Maybe this will fix the beginning space?
2019-09-21 15:23:32 +00:00
3c74ba93e8
Fix beginning space on alex jones story
2019-09-21 15:21:42 +00:00
b8ff49849a
add line breaks and clean up alex jones story
2019-09-21 15:18:53 +00:00
15c2375e7a
add meta description and alex jones story
2019-09-21 15:06:18 +00:00
7fe6ba2401
avoid using global class
2019-09-20 11:35:47 -04:00
37ae0fd92c
fix logo moving bug when lightbox is open
2019-09-20 11:35:47 -04:00
92be5a6877
Reserve scrollbar gap when body scroll is locked
2019-09-20 11:35:47 -04:00
ae70439447
setting display: initial makes trouble, instead, toggle display: none using classname
2019-09-20 11:35:47 -04:00
ad504768fe
lock body scroll
2019-09-20 11:35:47 -04:00
8b321f6f1f
add body-scroll-lock directive
2019-09-20 11:35:47 -04:00
60c3501d35
install body-scroll-lock
2019-09-20 11:35:47 -04:00
c8a18f387c
wire up props with PostStatusModal
2019-09-20 11:29:31 -04:00
d6a941a128
rename component
2019-09-20 11:29:29 -04:00
0c8038d4f6
recover autofocusing behavior
2019-09-20 11:29:27 -04:00
a9f33272a8
refactor MobilePostStatusModal using new PostStatusModal
2019-09-20 11:29:26 -04:00
f4bbf1d4e2
add new module and modal to post new status
2019-09-20 11:29:24 -04:00
90981dcce6
remove needless condition
2019-09-20 11:29:23 -04:00
5ff899b455
add mention button
2019-09-20 11:29:21 -04:00
f8139e369c
wire up user state with global store
2019-09-20 11:25:00 -04:00
8618857aa3
collapse fav/repeat notifications from muted users
2019-09-20 11:25:00 -04:00
Your New SJW Waifu
HJ
Henry Jameson
Shpuld Shpuldson
Shpuld Shpludson
taehoon