Absturztaube
381c4e7f82
resolve merge conflicts
2020-12-29 13:00:48 +01:00
Henry Jameson
c197756767
Basic no-wallpaper support
2020-12-16 18:25:07 +02:00
Absturztaube
ad728d9046
resolve conflichts
2020-12-04 20:45:10 +01:00
Shpuld Shpuldson
767db567ad
update emoji.json, add script that merges new emoji from another source
2020-11-30 14:43:39 +02:00
Absturztaube
8065afc4d7
resolve merge conflicts
2020-11-08 14:04:17 +01:00
Henry Jameson
3db218dec1
change logo to svg
2020-11-02 19:37:01 +02:00
Henry Jameson
633349ddff
Refactor desktop navbar into a component, change layout to grid for
...
better compatibility with search field and simpler CSS
2020-10-29 22:54:28 +02:00
Absturztaube
a43623c5a5
Merge branch 'develop' into fedi-absturztau-be
2020-10-29 09:24:25 +01:00
Henry Jameson
1b50d700aa
bye bye fontello
2020-10-21 00:34:42 +03:00
Absturztaube
7a9bd70a09
Merge branch 'develop' into fedi-absturztau-be
2020-10-07 18:51:14 +02:00
Shpuld Shpuldson
20d33c2fbc
change icon to a megaphone
2020-09-16 11:53:54 +03:00
Absturztaube
7fa2dfecc6
Merge branch 'direct-conversations' of https://git.pleroma.social/eugenijm/pleroma-fe into direct-conversations
2020-07-08 19:16:44 +02:00
eugenijm
aa2cf51c05
Add Chats
2020-07-08 15:21:31 +03:00
Dym Sohin
1767ee01d0
corrected tos.html location
2020-07-07 19:34:45 +00:00
Shpuld Shpuldson
87b5f828d7
fix conflicts, use file icon instead of link, add support for audio and file icon in cw'd posts
2020-07-06 14:01:03 +03:00
Eugenij
de291e2e33
Add bookmarks
...
Co-authored-by: jared <jaredrmain@gmail.com>
2020-07-03 19:45:49 +00:00
Shpuld Shpuldson
96d2c86d3b
change placeholders to use descriptions, use icons with placeholders, change uploads to use attachment component
2020-06-29 14:48:22 +03:00
Henry Jameson
e4b18deece
fix redmond themes
2020-06-13 13:16:53 +03:00
lain
fd109fa355
Merge branch 'develop' into 'chore/improve-default-tos'
...
# Conflicts:
# static/terms-of-service.html
2020-06-12 14:17:56 +00:00
eugenijm
855f36eeda
wip
2020-05-29 09:43:52 +03:00
eugenijm
804cf3abc5
WIP: Chats
2020-05-29 09:43:52 +03:00
Henry Jameson
a6ca923a76
icons update
2020-05-25 16:10:43 +03: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
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
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
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
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