Commit graph

245 commits

Author SHA1 Message Date
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
Henry Jameson
75bdeab0a0 Merge branch 'streaming' into shigusegubu
* streaming: (51 commits)
  toggle_activation api is also deprecated
  use vuex action
  refactor toggleActivationStatus
  replace setActivationStatus api with new one
  use flex for stickers
  i18n/update-ja_easy
  Use a centralized fallback for missing values and use instance.federating instead of instance.federation.enabled
  Add fallback in case BE does not report federating status in nodeinfo
  The value we are looking for is federationPolicy.enabled, not federationPolicy.federating
  Logic should be to hide TWKN if not federating OR if instance is not public
  Finally trust eslint
  More lint
  More lint
  Lint
  mfa: removed unused code
  increase icon width a little bit in the nav panel
  add icons to nav panel
  Revert "Merge branch 'revert-96cab6d8' into 'develop'"
  Support "native" captcha
  Revert "Merge branch 'oauth-extra-scopes' into 'develop'"
  ...
2019-12-26 13:21:53 +02:00
taehoon
7fa294f11c add icons to nav panel 2019-12-12 10:42:27 -05:00
Henry Jameson
b6b7bc5852 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (24 commits)
  Remove whitespace hack on empty post content
  Change output directory of fontello
  add html-webpack-plugin to karma config
  use another fork of fontello-webpack-plugin
  add animate-spin class
  remove needless code
  use another approach for versioning font files
  versioning the font resources through webpack
  fix "can't find property of undefined" errors in mrf transparency panel
  move mention button right next to mute button
  restore muted users collapsing logic on other user’s profiles
  [i18n] Improve easy/pedantic Japanese switching
  Normalize profile fields
  backend interactor service: implement startFetchingFollowRequest
  show badge visibility user setting checkbox only if needed
  Use kana+kanji as default for Japanese translation
  Remove outdated changelog file
  Fix translation (https://blob.cat/notice/9oyYO1RzcNbJXxKxeq)
  use yarn, try to restart pipeline
  tests + updates
  ...
2019-12-10 23:08:45 +02: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
Henry Jameson
45a1d30bd6 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (29 commits)
  add hideISP to defaultState of config module
  add changelog entry
  mrf transparency panel: refactor to use vuex mapState
  mrf transparency panel: remove unneeded components{}
  boot: cleanup resolveStaffAccounts
  lint
  about: add MRF transparency panel
  about: add staff panel
  about page: fix hiding of instance-specific panel, flow ToS and ISP better
  nav panel: add link to about page
  redirect /remote-users/:username@:hostname -> /users/:id, /remote-users/:hostname/:username -> /users/:id
  clear filter on reopen, fix error message in console
  reset position when reopening emoji picker
  eslint fix
  fix not being able to see unicode emojis when there few of them when searching on emoji-a-ton instances
  replace sanity button with loading on scroll
  fix search not working, use computer property instead of state
  fix eslint warnings
  Lightbox/modal multi image improvements - #381
  '/api/pleroma/profile/mfa' -> '/api/pleroma/accounts/mfa'
  ...
2019-11-11 00:26:13 +02: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
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
taehoon
57fedd63ca add gauge icon 2019-10-01 07:36:41 -04:00
Henry Jameson
9ba987dc95 Merge branch 'emoji-selector-update' into shigusegubu
* emoji-selector-update: (24 commits)
  fix aspect
  Apply suggestion to src/components/emoji_input/emoji_input.js
  scale emoji on hover
  added emoji zoom for picker
  fixed scroll when switching back to emoji
  fixed some bugs, added spam mode, minor collateral fixes
  fixed a lot of bugs with emoji picker, improved relevant components
  initial attempts at making emoji-picker somewhat extensible
  rename for consistency
  linting
  cleanup and appropriation for new emoji-input component API, styles updates
  rename emoji-selector to emoji-picker
  post-merge fix
  #101 - remove unused code
  #101 - bind outside click, add emoji to post status form
  #101 - click outside of emoji implementation
  #101 - update caret pos after emoji's inserted
  #101 - bind scroll event, highlight relevent section by tabs
  #101 - update hard-coded server url
  merge develop
  ...
2019-09-08 17:12:42 +03:00
Henry Jameson
1a9ee23ec2 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (83 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 17:12:11 +03: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
Henry Jameson
cf22cf778c Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (33 commits)
  fix js error on mute
  Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
  Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
  Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
  Fix sent follow request detection
  fix english settings label regarding how to view videos
  fix extra buttons merge bug
  make size of gif image and preview equal
  css improvements
  do not unmount post status modal in desktop
  hide rich media preview image in case of broken image
  Handle JSONified errors while registering
  Focus on the search input when the search icon is clicked
  prevent scrolling top when click search input
  add zoom-in indication to avatar
  add zoom-in icon
  allow zooming avatar in profile panel header
  use $route instead of $router.currentRoute
  enlarge avatar in profile page
  update unit test
  ...
2019-08-11 18:48:33 +03: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
Henry Jameson
bbcd3190f2 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (57 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-25 13:05:59 +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
Henry Jameson
9f8b0ce5e1 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  Feature/polls attempt 2
  Update translation with review comments
  Update file with current en.json
  Update fr.json added missing ,
  Update fr.json stoped at line 134, more to do below
2019-06-18 23:45:28 +03:00
lain
0eed2ccca8 Feature/polls attempt 2 2019-06-18 20:28:31 +00:00
Henry Jameson
cda2d6cb20 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  review
  review
  Update emoji-input.js
  Misc fixes: Fix uploads stretching on chrome, fix warnings in console
  apply font smoothing in webkit and firefox
  fix user search
  Apply suggestion to src/services/backend_interactor_service/backend_interactor_service.js
  properly position the caret after replacement
  Apply suggestion to src/services/api/api.service.js
  fix MFA crashing on user-settings page
  fixup! Removed formattingOptionsEnabled in favor of relying on BE-provided list of accepted formatting options
  getting and setting user background via MastoAPI
  Removed formattingOptionsEnabled in favor of relying on BE-provided list of accepted formatting options
  fix small annoyance
  fixed some bugs i found, also cleaned up some stuff + documentation
  self-review
  Linting
2019-06-18 22:27:15 +03: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
30a89201ca Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (59 commits)
  Fix pipelines and clean up console output
  switch from method to computed property
  formatting
  add tags to data and to status component
  Remove auto-hyphenation
  make staff label visible
  move visibility-tray css in local scope
  refactor css
  make only screen name as link
  refactor css for visibility tray
  moved setting styles into common to avoid bug with shared styles
  hide three dot menu button if has no items
  Eliminate automatic zooming on mobile
  entity normalizer: add tooltip text to emojis
  rename for consistency's sake
  update admin api urls in accordance with new docs
  Line up rich text format picker with the status form
  fix lint
  Cleanup, little documentation, localization
  update api service functions
  ...
2019-05-22 21:02:58 +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
Henry Jameson
659ac384d5 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (85 commits)
  entity normalizer: hook up in_reply_to_account_acct
  add BBCode strings
  fix follow button not updating bug in follow-card
  refer searched user objects from the global user rep
  set max-width of textarea in settings page
  Remove space in the timeline setting copy
  user_card.vue: Fix .emoji to apply to img
  Update oc.json
  Update oc.json
  Update oc.json
  Update oc.json
  replace pencil with wrench icon
  rebuild fontello with wrench icon added
  fetch all friends using pagination
  stop fetching user relationship when user is unauthorized
  Revert "recover border between basic-user-card using list component"
  remove extra spacing
  code readability
  fix typos
  clean up
  ...
2019-04-28 18:23:40 +03: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