Commit graph

3808 commits

Author SHA1 Message Date
Henry Jameson
75734bb057 Merge branch 'emoji-optimizations' into shigusegubu
* emoji-optimizations:
  Reserve space for emoji picker button in emoji input
2019-10-15 09:28:01 +03:00
Henry Jameson
9e0c14bb33 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  fix orders of a buttons
  revert lint autofix
  fix position account actions
  removed unused code
  update css
  remove unused code
  change icon
  fix follow request on search page
  updated user_card
  Revert "added acccount_actions component"
  [i18n] spanish new strings translations
  added acccount_actions component
  revert font
  use `repeats` intead `boosts`
  fontello/ added `eye` icon
  added support hide\show reblogs from a specific user
2019-10-15 09:27:54 +03:00
HJ
d2feba1487 Merge branch 'feature/following_reblogs' into 'develop'
[#664]  implementes to hide/show reblogs from a specific user.

See merge request pleroma/pleroma-fe!956
2019-10-15 06:26:12 +00:00
Henry Jameson
6266148745 Reserve space for emoji picker button in emoji input 2019-10-14 19:56:46 +03:00
Maksim Pechnikov
d53e7e3125 fix orders of a buttons 2019-10-11 16:54:25 +03:00
Maksim Pechnikov
b8d8d02384 revert lint autofix 2019-10-11 16:41:59 +03:00
Maksim Pechnikov
b497882e0e fix position account actions 2019-10-11 14:25:59 +03:00
HJ
8b2d873057 Merge branch 'es-translate' into 'develop'
[i18n] spanish new strings translations

See merge request pleroma/pleroma-fe!968
2019-10-10 17:02:34 +00:00
Henry Jameson
d839e16222 Merge branch 'emoji-optimizations' into shigusegubu
* emoji-optimizations:
  fix picker not filling on opening, removed console log
2019-10-10 20:01:37 +03:00
Henry Jameson
1400d723f2 fix picker not filling on opening, removed console log 2019-10-10 19:58:00 +03:00
Henry Jameson
71041e7c27 Merge branch 'settings-refactor' into shigusegubu
* settings-refactor:
  another missed thing
2019-10-09 22:51:18 +03:00
Henry Jameson
203f12d521 Merge branch 'emoji-optimizations' into shigusegubu
* emoji-optimizations:
  moved emoji fetching from user to instance since it's its state anyway
  always preload first batch of emoji to avoid unnecessary UI jumps
2019-10-09 22:51:02 +03:00
Henry Jameson
c000879f2f moved emoji fetching from user to instance since it's its state anyway 2019-10-09 22:50:00 +03:00
Henry Jameson
b02de56fcb always preload first batch of emoji to avoid unnecessary UI jumps 2019-10-09 22:33:15 +03:00
Henry Jameson
a54c8b994e another missed thing 2019-10-09 21:32:32 +03:00
Maksim Pechnikov
69fb015e9f removed unused code 2019-10-09 16:20:51 +03:00
Maksim Pechnikov
e3f6001b3e update css 2019-10-09 15:36:26 +03:00
Maksim Pechnikov
a65b328239 remove unused code 2019-10-09 08:30:48 +03:00
Maksim Pechnikov
f6c0e06884 Merge branch 'develop' into feature/following_reblogs 2019-10-09 08:15:37 +03:00
Henry Jameson
b64d7ec9c5 Merge branch 'settings-refactor' into shigusegubu
* settings-refactor:
  fix! i noticed it!!
2019-10-09 00:01:49 +03:00
Henry Jameson
792eaf5625 fix! i noticed it!! 2019-10-08 23:57:58 +03:00
HJ
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
Henry Jameson
d6a7f46480 Merge branch 'emoji-optimizations' into shigusegubu
* emoji-optimizations:
  eslint
  fixed emoji picker showing up beyond viewport
  start loading emoji when picker is open
  remove the "textbox grows the 'wrong' way" behavior, replace it with more conditions to scroll to bottom
  arbitrary limit with option to overcome it
  emoji picker gradual render
  moved emoji stuff away from after-store and into users module since we only need emoji after login
2019-10-08 21:41:45 +03:00
Henry Jameson
fa4e69ec8c eslint 2019-10-08 21:38:27 +03:00
Henry Jameson
81d86a39fe fixed emoji picker showing up beyond viewport 2019-10-08 21:38:27 +03:00
Henry Jameson
bed109ae46 start loading emoji when picker is open 2019-10-08 21:38:27 +03:00
Henry Jameson
37b8490c01 remove the "textbox grows the 'wrong' way" behavior, replace it with more
conditions to scroll to bottom
2019-10-08 21:38:27 +03:00
Henry Jameson
6511a744a2 arbitrary limit with option to overcome it 2019-10-08 21:38:27 +03:00
Henry Jameson
29e6e62e7c emoji picker gradual render 2019-10-08 21:38:27 +03:00
Henry Jameson
91ca1db778 moved emoji stuff away from after-store and into users module since we only need
emoji after login
2019-10-08 21:38:27 +03:00
Maksim Pechnikov
7fede8572d change icon 2019-10-08 17:32:58 +03:00
Maksim Pechnikov
78e8a49f40 fix follow request on search page 2019-10-08 17:07:01 +03:00
Maksim Pechnikov
541a71c3a5 Merge branch 'develop' into feature/following_reblogs 2019-10-08 16:49:03 +03:00
Maksim Pechnikov
a26d550137 updated user_card 2019-10-08 16:46:54 +03:00
Maksim Pechnikov
9c305c5f93 Revert "added acccount_actions component"
This reverts commit 188b6f56ed.
2019-10-08 10:21:40 +03:00
tarteka
16c03995cb [i18n] spanish new strings translations
update to translate the latest text strings
2019-10-07 21:21:16 +02:00
Henry Jameson
4f34d2b168 forgot this one 2019-10-07 20:49:35 +03:00
Henry Jameson
0e16dd1bcc sgsgb commit url 2019-10-07 20:46:31 +03:00
Henry Jameson
8e1fa16925 Merge branch 'settings-refactor' into shigusegubu
* settings-refactor:
  removed unused thing
  Replaced most trivial checkboxes with Checkbox component
  replace checkboxes in user-settings with Checkbox component
  Fix tests, more replacing with mergedConfig
  fixed default values for multi-choice configurations, should also fix warnings
  Removed all whole mess of manual watch/data declaration, now fully automatic
  created mergedConfig getter to avoid obnoxious checks for undefined everywhere
2019-10-07 20:45:35 +03:00
Henry Jameson
26e8d5ac3b Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  Move the epigraph after the heading so MkDocs can pick up the heading
  Add links to directions in the beginning of CONFIGURATION.md
  CI: trigger doc rebuild on commits to develop
  update admin url
  update copy
  add trailing slash to admin url
  open in a new tab
  add admin link to the side drawer
  add admin link to nav
  add gauge icon
  fix regex shortcode problem
  i18n/Update Pedantic Japanese Messages
  i18n/Update Japanese Messages
  reset post status form only when reply user is changed
  Small refactoring in who to follow page
  Feature/Add _Allow user discovery services_ preference
  Added a setting to hide follow/follower count from the user profile
2019-10-07 20:45:13 +03:00
Henry Jameson
d0800d0bd8 removed unused thing 2019-10-07 20:44:03 +03:00
Henry Jameson
e7532464e3 Replaced most trivial checkboxes with Checkbox component 2019-10-07 20:43:23 +03:00
Henry Jameson
8ee50f9f16 replace checkboxes in user-settings with Checkbox component 2019-10-07 00:05:21 +03:00
Henry Jameson
0be86304d2 Fix tests, more replacing with mergedConfig 2019-10-06 23:28:30 +03:00
HJ
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
rinpatch
c07bf59da7 Move the epigraph after the heading so MkDocs can pick up the heading 2019-10-04 17:24:36 +03:00
rinpatch
2060dd8377 Add links to directions in the beginning of CONFIGURATION.md 2019-10-04 17:12:14 +03:00
rinpatch
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
rinpatch
4b8c9a03f2 CI: trigger doc rebuild on commits to develop 2019-10-03 18:48:16 +03:00
HJ
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