Commit Graph

140 Commits

Author SHA1 Message Date
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
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