Commit graph

39662 commits

Author SHA1 Message Date
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
d35f558b37 Use local time in audit log (#10751) 2019-05-11 06:46:01 +02:00
nzws
be851321c0 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
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
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
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
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
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
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
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
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
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
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
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
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
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
e55cf0042f Fix media description confirmation modal
Fixes #1040
2019-05-10 11:49:00 +02:00
Thibaut Girka
d4d4e84324 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
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
5ba0684958 Add strings for Slovak (#10734)
* Add strings for Slovak

* Update sk.yml
2019-05-09 23:16:05 +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
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
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
9767db2a6b Add ES_PREFIX in .env.production.sample (#10087) 2019-05-09 22:41:27 +02:00
Stanislas
a3c7dd92f3 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
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
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
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
a571b07557 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
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
4870d7f122 Add some caching for HTML versions of statuses pages (#10701) 2019-05-09 22:03:44 +02:00
ThibG
26fc21c188 Add some caching for HTML versions of statuses pages (#10701) 2019-05-09 22:03:44 +02:00
Maciek Baron
fc40391743 Improve poll link accessibility (#10720)
* Add distinction between hover and active/focus states
* Resolves #10198
2019-05-09 22:03:32 +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
8d4c489681 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
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
5ad2a7b5dc 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
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
3288f4a571 Bring back crossed eye icon on gallery (#10715) 2019-05-08 18:01:33 +02:00
Jeong Arm
09eea46631 Bring back crossed eye icon on gallery (#10715) 2019-05-08 18:01:33 +02:00
Thibaut Girka
e9f0c31dc6 Fix tabs bar on mobile
Fixes #1037
2019-05-08 00:32:53 +02:00
Thibaut Girka
3191c3b349 Fix tabs bar on mobile
Fixes #1037
2019-05-08 00:32:53 +02:00
nzws
6b71076391 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
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
40a480ea34 Fix front-end crash when a video has a blurhash and is hidden behind a CW 2019-05-07 22:33:37 +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]
021c89c896 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