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

9345 Commits (d48d1ed534473a798187fd7633c37a2b8bb37a75)

Author SHA1 Message Date
Thibaut Girka d48d1ed534 Minor optimization 2019-05-17 23:51:14 +02:00
Thibaut Girka b83cdc9b02 Export fallback content type and use it as default in WebUI 2019-05-17 23:51:14 +02:00
Thibaut Girka 3d03d084cd Properly escape HTML in code blocks 2019-05-17 23:51:14 +02:00
Thibaut Girka 7aece1eec5 Add option for default toot content-type 2019-05-17 23:51:14 +02:00
Thibaut Girka ee3dfdf6a1 Fix autolinking, and newlines in code blocks 
Autolinking is now performed *after* the Markdown pass, by replacing HTML
tags with zero-width spaces and running the twitter-text extractor as usual,
except it does not auto-link URLs to avoid links in links…
 2019-05-17 23:51:14 +02:00
Thibaut Girka dfeda8857f Hide content-type dropdown by default 2019-05-17 23:51:14 +02:00
Haelwenn (lanodan) Monnier 76d58bf63e Content-Type Dropdown: use the selected option icon for the menu 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-17 23:51:14 +02:00
Thibaut Girka 8a49df8ede Support proper content-type in Delete & Redraft 2019-05-17 23:51:14 +02:00
KokaKiwi 08a981dd25 Add status content type dropdown to compose box. 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-17 23:51:14 +02:00
Thibaut Girka 91ab9e2e4f Add API support for setting status content-type 2019-05-17 23:51:14 +02:00
Thibaut Girka 20c98d7a27 Serialize content-type on Delete & Redraft 2019-05-17 23:51:14 +02:00
Thibaut Girka c9696ef8a5 Add support for HTML-formatted toots 2019-05-17 23:51:14 +02:00
Thibaut Girka 8313ee07f6 Add support for markdown-formatted toots 2019-05-17 23:51:14 +02:00
Thibaut Girka 105f03a988 Add database row to hold status content type 2019-05-17 23:51:14 +02:00
ThibG 38272bbeb1 Merge pull request #1049 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-05-15 18:44:21 +02:00
Thibaut Girka 422dd06806 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-15 17:11:40 +02:00
manuelviens 7898b67b3d Update simple_form.fr.yml (#10756) 
Remplacement des ' par des ’
 2019-05-15 14:52:11 +09:00
ThibG 85a991cfa7 Minor performance improvements and cleanup in formatter (#10765) 2019-05-15 06:54:06 +02:00
Neil Moore 59f6637559 Adds click-able div that expands status (#10733) (#10766) 
The clickable div is positioned under the account avatar and covers
all empty space below it to the end of the status.
 2019-05-15 06:53:23 +02:00
ThibG f1a3135809 Record account suspend/silence time and keep track of domain blocks (#10660) 
* Record account suspend/silence time and keep track of domain blocks

* Also unblock users who were suspended/silenced before dates were recorded

* Add tests

* Keep track of suspending date for users suspended through the CLI

* Show accurate number of accounts that would be affected by unsuspending an instance

* Change migration to set silenced_at and suspended_at

* Revert "Also unblock users who were suspended/silenced before dates were recorded"

This reverts commit a015c65d2d1e28c7b7cfab8b3f8cd5fb48b8b71c.

* Switch from using suspended and silenced to suspended_at and silenced_at

* Add post-deployment migration script to remove `suspended` and `silenced` columns

* Use Account#silence! and Account#suspend! instead of updating the underlying property

* Add silenced_at and suspended_at migration to post-migration

* Change account fabricator to translate suspended and silenced attributes

* Minor fixes

* Make unblocking domains always retroactive
 2019-05-14 19:05:02 +02:00
Marek Ľach 0aaca064a6 Update slovak simple_forms (#10763) 2019-05-14 19:55:47 +09:00
dependabot[bot] 82a5359072 Bump capybara from 3.18.0 to 3.19.1 (#10758) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.18.0 to 3.19.1.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.18.0...3.19.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-14 15:01:47 +09:00
dependabot[bot] 90ef9cf9b0 Bump brakeman from 4.5.0 to 4.5.1 (#10757) 
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.5.0...v4.5.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-14 15:01:22 +09:00
dependabot[bot] e6f8b1ca09 Bump rubocop from 0.68.1 to 0.69.0 (#10762) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.68.1 to 0.69.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.68.1...v0.69.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-14 15:00:58 +09:00
Thibaut Girka d8e9a04354 Fix rich text style in reply indicator 2019-05-13 17:13:02 +02:00
Thibaut Girka 9f0ff9b6ea Fix rich text styling on public pages 2019-05-13 17:13:02 +02:00
Thibaut Girka 6e625755a6 Fix text color of some formatted elements in notifications 2019-05-12 19:23:32 +02:00
nzws f79d089b65 Fix some colors in light theme (#10754) 
* Fix typo in light theme

* Fix background color of empty column
 2019-05-12 05:15:42 +02:00
ThibG cfb69164ad Fix incorrect reference to raw_content (it is raw_text instead) (#10753) 2019-05-11 23:56:07 +02:00
ThibG ac5e68e918 Merge pull request #1044 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-05-11 22:05:39 +02:00
ThibG c8195e2da1 [Glitch] Use raw content if available on Delete & Redraft 
Port front-end changes from 2a917031c9 to glitch-soc
 2019-05-11 21:46:23 +02:00
Thibaut Girka 5262820fae Merge branch 'master' into glitch-soc/merge-upstream 2019-05-11 18:23:46 +02:00
Thibaut Girka 46b5085ced Use a checkbox for the “Mark media as sensitive” composer button 
Fixes #1039
 2019-05-11 12:35:38 +02:00
ThibG 0bb3ba2406 Merge pull request #1043 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-05-11 12:35:25 +02:00
ThibG 2a917031c9 Add toot source to delete result to ease Delete & Redraft (#10669) 
* Return Status with raw text in raw_content when deleting a status

* Use raw content if available on delete & redraft

* Rename raw_content to text; do not serialize formatted content when source is requested
 2019-05-11 06:46:43 +02:00
nzws d35f558b37 Use local time in audit log (#10751) 2019-05-11 06:46:01 +02:00
Maciek Baron e060819020 [Glitch] Improve poll link accessibility 
Port fc40391743 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-10 19:05:57 +02:00
nzws f625501c05 [Glitch] Fix some colors of high contrast theme 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-10 18:59:12 +02:00
Aurélien Reeves 22541e98e2 [Glitch] Add confirm modal for unboosting toots 
Port d225a952a8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-10 18:56:01 +02:00
Alix Rossi 062684bcf8 i18n: Update French translations (#10747) 
* Update French JSON

* i18n: Update fr.yml

* i18n: Update simple_form.fr.yml

* Update simple_form.fr.yml

* Update fr.yml
 2019-05-10 18:09:46 +02:00
Alix Rossi 1959e4e5ec i18n: Update Corsican translations (#10746) 
* i18n: Update Corsican translations

* Update co.yml

* Fix a translation in co.yml
 2019-05-10 18:09:34 +02:00
ThibG 01ba6c5d83 Change icon and label depending on whether media is marked as sensitive (#10748) 
* Change icon and label depending on whether media is marked as sensitive

* WiP use a checkbox
 2019-05-10 17:59:57 +02:00
Thibaut Girka 1bf48b01e3 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system
 2019-05-10 17:09:12 +02:00
Thibaut Girka e55cf0042f Fix media description confirmation modal 
Fixes #1040
 2019-05-10 11:49:00 +02:00
manuelviens f0b5e0c46d Update simple_form.fr.yml (#10726) 
* Minor modif and add

Modified '' by ’ and added invite_request

* Update simple_form.fr.yml

Modifications suggérées par ThibG

* Update simple_form.fr.yml

Remplacement des ' par des ’.

* Update simple_form.fr.yml

Ajout de deux petits espaces devant sessions:
 2019-05-09 23:16:24 +02:00
Marek Ľach 5ba0684958 Add strings for Slovak (#10734) 
* Add strings for Slovak

* Update sk.yml
 2019-05-09 23:16:05 +02:00
manuelviens 221a6a0e6d Update fr.yml (#10727) 
* Update fr.yml

Added missing lines

* Update fr.yml

Application des modifications de ThibG

* Update fr.yml

Modifications proposées par ThibG
 2019-05-09 23:15:39 +02:00
Stanislas 9767db2a6b Add ES_PREFIX in .env.production.sample (#10087) 2019-05-09 22:41:27 +02:00
Aurélien Reeves d225a952a8 Add confirm modal for unboosting toots (#10287) 
[#3815]

Display the boost modal also when unboosting toots.
 2019-05-09 22:39:26 +02:00
ThibG 5cf2f8c646 Add emoji suggestions to CW and poll option fields (#10555) 
* Refactor selectComposeSuggestion so that different paths can be updated

* Add suggestions in CW field

* Add emoji suggestion to poll options

* Attempt to fix CSS

* Hide suggestions by default

They will be enabled if the input has focus
 2019-05-09 22:10:27 +02:00