about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-09-02[Glitch] Restore hashtag suggestions from local tag historyThibG
Port 5ab1e0e738183a0ddcec140d55184351f751b22d to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-02[Glitch] Fix trending hashtags being fetched every 36 seconds instead of ↵ThibG
every hour (#11631) Port d857d0d14d273648bad5a88ce3391d6e15592039 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-02Fix trending hashtags spacing in single-column modeThibaut Girka
2019-09-02[Glitch] Add trends to public pages sidebarEugen Rochko
Port c6b4b923e6f88b7cc4a1af251cb532a5a15035e2 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-02[Glitch] Fix hashtag autosuggestions line breaks for long suggestionsEugen Rochko
Port cd660d374adc9394aaeea22d5d41b29535d8a4c2 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-02[Glitch] Fix trending counter widthSasha Sorokin
Port a5a5a0adec08082a1d527a2f848dc9b0ababf253 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-02[Glitch] Add trends UI with admin and user settingsEugen Rochko
Port 9072fe5ab6464cc9c7a871d388464c7afcf41cd0 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-02[Glitch] Fix emoji autosuggestionsEugen Rochko
Port 784c88e16d8e0f75c0d27e34f926569607e02044 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-09-02Refactor SCSS to better match upstreamThibaut Girka
2019-09-02[Glitch] Add autosuggestions for hashtagsEugen Rochko
Port cfb2ed78231758a79af038a964ab7f7b7b35274e to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-31Merge pull request #1209 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-08-31Properly hide follower count in profile directoryThibaut Girka
2019-08-31Fix auto-added media icons when a CW is set but no content textThibaut Girka
2019-08-31Update backend links and fix hardcoded onesThibaut Girka
2019-08-31Fix imports importing modules from vanilla flavour instead of glitchThibaut Girka
2019-08-31[Glitch] Change layout of public profile directory to be the same as in web UIEugen Rochko
Port 987190417228bb56041ea824772341f07f4263d6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-31[Glitch] Add profile directory to web UIEugen Rochko
Port cb447b28c403c7db32e3e3d7c2510004287edfda to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-30[Glitch] Change detailed status child ordering to sort self-replies on topThibG
Port 6914482d0a6e7e654e17e7f2aa2f6a2acde6c59a to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/views/directories/index.html.haml Upstream has redesigned the profile directory, and we had a glitch-soc-specific change to hide follower counts. Ported that change to the new design.
2019-08-30Add TLS v1.3 support (#11603)ichi_i
Maintain TLS v1.2 compatibility (might want to drop this later) and add support for TLS v1.3
2019-08-30node v12 support (#11706)abcang
2019-08-30Change layout of public profile directory to be the same as in web UI (#11705)Eugen Rochko
2019-08-30Add more media formats (#11687)umonaca
* Add more media formats * Removed amr file type
2019-08-30Fix non-numbers being passed to Redis and causing an error (#11697)Eugen Rochko
2019-08-30Fix error in REST API for an account's statuses (#11700)Eugen Rochko
2019-08-30Fix uncaught error when resource param is missing in Webfinger request (#11701)Eugen Rochko
2019-08-30Fix uncaught domain normalization error in remote follow (#11703)Eugen Rochko
2019-08-30Change detailed status child ordering to sort self-replies on top (#11686)ThibG
Fixes #11679
2019-08-30Fix encoding error when checking e-mail MX records (#11696)Eugen Rochko
2019-08-30Fix error in warning e-mail template (#11698)Eugen Rochko
2019-08-30Fix uncaught parameter missing exceptions and missing error templates (#11702)Eugen Rochko
2019-08-30Fix non-GET requests to / not being matched (#11704)Eugen Rochko
2019-08-30Fix JSON-LD deprecation warning in log output (#11699)Eugen Rochko
2019-08-30Merge pull request #1208 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-08-30Add profile directory to web UI (#11688)Eugen Rochko
* Add profile directory to web UI * Add a line of bio to the directory
2019-08-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-08-29Revert bcrypt to 3.1.12, again (#11693)ThibG
Same reasons as in #11555
2019-08-29Fix clicking on the new audioplayer opening the toot in detailed viewThibaut Girka
2019-08-29[Glitch] Change window resize handler to switch to/from mobile layout as ↵ThibG
soon as needed Port bd4099d976b52f7ec00e00b23cfe6e2766ff1e4d to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-29[Glitch] Fix more visual issues with the audio playerEugen Rochko
Port 2e99e3cab349db6102505736e3b4b94abe776b80 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-29[Glitch] Fix public page crash due to audio player, fix unpause in audio playerEugen Rochko
Port e72bac7576263445630926dd9992004ece7b73c4 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-29[Glitch] Add audio playerEugen Rochko
Port 4190e31626907059aebf32b1be66715dacb989a9 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-29[Glitch] Add special alert for throttled requestsThibG
Port 81f864d4dac349dd7cd516149d00e1cffe063edc to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-29[Glitch] Add confirmation modal when logging out from the web appThibG
Port fd3d45d38f289815bed0adc7eaa3b15894ddb8fb to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-29Remove sign out link from getting started columns, as it is already in the ↵Thibaut Girka
footer
2019-08-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes.
2019-08-29Fix crashes from favico.js crashing the entire web appThibaut Girka
2019-08-29Refactor the Columns Area code to be closer to upstreamThibaut Girka
2019-08-29Add option to rewrite mentions to mentioned user's username or acctThibaut Girka
Fixes #666
2019-08-28[Security] Bump mixin-deep from 1.3.1 to 1.3.2 (#11683)dependabot-preview[bot]
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2. **This update includes a security fix.** - [Release notes](https://github.com/jonschlinkert/mixin-deep/releases) - [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>