about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-08-21Merge pull request #660 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-08-21Merge branch 'master' into glitch-soc/masterThibaut Girka
Conflicts: config/routes.rb Added the “endorsements” route from upstream.
2018-08-21Revert to using Paperclip's filesystem storage, and fix dangling records in ↵ThibG
remove_remote (#8339) * Fix uncaching worker * Revert to using Paperclip's filesystem backend instead of fog-local fog-local has lots of concurrency issues, causing failure to delete files, dangling file records, and spurious errors UncacheMediaWorker
2018-08-21Get rid of all batch order warnings (#8334)Eugen Rochko
2018-08-21Remove annoying Notification#cache_ids scope warning (#8333)Eugen Rochko
2018-08-20reorder simple form ul to list vertically (fixes #8236) (#8322)NecroTechno
* reorder simple form ul to list vertically (fixes #8236) * remove browser specific prefixes
2018-08-20Upgrade doorkeeper to 4.4.2 (#8321)ThibG
2018-08-20[Glitch] Add hotkey for follow requestsThibaut Girka
Port 25f6f41052b52a765a74e9e16d7411750ae46221 to glitch-soc
2018-08-20Make the privacy dropdown button not look strange when using top placementThibaut Girka
Inspired by 8fe1f8d4cecb9f2f749c1e1e77b2439dd640ddc5
2018-08-20[Glitch] Skip pagination logic entirely for pinned tootsThibaut Girka
2018-08-20Make non-link ColumnLinks behave as linksThibaut Girka
2018-08-20Add API endpoint to list featured accounts (fixes #8315) (#8317)ThibG
2018-08-20Skip pagination logic entirely for pinned toots (fixes #8302) (#8310)ThibG
2018-08-20Increase reach of Delete->Actor activities (#8305)Eugen Rochko
Fix #7316
2018-08-20Add hotkey for follow requests (#8307)Annika Backstrom
2018-08-19Don't filter own tootsThibaut Girka
2018-08-20Fix a variable for a Finnish translation (#8299)Oskari Noppa
2018-08-19Don't filter own toots (fixes #8289) (#8298)ThibG
2018-08-19Make dropdown animations respect their placement (#8292)cpsdqs
* Make dropdown animations respect their placement Also fix the corner radius on the privacy dropdown button when using top placement * Fix code style issue
2018-08-20i18n: Update Polish translation (#8290)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-08-19Adapt github issue template to glitch-socThibaut Girka
We don't have releases, so it don't make sense to mention. On the other hand, a lot of our code is from upstream, so encourage people to check whether it is a bug in glitch-soc or upstream.
2018-08-19Focus CW field when enabling it, focus compose textarea when disabling itThibaut Girka
Port a99179d31ff0013987f362ffe15cb3450b29ed08 and 09147186b79f80cf3ef3aa8ba7e6e5e032faa255 to glitch-soc
2018-08-19Unuse ActiveRecord::Base#cache_key (#8185)abcang
* Unuse ActiveRecord::Base#cache_key * Enable cache_versioning * Call cache_collection
2018-08-19Fix report text color. (#8288)mayaeh
2018-08-19Keep scheduler jobs unique until they're done (#8287)Eugen Rochko
2018-08-19Merge pull request #652 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-08-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-08-19Reduce user active duration from 7 days to 2 days (#8282)Eugen Rochko
To minimize fanout work and redis home feed storage space when there are lots of recent sign-ups
2018-08-19Make unfollow button light up red when hovered (#8286)Eugen Rochko
Fix #8284
2018-08-19Revert "Upgrade Doorkeeper to 4.4.1 (#8197)" (#8231)AkiraFukushima
* Revert "Upgrade Doorkeeper to 4.4.1 (#8197)" This reverts commit 464daffdf9a37e9a773d224a162fad022890d463. * Except migration files from revert commit
2018-08-19Show compose form on delete & redraft when in mobile layout (#8277)Eugen Rochko
Fix #8274
2018-08-19Do not use WHERE NOT IN in CopyStatusStats migration (#8281)Eugen Rochko
Fix #8275 As the batch operation progresses, the statuses_stats table grows, and the WHERE NOT IN subquery becomes more expensive
2018-08-19Link to mobile apps page (#8278)Eugen Rochko
Fix #8269
2018-08-19Add admin function to deactivate all invites (#8279)Eugen Rochko
Fix #8261
2018-08-18Add Makara dependency to support read-replicas (#8216)Eugen Rochko
Not active by default unless config/database.yml is edited
2018-08-18Do not process outgoing mentions to suspended accounts (#8272)ThibG
2018-08-18Fix ctrl+enter not submitting toot when text cursor is composing image ↵Spanky
description (#8273)
2018-08-18Merge pull request #649 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-08-18Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: .circleci/config.yml app/controllers/authorize_follows_controller.rb app/javascript/packs/public.js Moved new stuff from packs/public.js to core/public.js. Added appropriate use_pack in new controllers.
2018-08-18Various minor upload description fixesThibaut Girka
2018-08-18Add focal points support in the composerThibaut Girka
2018-08-18Refactor in preparation for focal points modalThibaut Girka
2018-08-18Fix #8264 - Do not override ctrl/cmd+click. (#8265)M Somerville
This includes clicks on hashtags, mentions, display names and media in the timeline; and usernames in reply-indicator, detailed status, and the boost modal.
2018-08-18Add "sign in to participate" message to public toot page (#8200)Eugen Rochko
2018-08-18Use CircleCI workflows for ruby dependencies (#8228)ThibG
* Add “bundle clean” suggestion from CircleCI doc Cf. https://circleci.com/docs/2.0/caching/#bundler-ruby * Use workspaces instead of caches for ruby gems Cache are not guaranteed to be available, while the test jobs *require* their depencies to run. Workspaces are thus more suitable. One downside is that the order of workspace layer additions need to be deterministic, which is why install-ruby{2.3,2.4} now depend on install-ruby2.5.
2018-08-18Make CopyStatusStats migration use batches of 1000 to avoid locks (#8256)Eugen Rochko
2018-08-18Fix error when trying to update counters for statuses that are gone (#8251)Eugen Rochko
2018-08-18Add remote interaction dialog for toots (#8202)Eugen Rochko
* Add remote interaction dialog for toots * Change AuthorizeFollow into AuthorizeInteraction, support statuses * Update brakeman.ignore * Adjust how interaction buttons are display on public pages * Fix tests
2018-08-17Fix rails-ujs not being run on some settings pages (fixes #645)Thibaut Girka
2018-08-17Merge pull request #642 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
generated by cgit-pink (git 2.37.1) at 2024-11-08 23:44:47 +0000