luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-17 12:24:31 +00:00
Code Issues Projects Releases Wiki Activity
10255 commits 1 branch 0 tags 248 MiB
Commit graph

10255 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thibaut Girka 0128509605 Fix loading more items in account following/followers 2019-09-04 17:58:31 +02:00
Eugen Rochko ce182efd68 [Glitch] Add header to trends section and change refresh rate to 15 minutes 
Port 4ef8d8b77c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-02 10:57:44 +02:00
ThibG 12c188f533 [Glitch] Restore hashtag suggestions from local tag history 
Port 5ab1e0e738 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-02 10:57:44 +02:00
ThibG e1810eed8e [Glitch] Fix trending hashtags being fetched every 36 seconds instead of every hour (#11631) 
Port d857d0d14d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-02 10:57:44 +02:00
Thibaut Girka b30a7f5120 Fix trending hashtags spacing in single-column mode 2019-09-02 10:57:44 +02:00
Eugen Rochko 34eff39936 [Glitch] Add trends to public pages sidebar 
Port c6b4b923e6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-02 10:57:44 +02:00
Eugen Rochko 717f3998c0 [Glitch] Fix hashtag autosuggestions line breaks for long suggestions 
Port cd660d374a to glitch-soc

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

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

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

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

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

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

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

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-30 13:45:46 +02:00
Thibaut Girka 9044a2b051 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 49f57b5534 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 f6e7f94146 node v12 support (#11706) 2019-08-30 07:41:38 +02:00
Eugen Rochko 9871904172
Change layout of public profile directory to be the same as in web UI (#11705) 2019-08-30 07:41:16 +02:00
umonaca 7235f538c6 Add more media formats (#11687) 
* Add more media formats

* Removed amr file type
 2019-08-30 04:30:29 +02:00
Eugen Rochko 5f591d979c
Fix non-numbers being passed to Redis and causing an error (#11697) 2019-08-30 02:49:54 +02:00
Eugen Rochko 70ae77895f
Fix error in REST API for an account's statuses (#11700) 2019-08-30 02:49:44 +02:00
Eugen Rochko 60e684af5f
Fix uncaught error when resource param is missing in Webfinger request (#11701) 2019-08-30 02:49:33 +02:00
Eugen Rochko b54b725d6b
Fix uncaught domain normalization error in remote follow (#11703) 2019-08-30 02:19:17 +02:00
ThibG 6914482d0a Change detailed status child ordering to sort self-replies on top (#11686) 
Fixes #11679
 2019-08-30 01:57:38 +02:00
Eugen Rochko bfca58d137
Fix encoding error when checking e-mail MX records (#11696) 2019-08-30 01:35:12 +02:00
Eugen Rochko 14996496a5
Fix error in warning e-mail template (#11698) 2019-08-30 01:34:59 +02:00
Eugen Rochko 22ce4778eb
Fix uncaught parameter missing exceptions and missing error templates (#11702) 2019-08-30 01:34:47 +02:00
Eugen Rochko 8ee4a2892c
Fix non-GET requests to / not being matched (#11704) 2019-08-30 01:34:33 +02:00
Eugen Rochko 18e37bee16
Fix JSON-LD deprecation warning in log output (#11699) 2019-08-30 01:34:21 +02:00
ThibG 2848c08953
Merge pull request #1208 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-08-30 00:18:08 +02:00
Eugen Rochko cb447b28c4
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 969d043851 Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 20:53:51 +02:00
ThibG 7802ebd5f3 Revert bcrypt to 3.1.12, again (#11693) 
Same reasons as in #11555
 2019-08-29 20:51:30 +02:00
Thibaut Girka f3ac4a4411 Fix clicking on the new audioplayer opening the toot in detailed view 2019-08-29 17:32:22 +02:00
ThibG 6ee2501991 [Glitch] Change window resize handler to switch to/from mobile layout as soon as needed 
Port bd4099d976 to glitch-soc

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

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

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

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

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

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-29 17:32:22 +02:00
Thibaut Girka 7c22e32562 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 48b8a1f414 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 79725f659d Fix crashes from favico.js crashing the entire web app 2019-08-29 12:03:05 +02:00
Thibaut Girka 956c1cf82a Refactor the Columns Area code to be closer to upstream 2019-08-29 12:02:20 +02:00