Commit graph

9332 commits

Author SHA1 Message Date
Thibaut Girka
bfc509f44a Add database row to hold status content type 2019-05-17 23:51:14 +02:00
ThibG
c1cf8c1636
Merge pull request #1049 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-05-15 18:44:21 +02:00
Thibaut Girka
6badf2d252 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-15 17:11:40 +02:00
manuelviens
f4f22391b2 Update simple_form.fr.yml (#10756)
Remplacement des ' par des ’
2019-05-15 14:52:11 +09:00
ThibG
c1c8c7b2c8 Minor performance improvements and cleanup in formatter (#10765) 2019-05-15 06:54:06 +02:00
Neil Moore
4ab094d35e 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
14f6ce2885 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
564106c5d6 Update slovak simple_forms (#10763) 2019-05-14 19:55:47 +09:00
dependabot[bot]
76901b65c4 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]
5a24275202 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]
d90104204f 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
4bab7d7640 Fix rich text style in reply indicator 2019-05-13 17:13:02 +02:00
Thibaut Girka
87d16698c2 Fix rich text styling on public pages 2019-05-13 17:13:02 +02:00
Thibaut Girka
cd534830ad Fix text color of some formatted elements in notifications 2019-05-12 19:23:32 +02:00
nzws
3e15a845c1 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
dd118449c2 Fix incorrect reference to raw_content (it is raw_text instead) (#10753) 2019-05-11 23:56:07 +02:00
ThibG
f6838a28f6
Merge pull request #1044 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-05-11 22:05:39 +02:00
ThibG
93085c273c [Glitch] Use raw content if available on Delete & Redraft
Port front-end changes from 6d44f2441b to glitch-soc
2019-05-11 21:46:23 +02:00
Thibaut Girka
2b97d9d780 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-11 18:23:46 +02:00
Thibaut Girka
3ea5c045d7 Use a checkbox for the “Mark media as sensitive” composer button
Fixes #1039
2019-05-11 12:35:38 +02:00
ThibG
fe00f7a7e4
Merge pull request #1043 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-05-11 12:35:25 +02:00
ThibG
6d44f2441b 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
be851321c0 Use local time in audit log (#10751) 2019-05-11 06:46:01 +02:00
Maciek Baron
14d855c429 [Glitch] Improve poll link accessibility
Port 0402c52f28 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-10 19:05:57 +02:00
nzws
78ff7e3821 [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
96f0747afe [Glitch] Add confirm modal for unboosting toots
Port fe8a8f779e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-10 18:56:01 +02:00
Alix Rossi
775ee63b71 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
d25e358f9f 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
6dc9baad2a 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
68629f2773 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
d4d4e84324 Fix media description confirmation modal
Fixes #1040
2019-05-10 11:49:00 +02:00
manuelviens
780d99c204 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
9962174a1f Add strings for Slovak (#10734)
* Add strings for Slovak

* Update sk.yml
2019-05-09 23:16:05 +02:00
manuelviens
9d4e9015a7 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
a3c7dd92f3 Add ES_PREFIX in .env.production.sample (#10087) 2019-05-09 22:41:27 +02:00
Aurélien Reeves
fe8a8f779e 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
f2be71c293 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
ThibG
62f5235b6f Prevent silenced local users from notifying remote users not following them (#10575)
* Prevent silenced local users from notifying remote users not following them

This is an attempt to extend the local restrictions of silenced users to the
federation.

* Add tests

* Add tests for making sure private status don't get sent over OStatus
2019-05-09 22:05:43 +02:00
ThibG
26fc21c188 Add some caching for HTML versions of statuses pages (#10701) 2019-05-09 22:03:44 +02:00
Maciek Baron
0402c52f28 Improve poll link accessibility (#10720)
* Add distinction between hover and active/focus states
* Resolves #10198
2019-05-09 22:03:32 +02:00
Jeong Arm
03801fcaa5 Remove custom emojis on "tootctl domains purge" (#10721)
* Remove custom emojis on domains purge

* Change message "Removing" to "Removed"
2019-05-09 22:03:20 +02:00
Jeong Arm
ce8635605c Record deleted(by mod) status to prevent re-appear (#10732)
* Record deleted(by mod) status to prevent re-appear

* Move to Tombstone

* Add missing migration script
2019-05-09 22:03:02 +02:00
Jeong Arm
09eea46631 Bring back crossed eye icon on gallery (#10715) 2019-05-08 18:01:33 +02:00
Thibaut Girka
3191c3b349 Fix tabs bar on mobile
Fixes #1037
2019-05-08 00:32:53 +02:00
nzws
5c82d660d1 Fix some colors of high contrast theme (#10711)
* Fix "nothing here" text color of high contrast

* Fix counter border color of high contrast
2019-05-07 23:53:58 +02:00
Thibaut Girka
2c767f44bf Fix front-end crash when a video has a blurhash and is hidden behind a CW 2019-05-07 22:33:37 +02:00
dependabot[bot]
fbff73eccb Bump redis from 4.1.0 to 4.1.1 (#10722)
Bumps [redis](https://github.com/redis/redis-rb) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/redis/redis-rb/releases)
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v4.1.0...v4.1.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-07 14:47:46 +09:00
spla
7562602df8 i18n Update Catalan translation (#10719)
* Updated Catalan strings

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* bundle exec i18n-tasks

* Update ca.json

* Update simple_form.ca.yml

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translation

* i18n Update Catalan translation
2019-05-07 00:55:37 +09:00
dependabot[bot]
7e73a8b8bf Bump parallel_tests from 2.28.0 to 2.29.0 (#10716)
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.28.0 to 2.29.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.28.0...v2.29.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-06 15:12:55 +09:00
ThibG
b2f5b1045f Add description on hover in media gallery (#10713) 2019-05-06 05:33:56 +02:00