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

7248 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thibaut Girka
9efb4edddd Override CSP setting in the embed controller to allow frames 2018-08-22 20:39:33 +02:00
Thibaut Girka
563a09d81a Move CSP headers to the appropriate Rails configuration 
Also drop dev-static.glitch.social reference.
 2018-08-22 20:39:33 +02:00
Thibaut Girka
3209b431f2 Fix locale packs loading in embed layout 2018-08-22 20:39:33 +02:00
Thibaut Girka
8db23dd477 Add glitch-soc local setting to display reply counters 
Defaults to false.
 2018-08-22 20:29:55 +02:00
Thibaut Girka
ed841bbbf7 Move layout options to their own section 2018-08-22 20:29:55 +02:00
Thibaut Girka
e48709fb0e [Glitch] Display replies count in web UI 
Port 6a62016a49 to glitch-soc
 2018-08-22 20:29:55 +02:00
Thibaut Girka
30d88cee78 Add hashtag trendline support to glitch-soc flavour 
Port Mastodon's hashtag stats thing to glitch-soc.
This doesn't change how hashtags are ordered, and doesn't add a trending
hashtags section, but it does change how hashtag searches are rendered,
displaying a trend line alongside each hashtag.
 2018-08-22 19:27:06 +02:00
Thibaut Girka
dcb7f34684 Add pinned accounts editor 2018-08-22 16:18:23 +02:00
Thibaut Girka
9b213f990d Split list editor into components and containers 2018-08-22 16:18:23 +02:00
Thibaut Girka
d90795e0a7 Fix ColumnLink keys in getting_started_misc 2018-08-22 16:18:23 +02:00
ThibG
67573c1aee Merge pull request #660 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-08-21 19:54:21 +02:00
Thibaut Girka
98dccee657 Merge branch 'master' into glitch-soc/master 
Conflicts:
	config/routes.rb

Added the “endorsements” route from upstream.
 2018-08-21 18:24:48 +02:00
ThibG
97f2dc6761 Revert to using Paperclip's filesystem storage, and fix dangling records in 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-21 17:53:01 +02:00
Eugen Rochko
fe88a4f42c Get rid of all batch order warnings (#8334) 2018-08-21 12:25:50 +02:00
Eugen Rochko
5f37c40de1 Remove annoying Notification#cache_ids scope warning (#8333) 2018-08-21 02:49:51 +02:00
NecroTechno
3570ce319b reorder simple form ul to list vertically (fixes #8236) (#8322) 
* reorder simple form ul to list vertically (fixes #8236)

* remove browser specific prefixes
 2018-08-20 23:58:57 +02:00
ThibG
b572332710 Upgrade doorkeeper to 4.4.2 (#8321) 2018-08-20 22:42:02 +02:00
Thibaut Girka
0e9a426d5a [Glitch] Add hotkey for follow requests 
Port 25f6f41052 to glitch-soc
 2018-08-20 21:25:02 +02:00
Thibaut Girka
52fe8ee95d Make the privacy dropdown button not look strange when using top placement 
Inspired by 8fe1f8d4ce
 2018-08-20 20:10:53 +02:00
Thibaut Girka
64449831c8 [Glitch] Skip pagination logic entirely for pinned toots 2018-08-20 20:09:19 +02:00
Thibaut Girka
466df752ba Make non-link ColumnLinks behave as links 2018-08-20 20:08:13 +02:00
ThibG
09fb9fb07e Add API endpoint to list featured accounts (fixes #8315) (#8317) 2018-08-20 18:46:04 +02:00
ThibG
68762d9e79 Skip pagination logic entirely for pinned toots (fixes #8302) (#8310) 2018-08-20 13:32:43 +02:00
Eugen Rochko
35c99eeb0f Increase reach of Delete->Actor activities (#8305) 
Fix #7316
 2018-08-20 13:28:05 +02:00
Annika Backstrom
5effe5699e Add hotkey for follow requests (#8307) 2018-08-20 03:44:16 +02:00
Thibaut Girka
20689a5b5e Don't filter own toots 2018-08-19 21:36:46 +02:00
Oskari Noppa
d7486781ab Fix a variable for a Finnish translation (#8299) 2018-08-20 02:16:40 +09:00
ThibG
79f6746c8d Don't filter own toots (fixes #8289) (#8298) 2018-08-19 18:44:18 +02:00
cpsdqs
2422481125 Make dropdown animations respect their placement (#8292) 
* 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-19 17:11:12 +02:00
Marcin Mikołajczak
e6879b490f i18n: Update Polish translation (#8290) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-08-20 00:05:36 +09:00
Thibaut Girka
4a5f1f9315 Adapt github issue template to glitch-soc 
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-19 16:56:42 +02:00
Thibaut Girka
bbee6d85d3 Focus CW field when enabling it, focus compose textarea when disabling it 
Port 101f5544e1 and d928aac40c
to glitch-soc
 2018-08-19 16:56:31 +02:00
abcang
af2122bcf9 Unuse ActiveRecord::Base#cache_key (#8185) 
* Unuse ActiveRecord::Base#cache_key

* Enable cache_versioning

* Call cache_collection
 2018-08-19 15:52:38 +02:00
mayaeh
64c7712a92 Fix report text color. (#8288) 2018-08-19 15:51:57 +02:00
Eugen Rochko
a03de03ba2 Keep scheduler jobs unique until they're done (#8287) 2018-08-19 15:48:29 +02:00
ThibG
fe5b63f3e6 Merge pull request #652 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-08-19 09:46:26 +02:00
Thibaut Girka
c043697caa Merge branch 'master' into glitch-soc/merge-upstream 2018-08-19 09:27:18 +02:00
Eugen Rochko
315ce688be Reduce user active duration from 7 days to 2 days (#8282) 
To minimize fanout work and redis home feed storage space when
there are lots of recent sign-ups
 2018-08-19 03:50:34 +02:00
Eugen Rochko
a68079e6ee Make unfollow button light up red when hovered (#8286) 
Fix #8284
 2018-08-19 03:28:43 +02:00
AkiraFukushima
464f5ec269 Revert "Upgrade Doorkeeper to 4.4.1 (#8197)" (#8231) 
* Revert "Upgrade Doorkeeper to 4.4.1 (#8197)"

This reverts commit 659556ab1f.

* Except migration files from revert commit
 2018-08-19 03:20:37 +02:00
Eugen Rochko
97a2958ba1 Show compose form on delete & redraft when in mobile layout (#8277) 
Fix #8274
 2018-08-19 03:17:01 +02:00
Eugen Rochko
c28ed5d760 Do not use WHERE NOT IN in CopyStatusStats migration (#8281) 
Fix #8275

As the batch operation progresses, the statuses_stats table grows,
and the WHERE NOT IN subquery becomes more expensive
 2018-08-19 02:01:49 +02:00
Eugen Rochko
85990d2886 Link to mobile apps page (#8278) 
Fix #8269
 2018-08-19 01:17:44 +02:00
Eugen Rochko
834df855e2 Add admin function to deactivate all invites (#8279) 
Fix #8261
 2018-08-19 00:58:53 +02:00
Eugen Rochko
59e3ad5162 Add Makara dependency to support read-replicas (#8216) 
Not active by default unless config/database.yml is edited
 2018-08-18 21:06:12 +02:00
ThibG
8f788fe92a Do not process outgoing mentions to suspended accounts (#8272) 2018-08-18 19:42:13 +02:00
Spanky
f5f3f3a5d7 Fix ctrl+enter not submitting toot when text cursor is composing image description (#8273) 2018-08-18 19:40:35 +02:00
ThibG
79280c6fbe Merge pull request #649 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-08-18 18:22:54 +02:00
Thibaut Girka
767cc06fe2 Merge branch 'master' into glitch-soc/merge-upstream 
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-18 18:04:49 +02:00
Thibaut Girka
c43db794e6 Various minor upload description fixes 2018-08-18 17:53:20 +02:00