about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-03-16Fix relationships controller/view wrt. glitch-soc theming engineThibaut Girka
2019-03-16Do not try to parse gif files as CSS or JSThibaut Girka
2019-03-16Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-16Do not use @babel/preset-env to compile node_modules (#10289)Yamagishi Kazutoshi
2019-03-16perf: remove stats.json generation in webpack (#10290)Nolan Lawson
* perf: remove stats.json generation in webpack * fix code comment
2019-03-16Add relationship manager UI (#10268)Eugen Rochko
2019-03-16perf: remove zopfli to speed up webpack (#10288)Nolan Lawson
2019-03-16Add specs for action log helper (#9605)ysksn
* 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-15Bump webpacker from 3.5.5 to 4.0.2 (#10277)Yamagishi Kazutoshi
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-15Bump aws-sdk-s3 from 1.31.0 to 1.32.0 (#10279)dependabot[bot]
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-15Bump oj from 3.7.9 to 3.7.10 (#10278)dependabot[bot]
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-15Fix detailed poll validation errors not being returned in the API (#10261)Eugen Rochko
No more "Owned poll is invalid"
2019-03-15Show disappointed elephant if web UI crashes (#10275)Eugen Rochko
* 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-15Fix maxed-out invites not showing up as expired in UI (#10274)Eugen Rochko
2019-03-15Fix language detection of non-latin alphabets even at few characters (#10276)Eugen Rochko
2019-03-15Add `visibility` param to reblog REST API (#9851)Eugen Rochko
Use async worker for creating reblog notification to improve performance
2019-03-15Upgrade yargs to v12.0 (#9862)Yamagishi Kazutoshi
2019-03-15Add a preferences API so apps can share basic behaviours (#10109)Eugen Rochko
2019-03-14Merge pull request #960 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-03-14I18n: Update Czech translation (#10272)Aditoo17
2019-03-14Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-14Migrate existing `open_registrations` setting to the new ↵ThibG
`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[Glitch] Admission-based registrations modeEugen Rochko
Port SCSS changes from 51e154f5e87968d6bb115e053689767ab33e80cd to glitch-soc
2019-03-14[Glitch] Improve invites list with click-to-copy inputsEugen Rochko
Port 6e3936aa6f4296ac202b54c0b178b4fa825d7885 to glitch-soc
2019-03-14Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.
2019-03-14Fix error in AdminMailer#new_pending_account (#10264)Eugen Rochko
2019-03-14Fix wrong method used in PollExpirationNotifyWorker (#10265)Eugen Rochko
2019-03-14Admission-based registrations mode (#10250)Eugen Rochko
Fix #6856 Fix #6951
2019-03-14Improve invites list with click-to-copy inputs (#10259)Eugen Rochko
2019-03-14Refactor User model, extract PamAuthenticable, LdapAuthenticable (#10217)Eugen Rochko
2019-03-14[Security] Bump rails from 5.2.2 to 5.2.2.1 (#10257)dependabot[bot]
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-13Merge pull request #958 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-03-13[Glitch] Add UI for enabling/disabling poll notificationsThibG
2019-03-13Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-13Add UI for enabling/disabling poll notifications (#10255)ThibG
* 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-13Merge pull request #957 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-03-13[Glitch] Add muted style for polls in web UIEugen Rochko
Port 5b50c2cbaa75a07b5f665a0d55cbfd79de67cc63 to glitch-soc
2019-03-13[Glitch] Fix public timeline page not paginating correctlyEugen Rochko
Port da45b8b4c9bf00495bb967dda38064ac74b85ead to glitch-soc
2019-03-13[Glitch] Redesign landing pageEugen Rochko
Port 65fffeac3f960f9c74d693525a73ac14b201bf2b to glitch-soc
2019-03-13Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-13i18n: Add Japanese translations for new landing page (#10254)mayaeh
* 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-13Fix `tagged` param not being normalized before querying tags (#10249)Eugen Rochko
2019-03-13Fix to limit to discoverable accounts. (#10253)mayaeh
2019-03-13Bump active_record_query_trace from 1.6.1 to 1.6.2 (#10252)dependabot[bot]
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-12Fix poll update handler calling method was that was not available (#10246)Eugen Rochko
* Fix poll update handler calling method was that was not available Fix regression from #10209 * Refactor VoteService * Refactor ActivityPub::DistributePollUpdateWorker and optimize it * Fix typo * Fix typo
2019-03-12Optimize RemoveStatusService by removing n+1 query and using shared inboxes ↵Eugen Rochko
(#10247)
2019-03-12Add muted style for polls in web UI (#10248)Eugen Rochko
2019-03-12Fix public timeline page not paginating correctly (#10245)Eugen Rochko
2019-03-12Redesign landing page (#10232)Eugen Rochko
2019-03-12Bump concurrent-ruby from 1.1.4 to 1.1.5 (#10242)dependabot[bot]
Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby) from 1.1.4 to 1.1.5. - [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases) - [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/ruby-concurrency/concurrent-ruby/compare/v1.1.4...v1.1.5) Signed-off-by: dependabot[bot] <support@dependabot.com>
generated by cgit-pink (git 2.37.1) at 2024-12-28 00:20:18 +0000