Commit graph

235 commits

Author SHA1 Message Date
Shpuld Shpludson
a8e9c05f09 Merge branch 'feat/sidebar-alignment' into 'develop'
[#765] Permit sidebar alignment with instance configuration option

See merge request pleroma/pleroma-fe!1106
2020-05-20 15:42:42 +00:00
Mark Felder
2135dc8510 Merge branch 'develop' into feat/sidebar-alignment 2020-05-15 12:26:38 -05:00
Mark Felder
840c6f40b6 Merge branch 'develop' into chore/remote-unused-option 2020-05-14 12:22:28 -05:00
Mark Felder
0ef5965b3b Add missing settings: disableChat, greentext, hideFilteredStatuses, hideMutedPosts, hidePostStats, hideSitename 2020-05-13 14:52:48 -05:00
Mark Felder
1db2fc3f41 alpha sort 2020-05-13 14:52:21 -05:00
Mark Felder
c2bba3f5ad Remove unused noAttachmentLinks option 2020-05-13 14:28:35 -05:00
Mark Felder
bc5005b3dd Permit sidebar alignment with instance configuration option 2020-05-12 13:59:52 -05:00
sadposter
10153e692e ihba updates 2020-05-08 14:38:46 +01:00
Shpuld Shpludson
f4676e17d3 Merge branch 'develop' into 'feature/copy-link'
# Conflicts:
#   static/fontello.json
2020-05-08 08:20:03 +00:00
eugenijm
01b07f01e9 Add support for follow request notifications 2020-04-30 09:58:55 +03:00
Mark Felder
8c5946b728 Add button in 3dot menu to copy status link to clipboard 2020-03-30 12:39:28 -05:00
Shpuld Shpuldson
1fb91b1795 remove bloat from themes 2020-02-22 10:34:54 +02:00
Shpuld Shpuldson
b5c6b77ca8 update using variables 2020-02-22 10:03:16 +02:00
Shpuld Shpludson
8c454b9456 Apply suggestion to static/themes/pleroma-dark.json 2020-02-21 14:09:31 +00:00
Shpuld Shpludson
c9935362de Apply suggestion to static/themes/pleroma-dark.json 2020-02-21 14:09:29 +00:00
Shpuld Shpludson
19cc739598 Apply suggestion to static/themes/pleroma-dark.json 2020-02-21 14:09:25 +00:00
Shpuld Shpludson
e342dbcb10 Apply suggestion to static/themes/pleroma-dark.json 2020-02-21 14:09:21 +00:00
Shpuld Shpuldson
64a6ba219a make panel header highlight less harsh 2020-02-20 21:14:42 +02:00
Shpuld Shpuldson
8bb5d775b4 update pleroma-dark and pleroma-light 2020-02-20 20:47:24 +02:00
HJ
3ddf7ebe2c Merge branch 'themes-accent' into 'develop'
Themes v3 Part 1 "2.1" codenamed "One step for themes, a giant burder for code reviewers"

Closes #750 and #774

See merge request pleroma/pleroma-fe!1037
2020-02-18 21:20:43 +00:00
Henry Jameson
1e95a0795a paper theme, updated todo, lol 2020-02-17 23:59:52 +02:00
823a303f8a Improve default ToS 2020-02-13 09:41:31 +00:00
HJ
84ebae8ed3 Merge branch 'develop' into 'themes-accent'
# Conflicts:
#   src/components/emoji_reactions/emoji_reactions.vue
2020-02-11 23:09:15 +00:00
Henry Jameson
60446c56a5 fix v2 breezy themes having messed up pressed buttons. updated v2.1 breezy
themes to have derived colors instead of fixed ones.
2020-02-12 00:46:48 +02:00
Henry Jameson
e6f148b8a3 removed base16-related code 2020-02-11 00:59:07 +02:00
xenofem
36e19128bf Indicate whether collapsed statuses contain gallery media or link preview cards 2020-02-08 13:15:09 -05:00
Henry Jameson
8462853269 update button toggled state, apply it to emoji reactions 2020-01-28 22:40:15 +02: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
53a15eec7d add theme to list 2020-01-28 01:31:37 +02:00
Henry Jameson
526b43eba6 Kenomo (see: #624) theme. Ability to define link color for post contents. Fixes 2020-01-28 01:29:20 +02:00
Henry Jameson
7c074b8741 fix rgba css generation, add some tests to automatically verify that themes are
generated properly
2020-01-27 04:20:13 +02:00
Henry Jameson
b96993e4dd improved selectedMenu again 2020-01-24 00:36:32 +02:00
Henry Jameson
644ce497a0 lightBg -> highlight because it causes issues with v2 2020-01-22 01:28:46 +02:00
Henry Jameson
6e1c538e41 multiple fixes to make style switcher not die. Made shadows work, incuding compatibility 2020-01-20 01:31:54 +02:00
Henry Jameson
1f5ada08c1 themes update 2020-01-16 23:29:19 +02:00
Henry Jameson
9af0042452 updated breezy theme 2020-01-13 02:02:40 +02:00
Henry Jameson
f31ed7e5a8 remove snapshot data from breezy 2020-01-12 03:53:08 +02:00
Sierra
ae2ae00d41 Add AMOLED dark theme 2020-01-07 21:13:51 +00: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
4bb1c98e0f Replaced v3compat with source to reduce code complexity. Made more slots
customizable. `theme` now contains a snapshot of theme generated for better
compatiblity and future-proofing
2020-01-02 20:36:10 +02:00
Henry Jameson
332d31dc02 support for "transparent" color keyword 2019-12-30 00:45:48 +02:00
Henry Jameson
e5a34870f0 Accent works 2019-12-28 15:55:42 +02:00
taehoon
7fa294f11c add icons to nav panel 2019-12-12 10:42:27 -05:00
kPherox
6af870cd90
Add view for moves notifications 2019-12-11 00:00:45 +09:00
taehoon
afd4524c39 use another approach for versioning font files 2019-12-03 10:32:46 -05:00
taehoon
0082ed837e versioning the font resources through webpack 2019-12-02 10:24:43 -05:00
Ariadne Conill
1946661911 update terms of service instructions 2019-11-09 00:27:09 -06:00
kaniini
326b2416a0 Merge branch 'develop' into 'develop'
Make mammal theme look more like gargsite

See merge request pleroma/pleroma-fe!802
2019-11-08 01:33:50 +00:00
taehoon
57fedd63ca add gauge icon 2019-10-01 07:36:41 -04:00
Henry Jameson
db086fe1fd Merge remote-tracking branch 'upstream/develop' into emoji-selector-update
* upstream/develop: (116 commits)
  Password reset page
  add a comment
  force img updating immediately
  Fixed "sequimiento" to "seguimiento".
  Replace `/api/externalprofile/show.json` with a MastoAPI equialent
  Use mastodon api in follow requests
  "Optional" in lowercase.
  Update es.json
  fix pin/unpin status logic
  rename a mutation
  update
  fix user avatar fallback logic
  remove dead code
  Corrected "Media Proxy" translation.
  Update es.json
  make bio textarea resizable vertically only
  remove dead code
  Make image orientation consistent on FF, fix videos w/ modal
  remove dead code
  fix crazy watch logic in conversation
  ...
2019-09-08 13:44:29 +03:00
Sergey Suprunenko
d74f6ed6ea Initialize chat only if user is logged in and it wasn't initialized before 2019-08-17 08:18:42 +00:00
taehoon
1e613ae9b3 add zoom-in icon 2019-07-28 21:05:13 -04:00
Henry Jameson
03c2f29b0a cleanup and appropriation for new emoji-input component API, styles updates 2019-07-28 16:07:01 +03:00
Henry Jameson
b3aff9bbae Merge remote-tracking branch 'upstream/develop' into emoji-selector-update
* upstream/develop: (469 commits)
  Feature/add sticker picker
  guard more secure routes
  guard secure routes by redirecting to root
  closest can returns itself as well
  find inside status-content div only
  try to use the closest a tag as target
  Update es.json
  Also apply keyword filter to subjects
  Remove files I accidentally pushed in
  fix issues caused by merges in usersearch on @
  Add user search at
  fix eslint warnings
  remove vue-popperjs
  fix moderation menu partially hidden by usercard boundary
  migrate popper css
  rewrite ModerationTools using v-tooltip
  make popover position for status action dropdow relative to parent node
  rewrite ExtraButtons using v-tooltip
  install v-tooltip
  i18n/Update pedantic Japanese translation
  ...
2019-07-28 13:30:29 +03:00
shpuld
9c2c00992d Remove files I accidentally pushed in 2019-07-18 17:25:06 +03:00
shpuld
619608ea7a fix issues caused by merges in usersearch on @ 2019-07-18 17:22:51 +03:00
taehoon
57c5d269b8 add bell-ringing icon 2019-07-11 12:52:05 -04:00
taehoon
81d1d30586 revert font change 2019-07-10 21:01:08 -04:00
taehoon
e503243be3 add bell-off font icon 2019-07-10 21:01:08 -04: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
marcin mikołajczak
08aa9e2903 Remove fonts section, make buttons change color on hover/press 2019-05-20 14:46:25 +00:00
=
fd1d318540 Make mammal theme look more like gargsite
Signed-off-by: = <=>
2019-05-20 15:29:02 +02:00
taehoon
98358d30bb update font 2019-05-15 12:04:26 -04:00
dave
80ef855a63 #468 - add ellipsis font icon 2019-05-15 12:04:25 -04:00
dave
b491e6acbe #468 - add pin icon 2019-05-15 12:04:24 -04:00
Brenden Bice
d6be4fd921 rebuild fontello with wrench icon added
# Conflicts:
#	static/font/css/fontello-codes.css
#	static/font/css/fontello-embedded.css
#	static/font/css/fontello-ie7-codes.css
#	static/font/css/fontello-ie7.css
#	static/font/css/fontello.css
#	static/font/demo.html
#	static/font/font/fontello.eot
#	static/font/font/fontello.svg
#	static/font/font/fontello.ttf
#	static/font/font/fontello.woff
#	static/font/font/fontello.woff2
2019-04-19 13:20:02 -04:00
jared
093f0b23f7 #101 - merge develop 2019-04-05 14:08:13 -04:00
jared
79efe0646c merge develop 2019-04-02 10:53:33 -04:00
shpuld
46de457f50 Merge branch 'develop' into feature/mobile-improvements-3 2019-04-01 22:42:06 +03:00
Henry Jameson
0792732822 final touches 2019-03-30 12:42:42 +02: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
jared
2ee8d21366 #101 - update emoji with fontello icon 2019-03-29 16:34:59 -04:00
shpuld
7ce8fe9214 merge develop, add mobile nav component 2019-03-12 23:50:54 +02:00
taehoon
d8e938bb5e Update user settings icon to pencil 2019-03-11 11:52:49 -04:00
Henry Jameson
6184c88ac7 Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode 2019-03-03 15:45:17 +02:00
Aditoo17
93f5f94698 I18n: Add Czech translation 2019-03-02 18:25:49 +01:00
shpuld
1d3b1ac934 start working on one tap notifications 2019-03-02 16:57:32 +02:00
Lidar
ce81a5f72e Deleted static/bg2.jpg, static/bgalt.jpg files 2019-02-09 16:26:54 +00:00
jasper
92874b6902 Fxing conflicts 2019-02-08 13:13:11 -08:00
jasper
70c05a0c08 Fix showFeaturesPanel option as instance 2019-02-08 12:17:14 -08:00
Shpuld Shpludson
85e281d406 Merge branch 'feature/add-an-option-for-a-default-formatting' into 'develop'
#301 - add an option for a default formatting

See merge request pleroma/pleroma-fe!541
2019-02-07 15:55:54 +00:00
dave
012ce7bad2 #137 - clean up emoji list 2019-02-07 10:29:23 -05:00
dave
997c99e45d #137 - add red heart emoji 2019-02-07 06:26:51 -05:00
Xiaofeng An
460976c6e5 #301 - add an option for default formatting 2019-02-06 14:26:46 -05:00
shpuld
a8c6b3f538 Change video playing default without bothering making it an instance configurable 2019-01-31 21:19:41 +02:00
shpuld
676acdbf82 Add default config for new options, fix firefox inline playing 2019-01-26 17:59:59 +02:00
shpuld
0ab828bb30 Merge develop and fix conflict 2019-01-26 17:50:41 +02:00
Henry Jameson
ac64e90898 fix custom nsfwCensorImage not working 2019-01-23 00:15:24 +03:00
shpuld
8761e039d0 Merge dev fix conflicts 2019-01-20 15:52:35 +02:00
shpuld
485a061287 Polish for videos, smaller sizes, remove gif-looping options 2019-01-20 12:46:11 +02:00
nik
aed7c7096e update logo 2019-01-18 22:17:38 -06:00
HJ
a974d2ab85 Merge branch 'scope-copy-default' into 'develop'
scopeCopy → true by default

See merge request pleroma/pleroma-fe!439
2018-12-30 15:12:03 +00:00
lambda
1555a5fef3 Merge branch 'restore-routes' into 'develop'
Restore old routes, enable user route as fallback.

See merge request pleroma/pleroma-fe!440
2018-12-29 13:27:59 +00:00
Maxim Filippov
85c487b933 Make "noAttachmentLinks" configurable 2018-12-27 13:25:11 +03:00
scarlett
f2f7e2e766 scopeCopy → true by default 2018-12-25 17:44:05 +00:00
Lambda
24eba26c5b Restore old routes, enable user route as fallback. 2018-12-25 18:43:52 +01:00
Henry Jameson
d0b47488fb default webPush to false, because having it at true leads to some problems with
local dev mode. Instances can re-enable it, and BE can default it to true in config.exs
2018-12-20 09:17:51 +03:00
Maxim Filippov
2211c533dd Merge branch 'develop' into feature/new-user-routes 2018-12-17 02:39:37 +03:00
Henry Jameson
bd745543b6 Merge remote-tracking branch 'upstream/develop' into search-mobile-fixes
* upstream/develop: (176 commits)
  fix chrome
  Prevent html-minifier to remove placeholder comment in index.html template
  Add placeholder to insert server generated metatags. Related to #430
  added condition to check for logined user
  fix gradients and minor artifacts
  keep track of new instance options
  fix old MR
  oof
  get rid of slots
  fix timeago font
  added hide_network option, fixed properties naming
  Fix fetching new users, add storing local users in usersObjects with their screen_name as well as id, so that they could be fetched zero-state with screen-name link.
  improve notification subscription
  Fix typo that prevented scope copy from working.
  Refactor arrays to individual options
  Reset enableFollowsExport to true after 2 sec when an export file is available to download
  added check for activatePanel is function or not
  addressed PR comments
  activate panel on user screen click
  added not preload check so hidden toggles asap
  ...
2018-12-14 17:10:26 +03:00