1371fc8eb1
Merge remote-tracking branch 'upstream/develop' into develop
2019-12-15 02:20:35 -06:00
7fa294f11c
add icons to nav panel
2019-12-12 10:42:27 -05:00
6af870cd90
Add view for moves notifications
2019-12-11 00:00:45 +09:00
4e2c81ba2c
Birthday over back to christmas
2019-12-05 01:12:37 -06:00
78bae97994
Happy birthday to me! Added banner by ddeevviiaanntt and changed link.
2019-12-04 00:24:06 -06:00
afd4524c39
use another approach for versioning font files
2019-12-03 10:32:46 -05:00
0082ed837e
versioning the font resources through webpack
2019-12-02 10:24:43 -05:00
17265f65c9
Change reactions name
2019-11-24 18:57:16 -06:00
153cf0a03c
Add another christmas background
2019-11-24 18:43:41 -06:00
04c3125028
Add another christmas background
2019-11-24 18:38:35 -06:00
0e3d67ce48
Remove tall ass image for now
2019-11-24 18:26:04 -06:00
22265f47bf
Fix typo
2019-11-24 18:24:23 -06:00
1508b44ca9
Add christmas background
2019-11-24 17:58:18 -06:00
eb78126559
Add stickers
2019-11-24 17:30:28 -06:00
e4cc314b0f
Don't crop attachments
2019-11-24 16:51:10 +00:00
3442020d1b
Revert "Change formatting"
...
This reverts commit ef1143db8d
2019-11-24 16:37:16 +00:00
ef1143db8d
Change formatting
2019-11-24 16:34:19 +00:00
07b28d79ae
Add more compressed waste_collection and use it for background
2019-11-23 12:11:40 -06:00
8f0051cab6
Change background and test serving background, logo and nsfw warning from /media/
2019-11-22 23:10:08 -06:00
97c7e993f7
Update config.json
2019-11-21 18:36:05 +00:00
3743ad175d
Update styles.json
2019-11-21 18:35:08 +00:00
65b5073564
Change default theme to Electra
2019-11-21 18:12:29 +00:00
0cbf3e249a
Enable greentext by default
2019-11-21 18:08:40 +00:00
1e7f82a15c
Hide posts from muted users by default
2019-11-21 18:07:24 +00:00
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
a63adc203b
Upload Christmas banner with bevel by ddeevviiaanntt
2019-11-17 17:16:20 +00:00
d27be8b59f
Upload Christmas banner
2019-11-17 04:15:37 +00:00
0e3d34cbe8
Merge remote-tracking branch 'upstream/develop' into develop
2019-11-09 04:50:33 -06:00
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
31cd56da2e
New banner by @rawrrawrfox@pl.smuglo.li and subscribe to PewDiePie
2019-11-01 13:00:32 -05:00
66bcaa1578
Add halloween banner and hyperlink
2019-10-30 13:50:11 -05:00
cb568e1574
Add Electra theme
2019-10-26 00:57:06 -05:00
114f3e1ee9
wrong extension
2019-10-15 04:12:11 +00:00
3dbd8acb98
New background
2019-10-14 16:15:46 -05:00
a0aaedd845
Open in new tab
2019-10-08 12:06:13 -05:00
0696b145eb
hyperlink fix
2019-10-08 11:49:48 -05:00
6d20a59aba
new banner image, automatic banner updates courtesy of @moonman
2019-10-08 10:13:07 -05:00
bb413c3bff
Forgot to add new files
2019-10-03 12:56:17 -05:00
75ba90a276
Merge remote-tracking branch 'upstream/develop' into develop
2019-10-03 12:52:00 -05:00
57fedd63ca
add gauge icon
2019-10-01 07:36:41 -04:00
4319a9f7f8
Merge remote-tracking branch 'upstream/develop' into develop
2019-09-26 05:52:11 -05:00
4cfae8f4c6
Switching to config.json
2019-09-12 15:17:18 +00:00
aefd7bd94f
Use new background
2019-09-12 14:52:54 +00:00
69ce23125c
Add new background
2019-09-12 14:49:48 +00:00
00ff8c6ce9
Fixed typo
2019-09-09 17:26:52 +00:00
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
36d3910f44
Add panda
2019-09-07 22:14:27 +00:00
2a57578b28
Update terms-of-service.html
2019-09-07 19:58:53 +00:00
5a33ebf3b2
Custom background
2019-09-03 21:26:36 +00:00
4fc58f4fa6
Custom background
2019-09-03 21:26:19 +00:00
43c6ffae63
Custom background
2019-09-03 21:25:58 +00:00
ad8dfb6948
Update config.json
2019-09-03 21:23:00 +00:00
050b9f4964
Upload custom nsfw image
2019-09-03 21:21:46 +00:00
31bf1dcb26
Add new directory for NSFW image
2019-09-03 21:20:52 +00:00
d5905c5b48
Update config.json
2019-09-03 19:05:54 +00:00
4e7fafa156
Added NB ToS
2019-09-03 18:57:47 +00:00
4e4efae6ff
Added custom themes
2019-09-03 18:53:50 +00:00
5e4e213668
Add new file
2019-09-03 18:52:34 +00:00
2517359717
Add new file
2019-09-03 18:51:36 +00:00
254dda819e
Add new file
2019-09-03 18:50:43 +00:00
d74f6ed6ea
Initialize chat only if user is logged in and it wasn't initialized before
2019-08-17 08:18:42 +00:00
1e613ae9b3
add zoom-in icon
2019-07-28 21:05:13 -04:00
03c2f29b0a
cleanup and appropriation for new emoji-input component API, styles updates
2019-07-28 16:07:01 +03:00
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
9c2c00992d
Remove files I accidentally pushed in
2019-07-18 17:25:06 +03:00
619608ea7a
fix issues caused by merges in usersearch on @
2019-07-18 17:22:51 +03:00
57c5d269b8
add bell-ringing icon
2019-07-11 12:52:05 -04:00
81d1d30586
revert font change
2019-07-10 21:01:08 -04:00
e503243be3
add bell-off font icon
2019-07-10 21:01:08 -04:00
0eed2ccca8
Feature/polls attempt 2
2019-06-18 20:28:31 +00:00
e3638af031
Removed formattingOptionsEnabled in favor of relying on BE-provided list of
...
accepted formatting options
2019-06-16 20:16:52 +03:00
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
98358d30bb
update font
2019-05-15 12:04:26 -04:00
80ef855a63
#468 - add ellipsis font icon
2019-05-15 12:04:25 -04:00
b491e6acbe
#468 - add pin icon
2019-05-15 12:04:24 -04:00
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
093f0b23f7
#101 - merge develop
2019-04-05 14:08:13 -04:00
79efe0646c
merge develop
2019-04-02 10:53:33 -04:00
46de457f50
Merge branch 'develop' into feature/mobile-improvements-3
2019-04-01 22:42:06 +03:00
0792732822
final touches
2019-03-30 12:42:42 +02:00
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
2ee8d21366
#101 - update emoji with fontello icon
2019-03-29 16:34:59 -04:00
7ce8fe9214
merge develop, add mobile nav component
2019-03-12 23:50:54 +02:00
d8e938bb5e
Update user settings icon to pencil
2019-03-11 11:52:49 -04:00
6184c88ac7
Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode
2019-03-03 15:45:17 +02:00
93f5f94698
I18n: Add Czech translation
2019-03-02 18:25:49 +01:00
1d3b1ac934
start working on one tap notifications
2019-03-02 16:57:32 +02:00
ce81a5f72e
Deleted static/bg2.jpg, static/bgalt.jpg files
2019-02-09 16:26:54 +00:00
92874b6902
Fxing conflicts
2019-02-08 13:13:11 -08:00
70c05a0c08
Fix showFeaturesPanel option as instance
2019-02-08 12:17:14 -08:00
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
012ce7bad2
#137 - clean up emoji list
2019-02-07 10:29:23 -05:00
997c99e45d
#137 - add red heart emoji
2019-02-07 06:26:51 -05:00
460976c6e5
#301 - add an option for default formatting
2019-02-06 14:26:46 -05:00
a8c6b3f538
Change video playing default without bothering making it an instance configurable
2019-01-31 21:19:41 +02:00
676acdbf82
Add default config for new options, fix firefox inline playing
2019-01-26 17:59:59 +02:00
0ab828bb30
Merge develop and fix conflict
2019-01-26 17:50:41 +02:00
ac64e90898
fix custom nsfwCensorImage not working
2019-01-23 00:15:24 +03:00
8761e039d0
Merge dev fix conflicts
2019-01-20 15:52:35 +02:00
Your New SJW Waifu
taehoon
kPherox
kaniini
Henry Jameson
Sergey Suprunenko
shpuld
lain
marcin mikołajczak
=
dave
Brenden Bice
jared
Aditoo17
Lidar
jasper
Xiaofeng An