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

39660 commits

This branch
This branch
All branches
Author SHA1 Message Date
ThibG
eaf49439d1 [Glitch] Fix display of long poll options 
Port cf2b708e6b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 18:36:22 +02:00
Eugen Rochko
f369837caa [Glitch] Fix unused CSS 
Port 8352a0f352 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 18:36:00 +02:00
Eugen Rochko
ef8c311a66 [Glitch] Fix unused CSS 
Port 45f44ef4d3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 18:36:00 +02:00
Eugen Rochko
d3da04be54 [Glitch] Add batch actions and categories to admin UI for custom emojis 
Port SCSS changes from 25fb124ee6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 18:35:20 +02:00
Eugen Rochko
c2843c5f62 [Glitch] Add batch actions and categories to admin UI for custom emojis 
Port SCSS changes from 1110ea1a91 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 18:35:20 +02:00
ThibG
6251d7dd76 [Glitch] Add account bio to account admin view 
Port SCSS changes from fef7f3b6d5 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 18:34:55 +02:00
ThibG
ffe8decb73 [Glitch] Add account bio to account admin view 
Port SCSS changes from ec2a439a22 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 18:34:55 +02:00
Eugen Rochko
8dfd8dcbb0 [Glitch] Add batch approve/reject for pending hashtags in admin UI 
Port SCSS changes from 7799c7c75f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 18:34:26 +02:00
Eugen Rochko
6809e37f8e [Glitch] Add batch approve/reject for pending hashtags in admin UI 
Port SCSS changes from 261e52268c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-13 18:34:26 +02:00
Thibaut Girka
2e38d889a3 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
  Conflict because we changed the number of default results to be
  configurable
- app/lib/settings/scoped_settings.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
 2019-09-13 18:13:43 +02:00
Thibaut Girka
74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
  Conflict because we changed the number of default results to be
  configurable
- app/lib/settings/scoped_settings.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
 2019-09-13 18:13:43 +02:00
Eugen Rochko
8824964836 Remove deprecated GET /api/v1/search API (#11823) 
Use `GET /api/v2/search` instead
 2019-09-13 16:11:13 +02:00
Eugen Rochko
18331fefa2
Remove deprecated GET /api/v1/search API (#11823) 
Use `GET /api/v2/search` instead
 2019-09-13 16:11:13 +02:00
ThibG
f8e09ac4a8 Fix display of long poll options (#11717) 2019-09-13 16:04:09 +02:00
ThibG
cf2b708e6b Fix display of long poll options (#11717) 2019-09-13 16:04:09 +02:00
ThibG
7d2fceae9b Change /api/v1/timelines/public to require auth when public preview is off (#11802) 
Fixes #11289
 2019-09-13 16:03:46 +02:00
ThibG
225edac118 Change /api/v1/timelines/public to require auth when public preview is off (#11802) 
Fixes #11289
 2019-09-13 16:03:46 +02:00
Yamagishi Kazutoshi
025de313bc Change rate limit for media proxy (#11814) 2019-09-13 16:02:52 +02:00
Yamagishi Kazutoshi
4e1b742cb2 Change rate limit for media proxy (#11814) 2019-09-13 16:02:52 +02:00
Eugen Rochko
ee1c152083 Fix search API not resolving URL when type is given (#11822) 
Fix #11771
 2019-09-13 16:01:39 +02:00
Eugen Rochko
50edf84898
Fix search API not resolving URL when type is given (#11822) 
Fix #11771
 2019-09-13 16:01:39 +02:00
Eugen Rochko
45b759a2ca Fix hashtags being split by ZWNJ character (#11821) 
Fix #11761
 2019-09-13 16:01:26 +02:00
Eugen Rochko
0762258aec
Fix hashtags being split by ZWNJ character (#11821) 
Fix #11761
 2019-09-13 16:01:26 +02:00
Eugen Rochko
ec20fd2112 Change unlisted custom emoji to not appear in autosuggestions (#11818) 
Fix #11669
 2019-09-13 16:01:09 +02:00
Eugen Rochko
59da5ccb8e
Change unlisted custom emoji to not appear in autosuggestions (#11818) 
Fix #11669
 2019-09-13 16:01:09 +02:00
Eugen Rochko
8352a0f352 Fix unused CSS (#11824) 
Fix #11689
 2019-09-13 16:00:47 +02:00
Eugen Rochko
45f44ef4d3
Fix unused CSS (#11824) 
Fix #11689
 2019-09-13 16:00:47 +02:00
Eugen Rochko
9301574423 Change max length of media descriptions from 420 to 1500 characters (#11819) 
Fix #11658
 2019-09-13 16:00:34 +02:00
Eugen Rochko
b6381bdc7d
Change max length of media descriptions from 420 to 1500 characters (#11819) 
Fix #11658
 2019-09-13 16:00:34 +02:00
Eugen Rochko
c8b25aa7fc Fix name of Portuguese language not including Portugal (#11820) 
Fix #11602
 2019-09-13 16:00:19 +02:00
Eugen Rochko
bc869501f5
Fix name of Portuguese language not including Portugal (#11820) 
Fix #11602
 2019-09-13 16:00:19 +02:00
Eugen Rochko
ad91a0578b Fix scroll position resetting when opening media modals in web UI (#11815) 2019-09-12 20:14:59 +02:00
Eugen Rochko
50755a47b4
Fix scroll position resetting when opening media modals in web UI (#11815) 2019-09-12 20:14:59 +02:00
Eugen Rochko
a55f075ab6 Add missing locale file for ga and add rake task to check for it (#11813) 
* Add missing locale file for ga and add rake task to check for it

* Update lib/tasks/repo.rake

Co-Authored-By: Yamagishi Kazutoshi <ykzts@desire.sh>

* Fix check-i18n build
 2019-09-12 04:58:33 +02:00
Eugen Rochko
9361981388
Add missing locale file for ga and add rake task to check for it (#11813) 
* Add missing locale file for ga and add rake task to check for it

* Update lib/tasks/repo.rake

Co-Authored-By: Yamagishi Kazutoshi <ykzts@desire.sh>

* Fix check-i18n build
 2019-09-12 04:58:33 +02:00
Eugen Rochko
605a4e654a Fix uncaught errors in media proxy controller (#11811) 2019-09-12 01:51:12 +02:00
Eugen Rochko
16cdaa1110
Fix uncaught errors in media proxy controller (#11811) 2019-09-12 01:51:12 +02:00
Eugen Rochko
a74b17635b Fix nil error in warning e-mail template (#11812) 2019-09-12 01:51:01 +02:00
Eugen Rochko
3a3b40e0c3
Fix nil error in warning e-mail template (#11812) 2019-09-12 01:51:01 +02:00
Eugen Rochko
4291b74031 Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) 
Change all account actions except "none" to resolve all unresolved reports

Refactor `SuspendAccountService` to be more readable
 2019-09-11 16:32:44 +02:00
Eugen Rochko
c5d37f18cb
Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) 
Change all account actions except "none" to resolve all unresolved reports

Refactor `SuspendAccountService` to be more readable
 2019-09-11 16:32:44 +02:00
Tao Bror Bojlén
0430cbec29 add admin setting for default search engine indexing (fix #11750) (#11804) 2019-09-11 08:44:58 +02:00
Tao Bror Bojlén
4fe127664b add admin setting for default search engine indexing (fix #11750) (#11804) 2019-09-11 08:44:58 +02:00
Thibaut Girka
a503e791f4 Fix flavour screenshot styling in vanilla flavour 2019-09-10 22:38:07 +02:00
Thibaut Girka
c7f71b974f Fix flavour screenshot styling in vanilla flavour 2019-09-10 22:38:07 +02:00
ThibG
875d2e2b59 Add updated relationship to follow request API responses (#11800) 
Fixes #11747
 2019-09-10 20:56:42 +02:00
ThibG
4faaa5b25e Add updated relationship to follow request API responses (#11800) 
Fixes #11747
 2019-09-10 20:56:42 +02:00
ThibG
4ba49f14dc Change /admin/custom_emoji to honor the auto_play_gif setting (#11801) 
Fixes #9535
 2019-09-10 20:56:07 +02:00
ThibG
17389c63c8 Change /admin/custom_emoji to honor the auto_play_gif setting (#11801) 
Fixes #9535
 2019-09-10 20:56:07 +02:00
ThibG
3c1c9f8a8e Fix duplicate HTML ids in /about (#11803) 
Fixes #11329
 2019-09-10 20:55:23 +02:00