Age | Commit message (Collapse) | Author |
|
|
|
Port 2587fcdd27613e52d620e3c93bb089932be48db0 to glitch-soc
|
|
#7610) (#7613)
|
|
Merge upstream changes
|
|
ThibG/glitch-soc/features/fetch-relationships-on-search
[Glitch] Fetch relationships for search results in UI
|
|
Change notification cleaning checkbox color (fixes #511)
|
|
|
|
|
|
* Fix media upload reseting caret position to last inserted emoji
* Fix caret position after inserting suggestions (fixes #6089)
|
|
4d81809f36fcbfe787e23d490f2cb0ad943ab32c) (#7597)
|
|
|
|
|
|
|
|
|
|
|
|
* i18n: (zh-CN) #7027
* Rewording
This placeholder is also seen on single user page at Moderation > Accounts, where "this report" doesn't make sense.
* i18n: (zh-CN) #6425
* i18n: (zh-CN) #6497
* i18n: (zh-CN) #6246
* i18n: (zh-CN) Improvements
|
|
|
|
Fix #7586
|
|
* Hide section headline for timelines in production
* comment out
|
|
|
|
|
|
Port webui changes from cba2897108dffe69d5a16befe6c6220f6eaae59f to glitch-soc
|
|
|
|
Merge upstream
|
|
Conflicts:
config/locales/pl.yml
The conflict in config/locales/pl.yml concerns the themes key, which is
not used in glitchsoc. Resolution: remove the themes key-related
changes, i.e. accept-ours.
|
|
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
|
|
|
|
Port various WebUI fixes from upstream
|
|
|
|
Port 22e067bf5c30a5aa7aec4b3c17dc112cacbe7873 to glitch-soc
|
|
Port 1951ff41b33b264fd8179998648c3cbbf2834cd5 to glitch-soc
|
|
Merge upstream changes
|
|
|
|
|
|
Conflicts:
app/javascript/styles/mastodon-light.scss
config/locales/en.yml
config/locales/fr.yml
config/locales/simple_form.pl.yml
config/themes.yml
Conflicts resolved by deleting config/themes.yml,
marking app/javascript/styles/mastodon-light.scss as added,
and taking all new translation strings, not removing anything from
them.
|
|
Port SCSS changes from upstream
|
|
* Add extra attribute to WrappedRoute for community timeline
* fix
|
|
|
|
Fix #7568
|
|
If media_attachments are not loaded, SQL query is the same, but
the #exists? method performs SQL query even if preloaded
|
|
|
|
|
|
* i18n: (zh-CN) #7532
* i18n: (zh-CN) #6984
* i18n: (zh-CN) #7391, #7507
* i18n: (zh-CN) #6998
* i18n: (zh-CN) #7074
* i18n: (zh-CN) #7000, #7032, #7131 (#7032, #7040)
* i18n: (zh-CN) #7130, #7188
* i18n: (zh-CN) #6486
* i18n: (zh-CN) #6292
* i18n: (zh-CN) #7347
* i18n: (zh-CN) #6661
* i18n: (zh-CN) #6425
* i18n: (zh-CN) #6597
* i18n: (zh-CN) #6695
* i18n: (zh-CN) #6325
* i18n: (zh-CN) #6460, #7375
* i18n: (zh-CN) #6872
* i18n: (zh-CN) #6818
* i18n: (zh-CN) #7452
* i18n: (zh-CN) #7176
* i18n: (zh-CN) #6460
* i18n: (zh-CN) #7213
* i18n: (zh-CN) #7376
* i18n: (zh-CN) #6556
* i18n: (zh-CN) #6645
* i18n: (zh-CN) #6448
* i18n: (zh-CN) #5303
* i18n: (zh-CN) #7445
* i18n: (zh-CN) Normalization and improvements
* i18n: (zh-CN) #7391
* i18n: (zh-CN) #6627
* i18n: (zh-CN) #6956, #7546
* i18n: (zh-CN) #6636
* i18n: (zh-CN) #6610, #6875
* i18n: (zh-CN) #6887
* i18n: (zh-CN) #4514
* i18n: (zh-CN) #6628
* i18n: (zh-CN) #6771
* i18n: (zh-CN) #6772
* i18n: (zh-CN) #7178
* i18n: (zh-CN) #7521
* i18n: (zh-CN) #6570
* i18n: (zh-CN) #6593
* i18n: (zh-CN) #6423
* i18n: (zh-CN) #6157
* i18n: (zh-CN) #7089
* i18n: (zh-CN) #6733
* i18n: (zh-CN) #7072
* i18n: (zh-CN) #6520
* i18n: (zh-CN) Improvment
* i18n: (zh-CN) #6631
|
|
* Add a light theme to Mastodon
This add a second default theme to Mastodon. This new theme is supposed to be a light version of the dark original one.
* Update locales
Update the English and French locales.
* Change capitalization of hexadecimal triplets
Change capitalization of hexadecimal color codes to match Code Climate's recomandation.
* Add variable
Add a new variable to use instead of hardcoding a color. Change made to match Code Climate's recomandation.
* Use Mastodon branding palette
Replace the colors previously used by the ones found in Mastodon branding palette.
The resulting theme is lighter than the previous version.
* Make the overlay background white
Make the overly background used on on sensitive medias white instead of black
* Change the color used on the envelop icon
Change the color used on the envelop icon for a darker one. The same color is now used on both the envelop icon and the padlock icon.
* Add contrast
Add contrast to various places inside the main interface and the profile pages.
* Change the text color used in the compose form
Change the text color used in the compose form for a darker one.
* Make the code easier to read
Add some blank lines to make the code easier to parse for a human eye.
* Change columns' background default colors
Change columns' background default colors, making the composition column the darker one.
* Change the color of the log in button
Change the log in button's text color to make it more readable.
* Fix the color of the boost buttons on the landing page
The disabled boost buttons on the landing page are now of the same color that the other disabled buttons.
* Change the colors used in the dropdown menu
Make the dropdown menu light instead of dark.
|
|
|
|
Fix #7557
|
|
* Convert rich push notifications to plaintext in webapp
* Fix code style issues
|
|
* Update oc.json
* Update oc.yml
* Update simple_form.oc.yml
|
|
Looks better when no header image is set
|
|
Port SCSS changes from 93c66f0c03c27ee02b9875c3c051d9bf50b33e19 to glitch-soc
|