about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2018-10-11Merge pull request #775 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-10-11Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into ↵Thibaut Girka
glitch-soc/merge-upstream
2018-10-10Really fix HotKeysThibaut Girka
2018-10-10Add description meta tag additionally to og:description (#8941)Eugen Rochko
Fix #8685
2018-10-10Add dns-prefetch if using different host for assets or uploads (#8942)Eugen Rochko
2018-10-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: app/javascript/packs/public.js Changes made to app/javascript/packs/publics.js were applied to app/javascript/core/settings.js
2018-10-09Fix that the copy button of verify link did not work. (#8938)mayaeh
2018-10-09Track historical space stats in PgHero to determine PostgreSQL growth (#8906)Eugen Rochko
2018-10-09Fix CW icon color in local-settings modalThibaut Girka
2018-10-09Define some local-settings hintsThibaut Girka
2018-10-09Add support for hints (or extended descriptions) in local-settings pagesThibaut Girka
2018-10-09When screen width is too narrow, hide local-settings page text, keep only iconsThibaut Girka
2018-10-09Change “preferences” icon to match settings page iconThibaut Girka
2018-10-09Add icons for each of the local-setting pagesThibaut Girka
2018-10-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-09Merge pull request #770 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-10-09Fix app-wide hotkeys randomly failing to workThibaut Girka
2018-10-09Add Japanese translations. (#8927)mayaeh
2018-10-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-08Fixed error occurrence when pinning the DM column. (#8922)mayaeh
2018-10-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-08Move “Show action buttons in collapsed toots” optionThibaut Girka
2018-10-08Switch from selects to radio buttons for local settings, improve stylingThibaut Girka
2018-10-08rubocop issues - Cleaning up (#8912)ashleyhull-versent
* cleanup pass * undo mistakes * fixed. * revert
2018-10-08Remove dead code (#8919)Eugen Rochko
SignatureVerification#matches_time_window? is not called anywhere.
2018-10-08Replace SVG asset with Custom mascot (#8766)ashleyhull-versent
2018-10-07Add conversations API (#8832)Eugen Rochko
* Add conversations API * Add web UI for conversations * Add test for conversations API * Add tests for ConversationAccount * Improve web UI * Rename ConversationAccount to AccountConversation * Remove conversations on block and mute * Change last_status_id to be a denormalization of status_ids * Add optimistic locking
2018-10-07[Glitch] Change documentation URLThibaut Girka
Port 28401962caff028f328d674878e1f0abd16ffdfd to glitch-soc
2018-10-07[Glitch] RTL: fix margins of public-account-header__tabsThibaut Girka
Port 185cb2dc3aac59ee27aa962fff48b064bd638567 to glitch-soc
2018-10-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-07Ensure only toots from the reported users are reported (#8916)ThibG
2018-10-07Do not scroll timelines when *closing* media modalsThibaut Girka
Media modals push an history state so that pressing back on mobile closes them. We made sure to not scroll when opening them, but not when *closing* them, which caused some issues in rare cases.
2018-10-06i18n: Update Polish translation (#8901)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-10-06Change documentation URL (#8898)Eugen Rochko
* Change documentation URL * Fix hardcoded documentation URL in locales
2018-10-06RTL: fix margins of public-account-header__tabs (#8897)Masoud Abkenar
* RTL: fix margins of public-account-header__tabs * fix style * even more stylish code :)
2018-10-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-05Leave unknown language as nil if account is remote (#8861)Jeong Arm
* Force use language detector if account is remote * Set unknown remote toot's language as nil
2018-10-05[Glitch] Add a confirmation dialog when hitting reply and the compose box ↵Thibaut Girka
isn't empty
2018-10-05Add a confirmation dialog when hitting reply and the compose box isn't empty ↵ThibG
(#8893) * Add a confirmation dialog when hitting reply and the compose box isn't empty Fixes #878 * Performance improvement
2018-10-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.
2018-10-04Limit the number of people that can be followed from one account (#8807)Eugen Rochko
Configurable soft limit of 7,500, and above that, configurable ratio of 1.1 * followers, controlled by: - MAX_FOLLOWS_THRESHOLD - MAX_FOLLOWS_RATIO Fix #2311
2018-10-04Change admin accounts default sort to most recent (#8813)Eugen Rochko
2018-10-04Fix link verification for remote accounts (#8868)Eugen Rochko
2018-10-03Fix handling of ActivityPub activities lacking some attributes (#8864)ThibG
2018-10-02Make hidden media clickable in account media galleryThibaut Girka
2018-10-02Add media description (or status spoiler) in account media galleryThibaut Girka
2018-10-02Fix account gallery hidden media background color in mastodon-lightThibaut Girka
2018-10-02[Glitch] Honour displayMedia setting in accountMedia galleryThibaut Girka
Inspired by b79ab15859e7f8383526afd147e8416d2df2f7a7
2018-10-01[Glitch] Add support for new display_media settingThibaut Girka
Port f7a6f9489da9b2a1820366654df47b8a52f5c5bc to glitch-soc [API] [vanilla required] [glitch-soc optional] initial_state show_sensitive_media boolean changed to show_media string with options "default", "hide_all", "show_all"
2018-10-01[Glitch] RTL: fix margins: public-layout.header.nav-buttonThibaut Girka
Port df2f4052b84e68d36341df5fb58755276e9bf3ce to glitch-soc