about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-05-25Merge branch 'master' into glitch-soc/merge-masterThibaut Girka
Conflicts: app/javascript/styles/mastodon-light.scss config/themes.yml Removed config/themes.yml, took upstream's mastodon-light.scss
2018-05-25Remove Puma pidfile before boot if container receives SIGTERM (#7052)Isatis
2018-05-25Introduce flat layout to contexts reducer (#7150)Akihiko Odaki
This allows to filter out replies in threads even if contexts of those replies are not fetched.
2018-05-25Enable media timeline (#7598)Yamagishi Kazutoshi
2018-05-25More polished light theme (#7620)Lynx Kotoura
* Revert "Remove pointer to light theme until it is more polished (#7594)" This reverts commit f8cf85db3b3a4541a0add4b985a9bf0fbe8f2aa0. * True up the hierarchical structure of mastodon-light theme * Fix mastodon-light theme
2018-05-25Fix color of /about/more link anchors (#7618)Lynx Kotoura
2018-05-25Merge pull request #517 from ThibG/glitch-soc/fixes/max_toot_charsThibG
Add missing comma in InitalStateSerializer (fixes #516)
2018-05-25Added the law requirements for the EU/EEA (#7605)Jeroen
* Added the law requirements for the EU/EEA See article 8 of the GDPR * fix * i18n-tasks normalize
2018-05-25Ignore multiple occurrences of a hashtag within a status (fixes #7585) (#7606)ThibG
2018-05-25Add missing comma in InitalStateSerializer (fixes #516)Thibaut Girka
2018-05-25[Glitch] Use .star-icon instead of hardcoding color in detailed statusesThibaut Girka
Port 2587fcdd27613e52d620e3c93bb089932be48db0 to glitch-soc
2018-05-25Use .star-icon instead of hardcoding color in detailed statuses (fixes ↵ThibG
#7610) (#7613)
2018-05-23Merge pull request #510 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-05-23Merge pull request #505 from ↵ThibG
ThibG/glitch-soc/features/fetch-relationships-on-search [Glitch] Fetch relationships for search results in UI
2018-05-23Merge pull request #512 from ThibG/glitch-soc/fixes/fix-ckbox-colorThibG
Change notification cleaning checkbox color (fixes #511)
2018-05-23Change notification cleaning checkbox color (fixes #511)Thibaut Girka
2018-05-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-23Fix caret position after selected suggestion and media upload (#7595)ThibG
* Fix media upload reseting caret position to last inserted emoji * Fix caret position after inserting suggestions (fixes #6089)
2018-05-23Fix tests for invites controller (regression from ↵Yamagishi Kazutoshi
4d81809f36fcbfe787e23d490f2cb0ad943ab32c) (#7597)
2018-05-22Yeah, it was supposed to be #create?Eugen Rochko
2018-05-22Bump version to 2.4.0Eugen Rochko
2018-05-22Remove pointer to light theme until it is more polished (#7594)Eugen Rochko
2018-05-22Remove unneeded code now that attachment URL isn't appended to toots (#7593)ThibG
2018-05-22Do not encode HTML entities in initial Web Push payload body (#7592)Eugen Rochko
2018-05-22[WIP] i18n: Update Simplified Chinese translations (#7576)SerCom_KC
* 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
2018-05-22Add tests for report notes controller (#7589)Shuhei Kitagawa
2018-05-22Enforce order on authorized applications page (#7587)Eugen Rochko
Fix #7586
2018-05-22Hide section headline for timelines in production (#7590)Yamagishi Kazutoshi
* Hide section headline for timelines in production * comment out
2018-05-22Change column params on pinned timeline (#7581)Yamagishi Kazutoshi
2018-05-22Remove outline (#7582)bsky
2018-05-22[Glitch] Fetch relationships for search results in UIThibaut Girka
Port webui changes from cba2897108dffe69d5a16befe6c6220f6eaae59f to glitch-soc
2018-05-22[RU] Added mastodon-light string (#7583)Evgeny Petrov
2018-05-22Merge pull request #503 from glitch-soc/merge-upstreamThibG
Merge upstream
2018-05-21Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
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.
2018-05-21🌍: 🇵🇱⬆️ (#7580)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-05-21Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-05-21Merge pull request #495 from ThibG/glitch-soc/fixes/port-upstream-fixesThibG
Port various WebUI fixes from upstream
2018-05-21Fix width only being set for standalone mediaThibaut Girka
2018-05-21[Glitch] Use real container width in MediaGallery srcSetThibaut Girka
Port 22e067bf5c30a5aa7aec4b3c17dc112cacbe7873 to glitch-soc
2018-05-21[Glitch] Do not override the default push notification settingsThibaut Girka
Port 1951ff41b33b264fd8179998648c3cbbf2834cd5 to glitch-soc
2018-05-21Merge pull request #499 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-05-21Save onlyMedia prop when pinning column (#7575)Eugen Rochko
2018-05-21Display only domain of report account if remote under comment (#7574)Eugen Rochko
2018-05-21Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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.
2018-05-21Merge pull request #492 from ThibG/glitch-soc/fixes/port-scssThibG
Port SCSS changes from upstream
2018-05-21Add exact attribute to WrappedRoute for community timeline (#7572)Yamagishi Kazutoshi
* Add extra attribute to WrappedRoute for community timeline * fix
2018-05-21Bump version to 2.4.0rc5Eugen Rochko
2018-05-21Use real container width in MediaGallery srcSet (#7571)Eugen Rochko
Fix #7568
2018-05-21Use #any? instead of #exists? when checking media attachments (#7570)Eugen Rochko
If media_attachments are not loaded, SQL query is the same, but the #exists? method performs SQL query even if preloaded
2018-05-21Unescape HTML entities in rich web push notifications in web UI (#7569)Eugen Rochko
generated by cgit-pink (git 2.37.1) at 2024-11-29 01:34:18 +0000