HJ
84ebae8ed3
Merge branch 'develop' into 'themes-accent'
...
# Conflicts:
# src/components/emoji_reactions/emoji_reactions.vue
2020-02-11 23:09:15 +00:00
Shpuld Shpludson
f6b482be51
Emoji Reactions - fixes and improvements
2020-02-11 12:24:51 +00:00
Henry Jameson
f0c4bb1193
Merge remote-tracking branch 'upstream/develop' into themes-accent
...
* upstream/develop: (33 commits)
add emoji reactions to changelog
fix emoji reaction classes broken in develop
review changes
Fix password and email update
remove unnecessary anonymous function
Apply suggestion to src/services/api/api.service.js
remove logs/commented code
remove favs count from react button
remove mock data
change emoji reactions to use new format
Added polyfills for EventTarget (needed for Safari) and CustomEvent (needed for IE)
Fix missing TWKN when logged in, but server is set to private mode.
Fix follower request fetching
Add domain mutes to changelog
Implement domain mutes v2
change changelog to reflect actual release history of frontend
Fix #750 , fix error messages and captcha resetting
Optimize Notifications Rendering
update CHANGELOG
Use last seen notif instead of first unseen notif for sinceId
...
2020-01-28 20:44:13 +02:00
Henry Jameson
3492d7f81e
eslint
2020-01-12 17:59:41 +02:00
HJ
215662afde
Merge branch 'develop' into 'fix-move-type-notification'
...
# Conflicts:
# static/fontello.json
2020-01-03 09:05:48 +00:00
Henry Jameson
43197c4243
Some error handling
2019-12-26 14:12:35 +02:00
Henry Jameson
6acd889589
Option to enable streaming
2019-12-10 21:30:27 +02:00
kPherox
6af870cd90
Add view for moves notifications
2019-12-11 00:00:45 +09:00
Henry Jameson
897131572f
Made it optional
2019-11-14 00:47:20 +02:00
Henry Jameson
e7532464e3
Replaced most trivial checkboxes with Checkbox component
2019-10-07 20:43:23 +03:00
Henry Jameson
0be86304d2
Fix tests, more replacing with mergedConfig
2019-10-06 23:28:30 +03:00
Henry Jameson
20fc259350
fixed default values for multi-choice configurations, should also fix warnings
2019-09-30 00:04:43 +03:00
Henry Jameson
39b71e5dd6
Removed all whole mess of manual watch/data declaration, now fully automatic
2019-09-29 23:47:26 +03:00
Henry Jameson
7b4cb38734
split spam mode into two separate options (one in settings page)
2019-09-23 20:36:49 +03:00
Henry Jameson
8d6750d9c2
eslint --fix --ext .js,.vue src
2019-07-05 10:17:44 +03:00
lain
0eed2ccca8
Feature/polls attempt 2
2019-06-18 20:28:31 +00:00
Henry Jameson
e3638af031
Removed formattingOptionsEnabled in favor of relying on BE-provided list of
...
accepted formatting options
2019-06-16 20:16:52 +03:00
Henry Jameson
15b3651a30
moved setting styles into common to avoid bug with shared styles
2019-05-19 20:42:44 +03:00
eugenijm
ae1496cfb4
Make floating post button configurable
2019-04-29 21:32:29 +03:00
Shpuld Shpludson
c8f967d5c0
Merge branch '500' into 'develop'
...
Set max-width of textarea in settings page
Closes #500
See merge request pleroma/pleroma-fe!761
2019-04-22 14:00:09 +00:00
taehoon
f7baa6e190
set max-width of textarea in settings page
2019-04-21 14:06:32 -04:00
taehoon
aefd4551a3
Remove space in the timeline setting copy
2019-04-21 14:06:10 -04:00
Henry Jameson
9f4a9bff46
Merge remote-tracking branch 'upstream/develop' into minimal-scopes-mode
...
* upstream/develop: (173 commits)
Fix: Change condition
fix typo
update store according to retweeted status
#433 - update sort by for conversation
display replies_count right after reply icon
expose replies_count from mastodon api
Apparently, MastoAPI gives status in ancestors if you try opening a repeat...
make side drawer use gesture service and fix its animations
review/remove error hiding
errata
review
#433 - sort conversation for retweets and clean up
Revert "Merge branch 'revert-987b5162' into 'develop'"
Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
Add await to login action'
Remove console log
Fix warnings in user profile routing
Add tests for gesture service, fix bug with perpendicular directions
#255 - clean up autocomplete form
#255 - clean up user settings page with self-closing html tags
...
2019-03-30 12:31:50 +02:00
taehoon
9857002bf5
Add hideMutedPosts setting and wire up to post-returning endpoints
2019-03-21 16:33:02 -04:00
Edijs
9c60934786
Code refactoring
2019-03-10 18:13:01 -07:00
Edijs
8952761370
Version links to BE/FE
2019-03-10 18:06:51 -07:00
Edijs
068c9724e4
Added new tab to display versions of BE/FE
2019-03-10 16:58:12 -07:00
Edijs
292cdfb24b
Merge content types translations
2019-03-06 20:13:04 -08:00
Edijs
f91e4a5801
Load post status content type from instance config
2019-03-04 21:29:56 -08:00
Henry Jameson
6184c88ac7
Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode
2019-03-03 15:45:17 +02:00
dave
1c57a1c9b4
#410 : disable checkbox when parent is disabled
2019-02-28 12:28:45 -05:00
Shpuld Shpludson
95fb768b5a
Fix #399 Make max attachments configurable
2019-02-27 14:38:58 +00:00
Shpuld Shpludson
7b9a6f8d43
Merge branch '256-avatar-crop-popup' into 'develop'
...
Add avatar cropper
Closes #256
See merge request pleroma/pleroma-fe!547
2019-02-19 15:37:01 +00:00
Edijs
c30dabbdd4
Rename: instanceSpecificPanelPresent
2019-02-17 14:24:14 -07:00
Edijs
e871e3f2ac
Hide isp option if instance has panel disabled
2019-02-17 13:24:24 -07:00
taehoon
13725f040b
Add avatar crop popup
2019-02-15 13:34:33 -05:00
Shpuld Shpludson
531f150dd3
Merge branch 'fix/add-option-to-hide-filtered-statues' into 'develop'
...
#254 Add option to hide filtered statuses
See merge request pleroma/pleroma-fe!539
2019-02-09 06:47:29 +00:00
Xiaofeng An
460976c6e5
#301 - add an option for default formatting
2019-02-06 14:26:46 -05:00
jasper
a57f8bdd68
Add option to hide filtered statuses
2019-02-06 10:18:13 -08:00
Shpuld Shpludson
f0721ed83b
Merge branch 'fix/default-inlined-videos' into 'develop'
...
Change video playing default without bothering making it an instance configurable
See merge request pleroma/pleroma-fe!505
2019-02-03 06:45:04 +00:00
shpuld
a8c6b3f538
Change video playing default without bothering making it an instance configurable
2019-01-31 21:19:41 +02:00
shpuld
476bf0afe1
Fix media timeline attachments being small by adding an option to not render background tabs in tab switcher
2019-01-31 17:00:31 +02:00
shpuld
3978aaef84
Redo everything in the MR
2019-01-26 17:45:03 +02:00
shpuld
485a061287
Polish for videos, smaller sizes, remove gif-looping options
2019-01-20 12:46:11 +02:00
Henry Jameson
c7514be46f
Fixed some settings not using defaults from instance config. Made some parts of
...
code more readable
2018-12-18 23:31:10 +03:00
Henry Jameson
b4b819f4f4
more damage control
2018-12-14 17:14:55 +03:00
Egor Kislitsyn
a8521fc8d9
Merge commit 'e443716bcd616ad61efae161624dd970841a935c' into feature/push-subscriptions
...
# Conflicts:
# src/i18n/en.json
# src/modules/interface.js
# src/modules/users.js
# yarn.lock
2018-12-13 18:22:15 +07:00
ValD
7c6c2cfb22
added PR comments
2018-12-12 23:29:13 +05:30
Egor Kislitsyn
02c0e15781
add checkbox to disable web push
2018-12-13 00:03:50 +07:00
ValD
de5d846ebd
resolved lint issue
2018-12-12 03:44:45 +05:30