me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
9061 commits 2 branches 0 tags 429 MiB
Commit graph

9061 commits

This branch
This branch
All branches
Author SHA1 Message Date
ThibG
6b0eda14a1 Avoid race condition when streaming deleted statuses (#10280) 
* Avoid race condition when streaming deleted statuses

* Move redis lock to DistributionWorker to avoid extra Redis value
 2019-03-16 20:18:47 +01:00
Nolan Lawson
db06b25376 fix: update to emoji-mart 2.10.0 (#10281) 
* fix: update to emoji-mart 2.10.0

* remove useless change

* fix CSS style of emoji picker, improve a11y

* fix missing newline in scss

* fix the title and input fonts
 2019-03-16 20:13:15 +01:00
Eugen Rochko
6a3f08661f
Fix scrollbar styles on compose textarea, small bugs (#10292) 2019-03-16 20:10:42 +01:00
ThibG
6af2300454
Merge pull request #961 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-16 17:10:27 +01:00
Thibaut Girka
0fbe90e2d3 Fix settings/flavours 
Update theming system to use new paths for media files
 2019-03-16 16:21:20 +01:00
Eugen Rochko
47c8707f01 [Glitch] Add relationship manager UI 
Port SCSS changes from 1c113fd72d to glitch-soc
 2019-03-16 14:36:29 +01:00
Thibaut Girka
8e5d72dba8 Fix relationships controller/view wrt. glitch-soc theming engine 2019-03-16 14:26:14 +01:00
Thibaut Girka
3960a9d605 Do not try to parse gif files as CSS or JS 2019-03-16 14:23:50 +01:00
Thibaut Girka
4df3b7cb06 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/follower_domains_controller.rb
  Removed upstream. Did the same here. Maybe we should not have?
- config/locales/en.yml
  Upstream removed the “Authorized followers” page and associated
  translations. This is too close in the file to our glitch-soc-specific
  “flavour” string. No actual conflict.
- config/locales/ja.yml
  Same as above.
- config/locales/pl.yml
  Same as above.
- config/navigation.rb
  No real conflict. New route added too close to the glitch-soc-specific
  “flavours” one.
- config/webpack/configuration.js
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- config/webpack/loaders/babel.js
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
  The contents of this file have been moved to package.json.
- config/webpack/shared.js
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- config/webpacker.yml
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- jest.config.js
  The contents of this file have been moved to package.json.
- package.json
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
- yarn.lock
  Upstream refactored the webpack(er) configuration quite a bit.
  Tried to keep up.
 2019-03-16 14:14:20 +01:00
Yamagishi Kazutoshi
1a0d3c9c65 Do not use @babel/preset-env to compile node_modules (#10289) 2019-03-16 11:24:26 +01:00
Nolan Lawson
d5c79975ea perf: remove stats.json generation in webpack (#10290) 
* perf: remove stats.json generation in webpack

* fix code comment
 2019-03-16 11:23:54 +01:00
Eugen Rochko
1c113fd72d
Add relationship manager UI (#10268) 2019-03-16 11:23:22 +01:00
Nolan Lawson
8da5b8e669 perf: remove zopfli to speed up webpack (#10288) 2019-03-16 04:02:30 +01:00
ysksn
782b622f5f Add specs for action log helper (#9605) 
* Add specs for ActionLogHelper

* Make some methods private

methods below never referenced from outside of their module:

- #linkable_log_target
- #log_target_from_history
 2019-03-16 00:57:23 +09:00
Yamagishi Kazutoshi
8347479f5d Bump webpacker from 3.5.5 to 4.0.2 (#10277) 
Bumps [webpacker](https://github.com/rails/webpacker) from 3.5.5 to 4.0.2.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v3.5.5...v4.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2019-03-15 15:05:31 +01:00
dependabot[bot]
5a9978f02a Bump aws-sdk-s3 from 1.31.0 to 1.32.0 (#10279) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.31.0 to 1.32.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.31.0...v1.32.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-15 14:53:34 +01:00
dependabot[bot]
2e7b2b4da9 Bump oj from 3.7.9 to 3.7.10 (#10278) 
Bumps [oj](https://github.com/ohler55/oj) from 3.7.9 to 3.7.10.
- [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.7.9...v3.7.10)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-15 14:53:24 +01:00
Eugen Rochko
3ad3223b46
Fix detailed poll validation errors not being returned in the API (#10261) 
No more "Owned poll is invalid"
 2019-03-15 13:36:38 +01:00
Eugen Rochko
c20d096e6a
Show disappointed elephant if web UI crashes (#10275) 
* Do not crash the whole UI when loading an invalid column

* Add error boundary component to catch Web UI crashes

* Add stack trace on supported browsers

* Add component stack info, pre-format everything for github

* Make “Reload” a clickable link that calls window.location.reload()

* Remove elephant friend from error boundary, make title stand out more

* Simplify error boundary to only a graphic
 2019-03-15 05:35:45 +01:00
Eugen Rochko
ff565524aa
Fix maxed-out invites not showing up as expired in UI (#10274) 2019-03-15 05:35:17 +01:00
Eugen Rochko
1b167707c2
Fix language detection of non-latin alphabets even at few characters (#10276) 2019-03-15 05:07:09 +01:00
Eugen Rochko
ba84b6d4d7
Add visibility param to reblog REST API (#9851) 
Use async worker for creating reblog notification to improve performance
 2019-03-15 04:36:41 +01:00
Yamagishi Kazutoshi
317c43b75b Upgrade yargs to v12.0 (#9862) 2019-03-15 03:53:38 +01:00
Eugen Rochko
d94e21f933
Add a preferences API so apps can share basic behaviours (#10109) 2019-03-15 02:39:20 +01:00
ThibG
c2fa0f7c40
Merge pull request #960 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-14 22:11:56 +01:00
Aditoo17
85c3bbb238 I18n: Update Czech translation (#10272) 2019-03-14 20:59:26 +01:00
Thibaut Girka
09ac5e7528 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 20:11:17 +01:00
ThibG
9915777a17 Migrate existing open_registrations setting to the new registrations_mode (#10269) 
* Migrate existing `open_registrations` setting to the new `registrations_mode`

Fixes #10263

* Remove unrelated db changes that have creeped in
 2019-03-14 20:10:43 +01:00
Eugen Rochko
338f1327e9 [Glitch] Admission-based registrations mode 
Port SCSS changes from 51e154f5e8 to glitch-soc
 2019-03-14 17:54:44 +01:00
Eugen Rochko
d8b43f4bd6 [Glitch] Improve invites list with click-to-copy inputs 
Port 6e3936aa6f to glitch-soc
 2019-03-14 17:44:39 +01:00
Thibaut Girka
07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/views/admin/settings/edit.html.haml:
  Conflict due to how the theming settings change.
 2019-03-14 17:17:20 +01:00
Eugen Rochko
874bd3ac0c
Fix error in AdminMailer#new_pending_account (#10264) 2019-03-14 14:20:22 +01:00
Eugen Rochko
6841d8fc74
Fix wrong method used in PollExpirationNotifyWorker (#10265) 2019-03-14 14:04:07 +01:00
Eugen Rochko
51e154f5e8
Admission-based registrations mode (#10250) 
Fix #6856
Fix #6951
 2019-03-14 05:28:30 +01:00
Eugen Rochko
6e3936aa6f
Improve invites list with click-to-copy inputs (#10259) 2019-03-14 05:25:49 +01:00
Eugen Rochko
9e33174604
Refactor User model, extract PamAuthenticable, LdapAuthenticable (#10217) 2019-03-14 02:13:42 +01:00
dependabot[bot]
dfb9efae81 [Security] Bump rails from 5.2.2 to 5.2.2.1 (#10257) 
Bumps [rails](https://github.com/rails/rails) from 5.2.2 to 5.2.2.1. **This update includes security fixes.**
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.2...v5.2.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-14 00:25:53 +01:00
ThibG
fa75324059
Merge pull request #958 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-13 23:44:37 +01:00
ThibG
931ecc8824 [Glitch] Add UI for enabling/disabling poll notifications 2019-03-13 22:21:52 +01:00
Thibaut Girka
5ffdc5426e Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 21:35:43 +01:00
ThibG
65d9004ac9 Add UI for enabling/disabling poll notifications (#10255) 
* Add UI for enabling/disabling poll notifications

* Add poll notifications to the (advanced) quick filter bar

* Update poll notification message

“Your poll has ended” → “A poll you have voted in has ended”

* Clear up associated notifications when a poll is deleted
 2019-03-13 19:29:54 +01:00
ThibG
3005e473a0
Merge pull request #957 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-13 16:55:07 +01:00
Eugen Rochko
387f253f31 [Glitch] Add muted style for polls in web UI 
Port 5b50c2cbaa to glitch-soc
 2019-03-13 16:02:36 +01:00
Eugen Rochko
458db4333a [Glitch] Fix public timeline page not paginating correctly 
Port da45b8b4c9 to glitch-soc
 2019-03-13 15:56:51 +01:00
Eugen Rochko
bbb9ff0e84 [Glitch] Redesign landing page 
Port 65fffeac3f to glitch-soc
 2019-03-13 15:53:00 +01:00
Thibaut Girka
02062aab55 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/about_controller.rb
- app/controllers/tags_controller.rb
- app/views/about/show.html.haml
- spec/views/about/show.html.haml_spec.rb
 2019-03-13 15:16:02 +01:00
mayaeh
c6f018091e i18n: Add Japanese translations for new landing page (#10254) 
* yarn manage:translations && i18n-tasks add-missing

* Update Japanese translations for new landing page.

I don't change the tagline from English yet.
I think that translating a tagline is difficult and requires time-consuming discussions.

Some translations related about the poll are already done in Weblate, so I will leave it as it is.
 2019-03-13 14:56:40 +01:00
Eugen Rochko
06663fcf87
Fix tagged param not being normalized before querying tags (#10249) 2019-03-13 13:02:13 +01:00
mayaeh
d4ef90eae3 Fix to limit to discoverable accounts. (#10253) 2019-03-13 13:01:57 +01:00
dependabot[bot]
0a6840564a Bump active_record_query_trace from 1.6.1 to 1.6.2 (#10252) 
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace) from 1.6.1 to 1.6.2.
- [Release notes](https://github.com/brunofacca/active-record-query-trace/releases)
- [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/master/HISTORY.md)
- [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.6.1...v1.6.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-13 14:57:02 +09:00