treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
10,249 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

10249 Commits (62c1003b41142945eb7af3ea25a32fa883a0a778)

Author SHA1 Message Date
Eugen Rochko 62c1003b41 [Glitch] Fix hashtag autosuggestions line breaks for long suggestions 
Port 193df2e8cb to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-02 10:57:44 +02:00
Sasha Sorokin c43fb46d0c [Glitch] Fix trending counter width 
Port 406f2f7d57 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-02 10:57:44 +02:00
Eugen Rochko 157d78dd44 [Glitch] Add trends UI with admin and user settings 
Port 191392e5c3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-02 10:57:44 +02:00
Eugen Rochko f0c559250c [Glitch] Fix emoji autosuggestions 
Port 32d2260a8c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-02 10:57:44 +02:00
Thibaut Girka c3c61f3011 Refactor SCSS to better match upstream 2019-09-02 10:57:44 +02:00
Eugen Rochko cc3ca37cda [Glitch] Add autosuggestions for hashtags 
Port 450b8a70a5 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-02 10:57:44 +02:00
ThibG b72317c2b7 Merge pull request #1209 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-08-31 19:44:47 +02:00
Thibaut Girka fab9d261c1 Properly hide follower count in profile directory 2019-08-31 18:23:24 +02:00
Thibaut Girka c6591e1283 Fix auto-added media icons when a CW is set but no content text 2019-08-31 18:23:24 +02:00
Thibaut Girka 90ac926b1c Update backend links and fix hardcoded ones 2019-08-31 18:23:24 +02:00
Thibaut Girka 2743b33722 Fix imports importing modules from vanilla flavour instead of glitch 2019-08-31 18:23:24 +02:00
Eugen Rochko c4aa608971 [Glitch] Change layout of public profile directory to be the same as in web UI 
Port b47119eb61 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-31 18:23:24 +02:00
Eugen Rochko 2cdbfb39e8 [Glitch] Add profile directory to web UI 
Port 79922ae20f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-31 18:23:23 +02:00
ThibG fce59abade [Glitch] Change detailed status child ordering to sort self-replies on top 
Port accac63c88 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-30 13:45:46 +02:00
Thibaut Girka 741b53651e Merge branch 'master' into glitch-soc/merge-upstream 
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-30 13:38:41 +02:00
ichi_i 613eb85dc7 Add TLS v1.3 support (#11603) 
Maintain TLS v1.2 compatibility (might want to drop this later) and add support for TLS v1.3
 2019-08-30 07:42:50 +02:00
abcang 60baa06a83 node v12 support (#11706) 2019-08-30 07:41:38 +02:00
Eugen Rochko b47119eb61 Change layout of public profile directory to be the same as in web UI (#11705) 2019-08-30 07:41:16 +02:00
umonaca 70e0c2f162 Add more media formats (#11687) 
* Add more media formats

* Removed amr file type
 2019-08-30 04:30:29 +02:00
Eugen Rochko c194c17cb7 Fix non-numbers being passed to Redis and causing an error (#11697) 2019-08-30 02:49:54 +02:00
Eugen Rochko 73d8f314a9 Fix error in REST API for an account's statuses (#11700) 2019-08-30 02:49:44 +02:00
Eugen Rochko a2a65f43b2 Fix uncaught error when resource param is missing in Webfinger request (#11701) 2019-08-30 02:49:33 +02:00
Eugen Rochko ee9d0c0f38 Fix uncaught domain normalization error in remote follow (#11703) 2019-08-30 02:19:17 +02:00
ThibG accac63c88 Change detailed status child ordering to sort self-replies on top (#11686) 
Fixes #11679
 2019-08-30 01:57:38 +02:00
Eugen Rochko 478288bf4c Fix encoding error when checking e-mail MX records (#11696) 2019-08-30 01:35:12 +02:00
Eugen Rochko 35242b7dc2 Fix error in warning e-mail template (#11698) 2019-08-30 01:34:59 +02:00
Eugen Rochko f21e27e914 Fix uncaught parameter missing exceptions and missing error templates (#11702) 2019-08-30 01:34:47 +02:00
Eugen Rochko 12eed2edd8 Fix non-GET requests to / not being matched (#11704) 2019-08-30 01:34:33 +02:00
Eugen Rochko 02fff98491 Fix JSON-LD deprecation warning in log output (#11699) 2019-08-30 01:34:21 +02:00
ThibG 4631c30738 Merge pull request #1208 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-08-30 00:18:08 +02:00
Eugen Rochko 79922ae20f Add profile directory to web UI (#11688) 
* Add profile directory to web UI

* Add a line of bio to the directory
 2019-08-30 00:14:36 +02:00
Thibaut Girka 9cd6783781 Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 20:53:51 +02:00
ThibG b3141d0585 Revert bcrypt to 3.1.12, again (#11693) 
Same reasons as in #11555
 2019-08-29 20:51:30 +02:00
Thibaut Girka c544962ee9 Fix clicking on the new audioplayer opening the toot in detailed view 2019-08-29 17:32:22 +02:00
ThibG 854a990d3c [Glitch] Change window resize handler to switch to/from mobile layout as soon as needed 
Port 15a82d48ea to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-29 17:32:22 +02:00
Eugen Rochko 478fa5f839 [Glitch] Fix more visual issues with the audio player 
Port eaa759ffd4 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-29 17:32:22 +02:00
Eugen Rochko 08ad511c36 [Glitch] Fix public page crash due to audio player, fix unpause in audio player 
Port c8df53b75f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-29 17:32:22 +02:00
Eugen Rochko 024b9a24e0 [Glitch] Add audio player 
Port f13761d84b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-29 17:32:22 +02:00
ThibG bbc1e15f39 [Glitch] Add special alert for throttled requests 
Port 6fc1a84958 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-29 17:32:22 +02:00
ThibG 47ffc93705 [Glitch] Add confirmation modal when logging out from the web app 
Port d255ce2f1a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-29 17:32:22 +02:00
Thibaut Girka d212159f06 Remove sign out link from getting started columns, as it is already in the footer 2019-08-29 14:56:40 +02:00
Thibaut Girka 449a0727a7 Merge branch 'master' into glitch-soc/merge-upstream 
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-29 12:07:50 +02:00
Thibaut Girka ee6653adcf Fix crashes from favico.js crashing the entire web app 2019-08-29 12:03:05 +02:00
Thibaut Girka ed4dbca6bc Refactor the Columns Area code to be closer to upstream 2019-08-29 12:02:20 +02:00
Thibaut Girka 5de49ea272 Add option to rewrite mentions to mentioned user's username or acct 
Fixes #666
 2019-08-29 11:59:29 +02:00
dependabot-preview[bot] a7659b08f8 [Security] Bump mixin-deep from 1.3.1 to 1.3.2 (#11683) 
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>
 2019-08-28 10:56:20 +09:00
ThibG 6fc1a84958 Add special alert for throttled requests (#11677) 
* Add special alert for throttled requests

* Use an extra attribute instead of an array
 2019-08-27 16:50:39 +02:00
dependabot-preview[bot] b88c0483d7 [Security] Bump eslint-utils from 1.3.1 to 1.4.2 (#11675) 
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.3.1 to 1.4.2. **This update includes a security fix.**
- [Release notes](https://github.com/mysticatea/eslint-utils/releases)
- [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.3.1...v1.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-27 04:17:44 +09:00
ThibG d255ce2f1a Add confirmation modal when logging out from the web app (#11671) 
* [WiP] Add a confirmation modal before logging out from the web interface

* Add confirmation to logout link in getting started footer

* Please CodeClimate
 2019-08-26 18:24:10 +02:00
dependabot-preview[bot] 196ad08e2d Bump bullet from 6.0.1 to 6.0.2 (#11666) 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/6.0.1...6.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 23:05:19 +09:00