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

39694 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thibaut Girka
612b00d1bb Display reply indicator even when replying to contentless toot (fixes #564) 2018-07-10 22:53:04 +02:00
Thibaut Girka
b7b718df0d make sure reblogged's filter is set correctly 2018-07-10 14:06:04 +02:00
Thibaut Girka
ef1d660596 make sure reblogged's filter is set correctly 2018-07-10 14:06:04 +02:00
Thibaut Girka
aec11a568e [Glitch] Add option to not consider word boundaries when processing keyword filtering 
Port 4c70bb6d6d to glitch-soc
 2018-07-10 14:06:04 +02:00
Thibaut Girka
faa4db7975 [Glitch] Add option to not consider word boundaries when processing keyword filtering 
Port 1ca4e51eb3 to glitch-soc
 2018-07-10 14:06:04 +02:00
Thibaut Girka
1966652cba [Glitch] In keyword filter, account for reblogs, HTML and whole-words 
Port 6084257fda to glitch-soc
 2018-07-10 14:06:04 +02:00
Thibaut Girka
6777dfc8d9 [Glitch] In keyword filter, account for reblogs, HTML and whole-words 
Port 404c7702ec to glitch-soc
 2018-07-10 14:06:04 +02:00
Thibaut Girka
f94afcb935 [Glitch] Fix filters not affecting notifications in web UI 
Port 93bdaa0526 to glitch-soc
 2018-07-10 14:06:04 +02:00
Thibaut Girka
00c1386b9d [Glitch] Fix filters not affecting notifications in web UI 
Port cfeb3beb4e to glitch-soc
 2018-07-10 14:06:04 +02:00
Thibaut Girka
4850a2348c Add client-side custom filter support to glitch-soc 
Port d878e3e945 to glitch-soc,
but without dropping support for regexp filters yet.
 2018-07-10 14:06:04 +02:00
Thibaut Girka
0bb1720495 Add client-side custom filter support to glitch-soc 
Port cdb101340a to glitch-soc,
but without dropping support for regexp filters yet.
 2018-07-10 14:06:04 +02:00
Thibaut Girka
a68e7db2fb [Glitch] Fix Chrome issue with sizes="0px" 2018-07-10 10:53:36 +02:00
Thibaut Girka
33c1607c83 [Glitch] Fix Chrome issue with sizes="0px" 2018-07-10 10:53:36 +02:00
Ash Levy
58c19ac07c add keybind in composer textarea for secondary submit 2018-07-10 10:53:22 +02:00
Ash Levy
e96a4434c7 add keybind in composer textarea for secondary submit 2018-07-10 10:53:22 +02:00
ThibG
18f3440484 Merge pull request #557 from ThibG/glitch-soc/tentative-merge 
Merge upstream changes
 2018-07-10 10:52:18 +02:00
ThibG
e6647ccf6d
Merge pull request #557 from ThibG/glitch-soc/tentative-merge 
Merge upstream changes
 2018-07-10 10:52:18 +02:00
Eugen Rochko
a94f6c800d Make whole-word filter regex consistent between Ruby and JS (#7987) 2018-07-10 03:01:50 +02:00
Eugen Rochko
20fefdb714
Make whole-word filter regex consistent between Ruby and JS (#7987) 2018-07-10 03:01:50 +02:00
Thibaut Girka
262f7d147d Migrate glitch-soc keyword mutes to Mastodon's 
Completely remove glitch-soc's Keyword Mutes, migrate
existing database records to CustomFilters.

Handling of client-side filters is still not implemented
in the glitch-soc front-end.
 2018-07-09 19:19:23 +02:00
Thibaut Girka
402da8065c Migrate glitch-soc keyword mutes to Mastodon's 
Completely remove glitch-soc's Keyword Mutes, migrate
existing database records to CustomFilters.

Handling of client-side filters is still not implemented
in the glitch-soc front-end.
 2018-07-09 19:19:23 +02:00
Thibaut Girka
fc91260310 Set appropriate assets pack for the keyword filter page 2018-07-09 19:19:23 +02:00
Thibaut Girka
ee41947e9d Set appropriate assets pack for the keyword filter page 2018-07-09 19:19:23 +02:00
Thibaut Girka
6aadda2681 Re-install test/dev dependencies before running tests 
before_script used to trigger “yarn install --no-progress --production”,
which would uninstall dependencies required to run the tests.

Until railties is fixed or we move to Circle CI, work around that
issue by re-installing dev dependencies.
 2018-07-09 19:19:23 +02:00
Thibaut Girka
7a7d8c335e Re-install test/dev dependencies before running tests 
before_script used to trigger “yarn install --no-progress --production”,
which would uninstall dependencies required to run the tests.

Until railties is fixed or we move to Circle CI, work around that
issue by re-installing dev dependencies.
 2018-07-09 19:19:23 +02:00
Thibaut Girka
cf8121376b Merge branch 'master' into glitch-soc/tentative-merge 
Conflicts:
	README.md
	app/controllers/statuses_controller.rb
	app/lib/feed_manager.rb
	config/navigation.rb
	spec/lib/feed_manager_spec.rb

Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.
 2018-07-09 07:13:59 +02:00
Thibaut Girka
d392020da6 Merge branch 'master' into glitch-soc/tentative-merge 
Conflicts:
	README.md
	app/controllers/statuses_controller.rb
	app/lib/feed_manager.rb
	config/navigation.rb
	spec/lib/feed_manager_spec.rb

Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.
 2018-07-09 07:13:59 +02:00
ThibG
4c70bb6d6d Add option to not consider word boundaries when processing keyword filtering (#7975) 
* Add option to not consider word boundaries when filtering phrases

* Add a few tests for keyword/phrase filtering
 2018-07-09 02:22:09 +02:00
ThibG
1ca4e51eb3 Add option to not consider word boundaries when processing keyword filtering (#7975) 
* Add option to not consider word boundaries when filtering phrases

* Add a few tests for keyword/phrase filtering
 2018-07-09 02:22:09 +02:00
Eugen Rochko
52fd091fe7 Bump version to 2.4.3rc2 2018-07-07 22:23:52 +02:00
Eugen Rochko
451e585b97
Bump version to 2.4.3rc2 2018-07-07 22:23:52 +02:00
Eugen Rochko
5294f3a1d2 Add follow button to detailed status, add gradient to mask bio cut-off (#7979) 
* Add follow button to detailed status, add gradient to mask bio cut-off

* In landing strip, show sign up link even if closed (different href)

Point to joinmastodon.org
 2018-07-07 22:20:14 +02:00
Eugen Rochko
30e1da7668
Add follow button to detailed status, add gradient to mask bio cut-off (#7979) 
* Add follow button to detailed status, add gradient to mask bio cut-off

* In landing strip, show sign up link even if closed (different href)

Point to joinmastodon.org
 2018-07-07 22:20:14 +02:00
Eugen Rochko
a7039e4fd3 Add API method to remove a suggestion (#7978) 
DELETE /api/v1/suggestions/:account_id

When blocking, remove suggestion from both sides. Muting not affected,
since muting is supposed to be invisible to the target.
 2018-07-07 21:09:54 +02:00
Eugen Rochko
6b9e03e002
Add API method to remove a suggestion (#7978) 
DELETE /api/v1/suggestions/:account_id

When blocking, remove suggestion from both sides. Muting not affected,
since muting is supposed to be invisible to the target.
 2018-07-07 21:09:54 +02:00
ThibG
722d1ca015 Fix french translation of “Keyword or phrase” (#7980) 2018-07-07 20:45:04 +02:00
ThibG
ef2bcf51d7 Fix french translation of “Keyword or phrase” (#7980) 2018-07-07 20:45:04 +02:00
Eugen Rochko
93bdaa0526 Fix filters not affecting notifications in web UI (#7977) 
* Hook up filtering to statuses in notifications column

* Filter notifications for sound, desktop notifications
 2018-07-07 19:31:19 +02:00
Eugen Rochko
cfeb3beb4e
Fix filters not affecting notifications in web UI (#7977) 
* Hook up filtering to statuses in notifications column

* Filter notifications for sound, desktop notifications
 2018-07-07 19:31:19 +02:00
Thibaut Girka
6016b5d57b Remove duplicate code for handling muted users 
The mute check was indeed streamlined in c5fa8041c2
and we somehow kept some of the old code when merging.
 2018-07-07 19:10:13 +02:00
Thibaut Girka
c699b2d141 Remove duplicate code for handling muted users 
The mute check was indeed streamlined in f62539ce5c
and we somehow kept some of the old code when merging.
 2018-07-07 19:10:13 +02:00
Eugen Rochko
5f3ef03156 Remove .p-name microformat class (#7961) 
Fix #7926
 2018-07-07 18:51:56 +02:00
Eugen Rochko
cd509d2146
Remove .p-name microformat class (#7961) 
Fix #7926
 2018-07-07 18:51:56 +02:00
Eugen Rochko
0dbaa1badf Fix missing irreversible in filters API, expires_in param (#7976) 2018-07-07 18:51:45 +02:00
Eugen Rochko
9804ec3a6d
Fix missing irreversible in filters API, expires_in param (#7976) 2018-07-07 18:51:45 +02:00
Marcin Mikołajczak
249d438bc0 i18n: Update Polish translation (#7968) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-07-07 10:53:00 +09:00
Marcin Mikołajczak
c24d62220d i18n: Update Polish translation (#7968) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-07-07 10:53:00 +09:00
Lynx Kotoura
b3ec23311c Revert "Fix dark background error on user-mention autosuggest (#7937)" (#7964) 
This reverts commit 664fd9fb19.
 2018-07-06 13:19:18 +02:00
Lynx Kotoura
c930b61770 Revert "Fix dark background error on user-mention autosuggest (#7937)" (#7964) 
This reverts commit 7da74e3157.
 2018-07-06 13:19:18 +02:00
Lynx Kotoura
aa606281f1 Fix gradient, regression from #7927 (#7963) 2018-07-06 13:16:31 +02:00