mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-15 23:54:52 +01:00
Code Issues Projects Releases Wiki Activity
10,765 Commits 137 Branches 269 Tags 929 MiB
2c6d8ebf02
Commit Graph

10765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ThibG
0ea53122f2 Fix Mastodon logo style on hover on public pages' footer (#11735) 
Fixes #11690
 2019-09-02 18:12:12 +02:00
ThibG
6493f4ffae Fix height of dashboard counters (#11736) 2019-09-02 18:11:34 +02:00
Eugen Rochko
70ddef2654
Change trending hashtags to not disappear instantly after midnight (#11712) 2019-09-02 18:11:13 +02:00
dependabot-preview[bot]
ac6935b629 Bump babel-eslint from 10.0.2 to 10.0.3 (#11723) 
Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.2 to 10.0.3.
- [Release notes](https://github.com/babel/babel-eslint/releases)
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.2...v10.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-02 20:19:16 +09:00
dependabot-preview[bot]
dd45df6630 Bump @babel/plugin-transform-runtime from 7.4.4 to 7.5.5 (#11725) 
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel) from 7.4.4 to 7.5.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.4...v7.5.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-02 20:18:22 +09: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
34eac5a1ec Fix custom emoji animation on hover in WebUI directory bios (#11716) 2019-09-01 20:04:35 +02:00
Eugen Rochko
47584180d8
Fix wrong percentages in admin UI for hashtag usage breakdown (#11714) 2019-09-01 19:44:05 +02:00
Eugen Rochko
d344289431
Add "not available" label on unknown media attachments (#11715) 2019-09-01 19:43:35 +02:00
Shlee
59b013df5f Update NodeJS source for Docker Image (#11707) 
* Update Ruby/Node/jemalloc source for Docker Image

* Update Dockerfile

* Update Dockerfile
 2019-08-31 20:07:29 +02:00
Shlee
33f4b6e1eb Update Dockerfile (#11710) 2019-08-31 20:06:49 +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
Shlee
db28bb487b Pushed CircleCI docker images to more recent V (#11708) 2019-08-30 16:59:11 +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