Akihiko Odaki
023fe5181b
Introduce flat layout to contexts reducer ( #7150 )
...
This allows to filter out replies in threads even if contexts of those
replies are not fetched.
7 years ago
Yamagishi Kazutoshi
8182b61518
Enable media timeline ( #7598 )
7 years ago
Lynx Kotoura
7ea91dcbb3
More polished light theme ( #7620 )
...
* Revert "Remove pointer to light theme until it is more polished (#7594 )"
This reverts commit f8cf85db3b
.
* True up the hierarchical structure of mastodon-light theme
* Fix mastodon-light theme
7 years ago
Lynx Kotoura
6042403621
Fix color of /about/more link anchors ( #7618 )
7 years ago
ThibG
9b75a13104
Merge pull request #517 from ThibG/glitch-soc/fixes/max_toot_chars
...
Add missing comma in InitalStateSerializer (fixes #516 )
7 years ago
Jeroen
3f8f5642a1
Added the law requirements for the EU/EEA ( #7605 )
...
* Added the law requirements for the EU/EEA
See article 8 of the GDPR
* fix
* i18n-tasks normalize
7 years ago
ThibG
cdbdf7f98b
Ignore multiple occurrences of a hashtag within a status ( fixes #7585 ) ( #7606 )
7 years ago
Thibaut Girka
c1d0f96bb4
Add missing comma in InitalStateSerializer ( fixes #516 )
7 years ago
Thibaut Girka
4c91215e1f
[Glitch] Use .star-icon instead of hardcoding color in detailed statuses
...
Port 2587fcdd27
to glitch-soc
7 years ago
ThibG
2587fcdd27
Use .star-icon instead of hardcoding color in detailed statuses ( fixes #7610 ) ( #7613 )
7 years ago
ThibG
88ec5193cb
Merge pull request #510 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
7 years ago
ThibG
7719fe0df2
Merge pull request #505 from ThibG/glitch-soc/features/fetch-relationships-on-search
...
[Glitch] Fetch relationships for search results in UI
7 years ago
ThibG
e4c82e33e4
Merge pull request #512 from ThibG/glitch-soc/fixes/fix-ckbox-color
...
Change notification cleaning checkbox color (fixes #511 )
7 years ago
Thibaut Girka
0553496b76
Change notification cleaning checkbox color ( fixes #511 )
7 years ago
Thibaut Girka
e0ef89c73f
Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
ThibG
d8864b9e9d
Fix caret position after selected suggestion and media upload ( #7595 )
...
* Fix media upload reseting caret position to last inserted emoji
* Fix caret position after inserting suggestions (fixes #6089 )
7 years ago
Yamagishi Kazutoshi
6d99a0b652
Fix tests for invites controller (regression from 4d81809f36
) ( #7597 )
7 years ago
Eugen Rochko
4d81809f36
Yeah, it was supposed to be #create?
7 years ago
Eugen Rochko
7745a22ec7
Bump version to 2.4.0
7 years ago
Eugen Rochko
f8cf85db3b
Remove pointer to light theme until it is more polished ( #7594 )
7 years ago
ThibG
39d70f375f
Remove unneeded code now that attachment URL isn't appended to toots ( #7593 )
7 years ago
Eugen Rochko
1a564df586
Do not encode HTML entities in initial Web Push payload body ( #7592 )
7 years ago
SerCom_KC
4c9d5a500d
[WIP] i18n: Update Simplified Chinese translations ( #7576 )
...
* 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
7 years ago
Shuhei Kitagawa
12e590edd7
Add tests for report notes controller ( #7589 )
7 years ago
Eugen Rochko
36e47a31e3
Enforce order on authorized applications page ( #7587 )
...
Fix #7586
7 years ago
Yamagishi Kazutoshi
4eeda67727
Hide section headline for timelines in production ( #7590 )
...
* Hide section headline for timelines in production
* comment out
7 years ago
Yamagishi Kazutoshi
06252ec71e
Change column params on pinned timeline ( #7581 )
7 years ago
bsky
92b09d90c8
Remove outline ( #7582 )
7 years ago
Thibaut Girka
247f55f673
[Glitch] Fetch relationships for search results in UI
...
Port webui changes from cba2897108
to glitch-soc
7 years ago
Evgeny Petrov
a744042cf1
[RU] Added mastodon-light string ( #7583 )
7 years ago
ThibG
2289250f69
Merge pull request #503 from glitch-soc/merge-upstream
...
Merge upstream
7 years ago
David Yip
6dd676e006
Merge remote-tracking branch 'origin/master' into 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.
7 years ago
Marcin Mikołajczak
810f92e697
🌍 : 🇵🇱 ⬆️ ( #7580 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
Jenkins
f93806ea55
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG
cc230e5d57
Merge pull request #495 from ThibG/glitch-soc/fixes/port-upstream-fixes
...
Port various WebUI fixes from upstream
7 years ago
Thibaut Girka
d0b2f71501
Fix width only being set for standalone media
7 years ago
Thibaut Girka
3ad3cee44c
[Glitch] Use real container width in MediaGallery srcSet
...
Port 22e067bf5c
to glitch-soc
7 years ago
Thibaut Girka
463078dcc4
[Glitch] Do not override the default push notification settings
...
Port 1951ff41b3
to glitch-soc
7 years ago
ThibG
162f1863a7
Merge pull request #499 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
7 years ago
Eugen Rochko
5ea643b279
Save onlyMedia prop when pinning column ( #7575 )
7 years ago
Eugen Rochko
40ef46dbef
Display only domain of report account if remote under comment ( #7574 )
7 years ago
Thibaut Girka
a4c9bda771
Merge branch 'master' into glitch-soc/merge-upstream
...
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.
7 years ago
ThibG
98ecadbf99
Merge pull request #492 from ThibG/glitch-soc/fixes/port-scss
...
Port SCSS changes from upstream
7 years ago
Yamagishi Kazutoshi
46061dc041
Add exact attribute to WrappedRoute for community timeline ( #7572 )
...
* Add extra attribute to WrappedRoute for community timeline
* fix
7 years ago
Eugen Rochko
292c987522
Bump version to 2.4.0rc5
7 years ago
Eugen Rochko
22e067bf5c
Use real container width in MediaGallery srcSet ( #7571 )
...
Fix #7568
7 years ago
Eugen Rochko
32d4372381
Use #any? instead of #exists? when checking media attachments ( #7570 )
...
If media_attachments are not loaded, SQL query is the same, but
the #exists? method performs SQL query even if preloaded
7 years ago
Eugen Rochko
e583f110c3
Unescape HTML entities in rich web push notifications in web UI ( #7569 )
7 years ago
Thibaut Girka
c53aacdfa0
Recover glitch-soc specific styles that were removed by accident
7 years ago
SerCom_KC
41b2cfe5b8
i18n: Update Simplified Chinese translations ( #7565 )
...
* 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
7 years ago