c29da32add
[Glitch] Update reset.scss from upstream
2018-11-06 16:03:53 +01:00
e18018e930
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-06 15:22:44 +01:00
15fd2bb8cd
[Security] Bump rack from 2.0.5 to 2.0.6 ( #9214 )
...
Bumps [rack](https://github.com/rack/rack ) from 2.0.5 to 2.0.6. **This update includes security fixes.**
- [Release notes](https://github.com/rack/rack/releases )
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rack/rack/compare/2.0.5...2.0.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-06 05:36:56 +01:00
88d15e4f6c
Bump active_model_serializers from 0.10.7 to 0.10.8 ( #9209 )
...
Bumps [active_model_serializers](https://github.com/rails-api/active_model_serializers ) from 0.10.7 to 0.10.8.
- [Release notes](https://github.com/rails-api/active_model_serializers/releases )
- [Changelog](https://github.com/rails-api/active_model_serializers/blob/master/CHANGELOG-0-10.md )
- [Commits](https://github.com/rails-api/active_model_serializers/compare/v0.10.7...v0.10.8 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 19:01:17 +01:00
6e72dda7ef
Temporarily hold timeline if mouse moved recently ( fixes #8630 ) ( #9200 )
...
- On recent mouse movement, hold timeline position so statuses remain in
place for interactions in progress.
- If the timeline had been scrolled to the top before mouse movement,
restore scroll on mouse idle.
2018-11-05 18:59:41 +01:00
1093295902
Update resolve_url_service.rb ( #9188 )
2018-11-05 18:54:07 +01:00
d2a9ea58da
Allow joining several hashtags in a single column ( #8904 )
...
* Nascent tag menu on frontend
* Hook up frontend to search
* Tag intersection backend first pass
* Update yarnlock
* WIP
* Fix for tags not searching correctly
* Make radio buttons function
* Simplify radio buttons with modeOption
* Better naming
* Rearrange options
* Add all/any/none functionality on backend
* Small PR cleanup
* Move to service from scope
* Small cleanup, add proper service tests
* Don't use send with user input :D
* Set appropriate column header
* Handle auto updating timeline
* Fix up toggle function
* Use tag value correctly
* A bit more correct to use 'self' rather than 'all' in status scope
* Fix some style issues
* Fix more code style issues
* Style select dropdown more better
* Only use to_id'ed value to ensure no SQL injection
* Revamp frontend to allow for multiple selects
* Update backend / col header to account for more flexible tagging
* Update brakeman ignore
* Codeclimate suggestions
* Fix presenter tag_url
* Implement initial PR feedback
* Handle additional tag streaming
* CodeClimate tweak
2018-11-05 18:53:25 +01:00
43bfd0a7d0
Implement adding a user to a list from their profile ( #9062 )
...
* Add add user to list from thier profile
* Fix listAdderCss
2018-11-05 18:52:38 +01:00
6cd08a266a
Check for empty "last_status" before sorting DM column ( #9207 )
...
* Check for empty "last_status" before sorting
* Small touchups for codeclimate
2018-11-05 18:51:43 +01:00
bd31e76dcf
fix(reset): Property name for styled scrollbars ( #9210 )
...
https://webplatform.news/issues/2018-10-26
2018-11-05 18:51:26 +01:00
8c19b9abce
Bump rack-attack from 5.4.1 to 5.4.2 ( #9186 )
...
Bumps [rack-attack](https://github.com/kickstarter/rack-attack ) from 5.4.1 to 5.4.2.
- [Release notes](https://github.com/kickstarter/rack-attack/releases )
- [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kickstarter/rack-attack/compare/v5.4.1...v5.4.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 18:50:53 +01:00
bdc036586f
Bump redis from 4.0.2 to 4.0.3 ( #9187 )
...
Bumps [redis](https://github.com/redis/redis-rb ) from 4.0.2 to 4.0.3.
- [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.0.2...v4.0.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-03 09:34:43 +09:00
235e9b13ff
Fix timestamp position in public pages with RTL languages
2018-10-31 11:37:47 +01:00
080a6cb6f3
Fix styling of display names in public pages
2018-10-31 11:37:47 +01:00
960ebc9e36
Merge pull request #803 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes (v2.6.1)
2018-10-31 11:15:37 +01:00
33ad16faa7
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-31 10:08:36 +01:00
13567f13af
[Glitch] Port some of upstream's getting started footer links
2018-10-31 10:07:41 +01:00
56e256b686
Bump version to 2.6.1 ( #9172 )
2018-10-31 01:04:45 +01:00
083f015f9f
Fix reducer error when conversation has no last status in web UI ( #9173 )
...
Fix #9170
2018-10-31 00:55:20 +01:00
3981da6f90
Revert "Fix FetchAtomService content type handling ( #9132 )" ( #9171 )
...
This reverts commit c20d55f7dd
2018-10-31 00:43:34 +01:00
15fd0fb2cf
Bump version to 2.6.0 ( #9149 )
...
* Bump version to 2.6.0
* Update CHANGELOG.md
2018-10-30 22:06:59 +01:00
407cab9844
[i18n] Update for Occitan ( #9169 )
...
* Update oc.json
* Update oc.yml
* Update simple_form.oc.yml
* Update simple_form.oc.yml
* Update oc.json
2018-10-30 22:06:31 +01:00
1fad3301a1
Remove progress estimate from MigrateAccountConversations ( #9168 )
2018-10-30 21:09:33 +01:00
64fedb341a
Merge pull request #802 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-30 20:10:09 +01:00
24aa422858
Specify node version to not use node11 ( #9166 )
...
uWS has no support node11 yet.
2018-10-30 19:46:20 +01:00
5ad4bcbece
[Glitch] Fix empty display name precedence over username in web UI
...
Port 4084814d8a
2018-10-30 17:54:50 +01:00
fd18ed4cea
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/auth/sessions_controller.rb
Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.
2018-10-30 17:52:08 +01:00
8bef422043
Add a local setting for inline preview cards
2018-10-30 17:51:06 +01:00
4fe81a99c6
Add a “link” status icon for toots with a preview card
2018-10-30 17:51:06 +01:00
7f023b3b98
[Glitch] Fix dimensions of preview cards, fix crash in web UI, fix warning
...
Port 766a808de4
2018-10-30 17:51:06 +01:00
18870c45f1
[Glitch] Include preview cards in status entity in REST API
...
Port cf2ab9c394
2018-10-30 17:51:06 +01:00
4c8ac98fa0
Bump version to 2.6.0rc4 ( #9164 )
...
* Bump version to 2.6.0rc4
* Update CHANGELOG.md
2018-10-30 17:37:49 +01:00
4084814d8a
Fix empty display name precedence over username in web UI ( #9163 )
...
Fix #9131
2018-10-30 17:06:12 +01:00
e242688a74
Fix td instead of th in sessions table header ( #9162 )
...
Fix #9130
2018-10-30 17:00:34 +01:00
ca87d98d16
Revert "feat(auth/session_controller): Send Clear-Site-Data when logging out (8627)" ( #9161 )
...
This reverts commit 0c756cfd54
2018-10-30 16:25:54 +01:00
c20d55f7dd
Fix FetchAtomService content type handling ( #9132 )
...
* Add profile to json+ld in Accept
It's required by the ActivityPub spec
* Use headers['Content-type'] instead of mime_type
mime_type strips the profile from the content type, but it's still available raw in the headers hash
* Add test for ld+json with profile
2018-10-30 15:07:57 +01:00
a43fdd72ba
[i18n] Update for Occitan ( #9157 )
...
* Update oc.json
* Update devise.oc.yml
* Update oc.yml
* Update oc.json
2018-10-30 15:05:01 +01:00
d84886f35e
Accept the same payload in multiple inboxes and deliver ( #9150 )
2018-10-30 15:03:55 +01:00
c15b8ee75b
Always let through notifications from staff ( #9152 )
...
* Always let through notifications from staff
Follow-up to #8993
* Let messages from staff through, but no other notifications
2018-10-30 15:02:55 +01:00
cfe92b50bb
Fix Pleroma mentions being fetched as preview cards ( #9158 )
2018-10-30 15:02:24 +01:00
4d5a219013
[Security] Bump loofah from 2.2.2 to 2.2.3 ( #9160 )
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.2.2 to 2.2.3. **This update includes security fixes.**
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.2.2...v2.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-30 22:59:11 +09:00
a22e278344
Merge pull request #801 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-30 14:20:25 +01:00
d004994787
Remove duplicate and outdated specs
2018-10-30 12:46:05 +01:00
bdcdc35df7
[Glitch] RTL: fix toot privacy preferences radio buttonss
...
Port 27b5a57f6d
2018-10-30 11:24:40 +01:00
cecd8b25c4
[Glitch] RTL: fix preferences page checkbox margins
...
Port 4e034437e3
2018-10-30 11:24:19 +01:00
7406141a71
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-30 11:22:25 +01:00
8633ac4b68
Bump oj from 3.6.12 to 3.7.0 ( #9155 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.6.12 to 3.7.0.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.6.12...v3.7.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-30 06:39:52 +01:00
fcd79aba0b
Make detailed-status__wrapper actually wrap detailed status ( #8547 )
...
* Remove class from scrollable div
.detailed-status__wrapper does not actually wrap the detailed status here
* Re-add class to focusable div
.detailed-status__wrapper now wraps the detailed status instead of the entire scrollable area
2018-10-30 06:33:02 +01:00
bd79977354
Bump i18n-tasks from master to 0.9.28 ( #9148 )
2018-10-30 01:06:47 +01:00
27b5a57f6d
RTL: fix toot privacy preferences radio buttonss ( #9146 )
2018-10-30 00:49:29 +01:00
Thibaut Girka