tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,236 Commits 5 Branches 0 Tags
Commit Graph

3681 Commits

Author SHA1 Message Date
ThibG
759448c24c [Glitch] Change detailed status child ordering to sort self-replies on top 
Port 6914482d0a6e7e654e17e7f2aa2f6a2acde6c59a 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
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
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
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
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 bd4099d976b52f7ec00e00b23cfe6e2766ff1e4d 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 2e99e3cab349db6102505736e3b4b94abe776b80 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 e72bac7576263445630926dd9992004ece7b73c4 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 4190e31626907059aebf32b1be66715dacb989a9 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 81f864d4dac349dd7cd516149d00e1cffe063edc 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 fd3d45d38f289815bed0adc7eaa3b15894ddb8fb 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
Thibaut Girka
3282bbe454 Add option to rewrite mentions to mentioned user's username or acct 
Fixes #666
 2019-08-29 11:59:29 +02:00
ThibG
81f864d4da 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
ThibG
fd3d45d38f 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
mayaeh
89b574aa6c Add translation target for hashtag (#11657) 
* Add translation target for hashtag.

* run `yarn manage:translations en`
 2019-08-25 16:22:20 +02:00
ThibG
91582937f3 Fix crash when switching back/from mobile layout (#11655) 
Fixes #11630
 2019-08-25 15:49:02 +02:00
ThibG
bd4099d976 Change window resize handler to switch to/from mobile layout as soon as needed (#11656) 2019-08-25 15:48:50 +02:00
Eugen Rochko
2e99e3cab3
Fix more visual issues with the audio player (#11654) 
* Fix more visual issues with the audio player

- Add horizontal baseline in the middle of waveform
- Fix audio player colors in light theme
- Use audio element instead of web audio API
- Do not render any bars until the file is loaded
- Do not allow interactions with waveform until the file is loaded

* Fix code style issue
 2019-08-25 15:09:19 +02:00
Eugen Rochko
e72bac7576
Fix public page crash due to audio player, fix unpause in audio player (#11652) 2019-08-25 02:13:40 +02:00
Eugen Rochko
4190e31626
Add audio player (#11644) 2019-08-23 22:38:02 +02:00
Eugen Rochko
73ca0bb925
Add option to include reported statuses in warning e-mail (#11639) 2019-08-23 22:37:23 +02:00
ThibG
37f612074e Fix items in StatusContent render list not all having a key (#11645) 2019-08-23 21:02:59 +02:00
Eugen Rochko
4ef8d8b77c
Add header to trends section and change refresh rate to 15 minutes (#11641) 2019-08-23 05:05:21 +02:00
ThibG
5ab1e0e738 Restore hashtag suggestions from local tag history (#11632) 
* Restore hashtag suggestions from local tag history

* Append local hashtag suggestions instead of prepending them

* Do not display inaccurate usage statistics for hashtags not retrieved from API

* Fixup
 2019-08-22 04:37:18 +02:00
ThibG
d857d0d14d Fix trending hashtags being fetched every 36 seconds instead of every hour (#11631) 2019-08-21 00:18:07 +02:00
ThibG
284a1562fb Fix typo 2019-08-20 21:44:09 +02:00
Haelwenn (lanodan) Monnier
317fa43d9a Add support for <sup> formatting element 
This is based of 3e095cab83f3e88c5f5f4ca9d7029379ed5b5b56

Related: https://git.pleroma.social/pleroma/pleroma/issues/1191
 2019-08-20 21:44:09 +02:00
ThibG
f1528ea3c4 [Glitch] Fix handling of audio files in account media gallery 
Port b48c7ee059d0e08fff4bdf7fe7b0e09565288252 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-20 20:38:42 +02:00
Thibaut Girka
81d2d71094 Merge branch 'master' into glitch-soc/merge-upstream 2019-08-20 20:30:44 +02:00
ThibG
b48c7ee059 Fix handling of audio files in account media gallery (#11629) 
Fixes #11627
 2019-08-20 19:46:41 +02:00
Thibaut Girka
fae9e34484 Add button to edit media description from missing description confirmation dialog 2019-08-20 11:33:35 +02:00
Thibaut Girka
dff4ccd7e9 Remove code for giving focus to first media without description 
Since the textarea is in a modal, now…
 2019-08-20 10:55:03 +02:00
Thibaut Girka
1d40325e7c Fix composer options colors in glitch-soc light theme 2019-08-19 22:18:43 +02:00
Thibaut Girka
a334cbcb20 Move character counter to the options box to match upstream styling 2019-08-19 21:56:25 +02:00
Thibaut Girka
ed4317b549 [Glitch] Fix hidden statuses losing focus 
Port 0d13a9cd13def44e10652275fed86d6d6d8e1a99 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
ThibG
ab0961fe9a [Glitch] Improve focal point modal on mobile 
Port 2ca6b2bb6c9e811ad98e3df23e70efbf22882e42 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
ThibG
fcd2244015 [Glitch] Allow clicking behind preview 
Port d37126fd03e47c32eaf532937dfc843b952d0d5a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
Eugen Rochko
91d968bf72 [Glitch] Fix edit media modal on small screens, touch events 
Port 1bea3181975f377bbccfe92691e2cd281b298ec6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
Eugen Rochko
5c35c9c409 [Glitch] Fix tesseract.js being part of the common chunk 
Port dfe60598899738250fc707db91048b871ab09282 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
Eugen Rochko
41c7fec796 [Glitch] Add OCR tool to media editing modal 
Port 28636f43e4b0c04befa243b847c38e81c90f1289  to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
Thibaut Girka
066034c62e Refactor character counter to match upstream 2019-08-19 21:56:25 +02:00
Eugen Rochko
ab019800f8 [Glitch] Add media editing modal 
Port 23f7afa562c49b24e979505680463bc712b11d94 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
Eugen Rochko
f8e7c69861 [Glitch] Add explanation to featured hashtags page and profile 
Port SCSS changes from b348c9b0dbd72f2a9930f9fcbbe72cd1c6b3efd8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
ThibG
5971ea7466 [Glitch] Add public blocks to /about/blocks 
Port SCSS changes from 9b6a5ed109e1986149c1f15a41d4f442ae8ae39c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
ThibG
4e9794f533 [Glitch] Fix client-side resizing of image uploads 
Port f178a01c11a4af077926dd035a0c4c44f6b3985c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:49:39 +02:00