Thibaut Girka
9506d9cafc
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
conflicts caused by image URLs being different
- app/models/status.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
some strings were changed upstream
- spec/models/status_spec.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10 17:26:08 +02:00
Eugen Rochko
976d6f671c
Fix not showing if emoji has a local counterpart in admin UI ( #12135 )
...
Fix #12132
2019-10-10 02:21:52 +02:00
Thibaut Girka
129a2c1fc8
Fix upstream changes breaking because of glitch-soc's theming engine
2019-09-13 20:28:22 +02:00
ThibG
4ba49f14dc
Change /admin/custom_emoji to honor the auto_play_gif setting ( #11801 )
...
Fixes #9535
2019-09-10 20:56:07 +02:00
Eugen Rochko
25fb124ee6
Add batch actions and categories to admin UI for custom emojis ( #11793 )
2019-09-09 22:44:17 +02:00
Eugen Rochko
d3105031f8
Redesign forms, verify link ownership with rel="me" ( #8703 )
...
* Verify link ownership with rel="me"
* Add explanation about verification to UI
* Perform link verifications
* Add click-to-copy widget for verification HTML
* Redesign edit profile page
* Redesign forms
* Improve responsive design of settings pages
* Restore landing page sign-up form
* Fix typo
* Support <link> tags, add spec
* Fix links not being verified on first discovery and passive updates
2018-09-18 16:45:58 +02:00
beatrix
d9c2806048
keep the same filters and page when doing custom emojo stuff ( fixes #6112 ) ( #6114 )
2017-12-30 02:43:43 +01:00
Eugen Rochko
d6088c5308
Add filters to admin UI for custom emojis ( #6003 )
2017-12-13 13:28:31 +01:00
nullkal
19f82492ab
Show the local couterpart of emoji when it exists in /admin/custom_emojis ( #5467 )
...
* Show the local couterpart of emoji when it exists in admin/custom_emojis
* Fix indentation
* Fix error
* Add class table-action-link to Overwrite link
* Make it enable to overwrite emojis
* Make Code Climate happy
2017-11-07 14:49:32 +01:00
nullkal
0a9cc96cdc
Feature: Unlisted custom emojis ( #5485 )
2017-10-27 16:11:30 +02:00
KY
d4b9f821ca
Fix #5351 - Redirection with page params after copy emoji ( #5387 )
...
* Fix #5351 - Redirection with page params after copy emoji
* Add page params to copy emoji link
2017-10-14 14:40:10 +02:00
Eugen Rochko
b4af50c521
Improve admin UI for custom emojis, add copy/disable/enable ( #5231 )
2017-10-05 23:42:05 +02:00
Eugen Rochko
e9bb7e62b1
Admin interface for listing, adding and removing custom emojis ( #5002 )
...
* Admin interface for listing, adding and removing custom emojis
* Only display local ones in the list
2017-09-19 03:52:38 +02:00
