sjw/pleroma-fe
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma-fe.git synced 2024-12-22 14:19:35 +01:00
Code Issues Releases Wiki Activity
8,473 Commits 159 Branches 3 Tags 444 MiB
3fd24e77f1
Commit Graph

452 Commits

Author SHA1 Message Date
Your New SJW Waifu
cbd2fc6d0a Add android 10 dark 2020-05-25 11:54:36 +00:00
Your New SJW Waifu
3088859a58 Rename android-10-dark.json 2020-05-25 11:50:38 +00:00
Your New SJW Waifu
60148ce653 Add name to android-10-dark-theme.json 2020-05-25 11:49:40 +00:00
Your New SJW Waifu
8d5152dfbf Android 10 dark theme 2020-05-25 11:47:25 +00:00
Your New SJW Waifu
4ed77453d6 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-05-20 23:00:42 -05:00
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
Your New SJW Waifu
a70741f99b greentext and stuff 2020-05-14 07:06:28 -05:00
Your New SJW Waifu
0e5f2a170a Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-05-13 21:58:09 -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
Your New SJW Waifu
c4e091f969 Revert "Revert "Merge remote-tracking branch 'upstream/develop' into neckbeard"" 
This reverts commit 07e9ce3d08.
 2020-05-08 20:01:59 -05:00
Your New SJW Waifu
07e9ce3d08 Revert "Merge remote-tracking branch 'upstream/develop' into neckbeard" 
This reverts commit 4250541faf
 2020-05-09 00:58:11 +00:00
Your New SJW Waifu
4250541faf Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-05-08 17:38:09 -05:00
Shpuld Shpludson
f4676e17d3 Merge branch 'develop' into 'feature/copy-link' 
# Conflicts:
#   static/fontello.json
 2020-05-08 08:20:03 +00:00
Your New SJW Waifu
8bd8b97d14 New banner URL 2020-05-06 23:20:16 +00:00
Your New SJW Waifu
6f17bf8a45 new stickers 2020-05-06 09:58:28 -05:00
Your New SJW Waifu
550d75a61e commas are a fuck 2020-05-04 14:23:48 -05:00
Your New SJW Waifu
955e7ec49a new stickers 2020-05-04 14:09:23 -05:00
Your New SJW Waifu
74ac1e46b6 new sticker 2020-05-04 13:47:32 -05:00
Your New SJW Waifu
e68cc2954e new sticker 2020-05-04 13:26:37 -05:00
Your New SJW Waifu
a60475f3d7 Fixed stickers 2020-05-04 13:19:26 -05:00
Your New SJW Waifu
73b613dbb0 New stickers 2020-05-04 13:12:08 -05:00
Your New SJW Waifu
0361a4b308 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-05-02 10:56:17 -05:00
eugenijm
01b07f01e9 Add support for follow request notifications 2020-04-30 09:58:55 +03:00
Your New SJW Waifu
0a6611c10e added @Hydnellum@sunrisesunset.shop's theme 2020-04-27 20:22:57 -05:00
Your New SJW Waifu
a001bcaa5c New banner by @nosleep 2020-04-20 13:55:37 +00:00
Your New SJW Waifu
177b8faa7f loli dance 2020-04-14 19:11:50 -05:00
Your New SJW Waifu
c83718ebed Fixed typo 2020-04-14 17:43:10 -05:00
Your New SJW Waifu
0306fd750f Added @jasonl8446's theme 2020-04-14 17:24:53 -05:00
Your New SJW Waifu
44f122a1aa Added alts to 500 page 2020-04-08 12:39:48 -05:00
Your New SJW Waifu
291e49d74d Added works_on_my_machine sticker 2020-04-07 11:49:44 -05:00
Your New SJW Waifu
b5de0739de Use original jpeg instead of png 2020-04-06 20:39:31 -05:00
Your New SJW Waifu
a676e07628 Added based sticker 2020-04-03 11:50:43 -05:00
Your New SJW Waifu
94f7a0a407 Better stickers and stuff 2020-04-03 03:35:37 -05:00
Your New SJW Waifu
c854ab9a0a Case sensitive bs 2020-04-03 03:11:24 -05:00
Your New SJW Waifu
291c720ce9 Added lick sticker 2020-04-03 03:05:55 -05:00
Your New SJW Waifu
377c2d502f Added pathetic sticker 2020-04-03 00:57:59 -05:00
Your New SJW Waifu
f8210747b3 Update name from H.M.S. Neckbeard to Neckbeard.xyz 2020-04-02 13:15:50 -05:00
Your New SJW Waifu
d010550f0b Cleaned up config 2020-04-01 22:38:03 -05:00
Your New SJW Waifu
24723f6b00 Updated 500 page and added static link to key 2020-04-01 22:33:26 -05:00
Your New SJW Waifu
0d506f321f Move CSS to internal, remove no function JS, and other improvments to 500 error page. 2020-04-01 20:17:31 -05:00
Mark Felder
8c5946b728 Add button in 3dot menu to copy status link to clipboard 2020-03-30 12:39:28 -05:00
Your New SJW Waifu
a0198324a7 Updated upload limit 2020-03-29 12:37:28 -05:00
Your New SJW Waifu
21ae5fb0c2 Added new stickers 2020-03-26 01:28:18 -05:00
Your New SJW Waifu
e750cce603 New banner by @VD15@fedi.valkyrie.world and new banner link 2020-03-25 15:30:11 -05:00
Your New SJW Waifu
ba936d1600 Revert "New banner and updated favicons" 
This reverts commit 5777c9c844
 2020-03-25 18:12:09 +00:00
Your New SJW Waifu
5777c9c844 New banner and updated favicons 2020-03-25 12:46:03 -05:00
Your New SJW Waifu
643abb5abc New banner and link 2020-03-19 21:53:42 -05:00
Your New SJW Waifu
354b2da2cf New NSFW image 2020-03-19 11:50:30 -05:00
Your New SJW Waifu
a15a68aac7 Jojo did nothing wrong 2020-03-10 23:41:03 -05:00
Your New SJW Waifu
4520b81b8b Made the T in the lowercase 2020-03-09 19:02:13 -05:00
Your New SJW Waifu
31401f483d Added rule about Jojo and cleaned up rule list html 2020-03-09 18:59:49 -05:00
Your New SJW Waifu
c58e49d701 Add mods 2020-03-09 16:13:53 -05:00
Your New SJW Waifu
9e7eda4b80 Updated upload size limit on about page 2020-02-29 08:41:35 -06:00
Your New SJW Waifu
46a8533710 updates to neckbeard 2020-02-29 08:30:52 -06:00
Your New SJW Waifu
b44761167f Add pgp key download link 2020-02-26 11:08:56 -06:00
Your New SJW Waifu
77a036d448 Update pgp 2020-02-26 10:57:34 -06:00
Your New SJW Waifu
9d72876522 Move error pages to fe 2020-02-25 16:56:07 -06: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
Your New SJW Waifu
32358b8abd Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-02-20 19:59:08 -06: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
Hakaba Hitoyo
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
Your New SJW Waifu
6c38e9549f Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-02-11 02:46:55 -06: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
Your New SJW Waifu
1edd089a1b Change banner and banner link 2020-02-05 18:06:24 -06:00
Your New SJW Waifu
63556f2205 New banners by Lumeinshin 2020-02-05 18:01:33 -06: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
Your New SJW Waifu
485d3d2df5 Cleaned up donation on /about 2020-01-15 22:35:43 -06:00
Henry Jameson
9af0042452 updated breezy theme 2020-01-13 02:02:40 +02:00
Your New SJW Waifu
2cf1452856 New default theme 2020-01-12 16:16:29 -06:00
Your New SJW Waifu
d431bef005 Add more themes 2020-01-12 16:08:46 -06:00
Your New SJW Waifu
f64c35e63e New background. 2020-01-12 14:56:44 -06:00
Henry Jameson
f31ed7e5a8 remove snapshot data from breezy 2020-01-12 03:53:08 +02:00
Your New SJW Waifu
027ecda6d8 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-01-11 19:01:38 -06: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
Your New SJW Waifu
d29b0dc497 Even better banner by @VD15@fedi.valkyrie.world 2019-12-31 21:04:30 -06:00
Your New SJW Waifu
47bbd4c067 New better banner by @maxmustermann@shitposter.club 2019-12-31 20:56:20 -06:00
Your New SJW Waifu
6d8171f06e Forgot the banner 2019-12-31 19:03:32 -06:00
Your New SJW Waifu
84ba4dd535 Update banner for 2020 2019-12-31 18:51:36 -06: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
Your New SJW Waifu
1371fc8eb1 Merge remote-tracking branch 'upstream/develop' into develop 2019-12-15 02:20:35 -06: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
Your New SJW Waifu
4e2c81ba2c Birthday over back to christmas 2019-12-05 01:12:37 -06:00
Your New SJW Waifu
78bae97994 Happy birthday to me! Added banner by ddeevviiaanntt and changed link. 2019-12-04 00:24:06 -06: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
Your New SJW Waifu
17265f65c9 Change reactions name 2019-11-24 18:57:16 -06:00
Your New SJW Waifu
153cf0a03c Add another christmas background 2019-11-24 18:43:41 -06:00
Your New SJW Waifu
04c3125028 Add another christmas background 2019-11-24 18:38:35 -06:00
Your New SJW Waifu
0e3d67ce48 Remove tall ass image for now 2019-11-24 18:26:04 -06:00
Your New SJW Waifu
22265f47bf Fix typo 2019-11-24 18:24:23 -06:00
Your New SJW Waifu
1508b44ca9 Add christmas background 2019-11-24 17:58:18 -06:00
Your New SJW Waifu
eb78126559 Add stickers 2019-11-24 17:30:28 -06:00
Your New SJW Waifu
e4cc314b0f Don't crop attachments 2019-11-24 16:51:10 +00:00
Your New SJW Waifu
3442020d1b Revert "Change formatting" 
This reverts commit ef1143db8d
 2019-11-24 16:37:16 +00:00
Your New SJW Waifu
ef1143db8d Change formatting 2019-11-24 16:34:19 +00:00
Your New SJW Waifu
07b28d79ae Add more compressed waste_collection and use it for background 2019-11-23 12:11:40 -06:00
Your New SJW Waifu
8f0051cab6 Change background and test serving background, logo and nsfw warning from /media/ 2019-11-22 23:10:08 -06:00
Your New SJW Waifu
97c7e993f7 Update config.json 2019-11-21 18:36:05 +00:00
Your New SJW Waifu
3743ad175d Update styles.json 2019-11-21 18:35:08 +00:00
Your New SJW Waifu
65b5073564 Change default theme to Electra 2019-11-21 18:12:29 +00:00
Your New SJW Waifu
0cbf3e249a Enable greentext by default 2019-11-21 18:08:40 +00:00
Your New SJW Waifu
1e7f82a15c Hide posts from muted users by default 2019-11-21 18:07:24 +00:00
Your New SJW Waifu
cb696117df Switch to new banner by VD-15 with bevel by Deviant and update banner link to PADORU.EXE 2019-11-17 11:20:25 -06:00
Your New SJW Waifu
a63adc203b Upload Christmas banner with bevel by ddeevviiaanntt 2019-11-17 17:16:20 +00:00
Your New SJW Waifu
d27be8b59f Upload Christmas banner 2019-11-17 04:15:37 +00:00
Your New SJW Waifu
0e3d34cbe8 Merge remote-tracking branch 'upstream/develop' into develop 2019-11-09 04:50:33 -06: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
Your New SJW Waifu
31cd56da2e New banner by @rawrrawrfox@pl.smuglo.li and subscribe to PewDiePie 2019-11-01 13:00:32 -05:00
Your New SJW Waifu
66bcaa1578 Add halloween banner and hyperlink 2019-10-30 13:50:11 -05:00
Your New SJW Waifu
cb568e1574 Add Electra theme 2019-10-26 00:57:06 -05:00
Your New SJW Waifu
114f3e1ee9 wrong extension 2019-10-15 04:12:11 +00:00
Your New SJW Waifu
3dbd8acb98 New background 2019-10-14 16:15:46 -05:00
Your New SJW Waifu
a0aaedd845 Open in new tab 2019-10-08 12:06:13 -05:00
Your New SJW Waifu
0696b145eb hyperlink fix 2019-10-08 11:49:48 -05:00
Your New SJW Waifu
6d20a59aba new banner image, automatic banner updates courtesy of @moonman 2019-10-08 10:13:07 -05:00
Your New SJW Waifu
bb413c3bff Forgot to add new files 2019-10-03 12:56:17 -05:00
Your New SJW Waifu
75ba90a276 Merge remote-tracking branch 'upstream/develop' into develop 2019-10-03 12:52:00 -05:00
taehoon
57fedd63ca add gauge icon 2019-10-01 07:36:41 -04:00
Your New SJW Waifu
4319a9f7f8 Merge remote-tracking branch 'upstream/develop' into develop 2019-09-26 05:52:11 -05:00
Your New SJW Waifu
4cfae8f4c6 Switching to config.json 2019-09-12 15:17:18 +00:00
Your New SJW Waifu
aefd7bd94f Use new background 2019-09-12 14:52:54 +00:00
Your New SJW Waifu
69ce23125c Add new background 2019-09-12 14:49:48 +00:00
Your New SJW Waifu
00ff8c6ce9 Fixed typo 2019-09-09 17:26:52 +00: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
Your New SJW Waifu
36d3910f44 Add panda 2019-09-07 22:14:27 +00:00
Your New SJW Waifu
2a57578b28 Update terms-of-service.html 2019-09-07 19:58:53 +00:00
Your New SJW Waifu
5a33ebf3b2 Custom background 2019-09-03 21:26:36 +00:00
Your New SJW Waifu
4fc58f4fa6 Custom background 2019-09-03 21:26:19 +00:00
Your New SJW Waifu
43c6ffae63 Custom background 2019-09-03 21:25:58 +00:00
Your New SJW Waifu
ad8dfb6948 Update config.json 2019-09-03 21:23:00 +00:00
Your New SJW Waifu
050b9f4964 Upload custom nsfw image 2019-09-03 21:21:46 +00:00
Your New SJW Waifu
31bf1dcb26 Add new directory for NSFW image 2019-09-03 21:20:52 +00:00
Your New SJW Waifu
d5905c5b48 Update config.json 2019-09-03 19:05:54 +00:00
Your New SJW Waifu
4e7fafa156 Added NB ToS 2019-09-03 18:57:47 +00:00
Your New SJW Waifu
4e4efae6ff Added custom themes 2019-09-03 18:53:50 +00:00
Your New SJW Waifu
5e4e213668 Add new file 2019-09-03 18:52:34 +00:00
Your New SJW Waifu
2517359717 Add new file 2019-09-03 18:51:36 +00:00
Your New SJW Waifu
254dda819e Add new file 2019-09-03 18:50:43 +00: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