34a90dc266
Adding Serbian translation ( #6133 )
...
* Adding Serbian translation
* i18n-tasks normalize
7 years ago
01f91695f5
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/auth/confirmations_controller.rb
7 years ago
d9c2806048
keep the same filters and page when doing custom emojo stuff ( fixes #6112 ) ( #6114 )
7 years ago
9427823d5c
Add more instance stats APIs ( #6125 )
...
* Add GET /api/v1/instance/peers API to reveal known domains
* Add GET /api/v1/instance/activity API
* Make new APIs disableable, exclude private statuses from activity stats
* Fix code style issue
* Fix week timestamps
7 years ago
503e7fb4d8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
59a50e6489
Reduce motion for boost animation ( #5871 )
...
* Reduce motion for boost animation
Fixes #5833
* Fix ternary expression
7 years ago
9ccad78647
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
87ee458079
Display deleted users' role as “Suspended” ( #6080 )
...
Deleted users are technically suspended, but the code displaying their status
in the admin interface was broken and displayed a javascript object holding
translations of the possible user roles instead.
7 years ago
1366e96a02
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
d6088c5308
Add filters to admin UI for custom emojis ( #6003 )
7 years ago
aea3d0814b
Clean up admin UI for accounts ( #6004 )
...
* Add staff filter to admin UI for accounts, remove obsolete columns
* Only display OStatus section in admin UI for accounts when OStatus data
7 years ago
a56c9ac5dc
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
d5f4baf720
Improve public status page title ( #5985 )
7 years ago
d9e1496990
Added styling
7 years ago
a1c79ef544
Screenshot support for themes
7 years ago
901c08a999
Moved flavour UI into own prefs tab
7 years ago
34630e00cb
pulled master, moved locale entry to new location
7 years ago
853082e760
Only localize js when there's a theme
7 years ago
99e8710095
Javascript intl8n flavour support
7 years ago
f4c233f59f
Ruby intl8n for themes
7 years ago
41bbfeec7c
add initial components based off of tootsuite pr #1507
7 years ago
03d28b6ec8
Back to Web UI from tag page when signed in ( #5943 )
7 years ago
b95863ec48
Polish video player CSS, add timer on fullscreen/modal/public pages ( #5928 )
7 years ago
f0b37f92a9
Merge pull request #229 from glitch-soc/glitch-theme
...
Advanced Next-Level Flavours And Skins For Mastodon™
7 years ago
a3a7b6a848
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
b037fbf9f4
Remove rabl dependency ( #5894 )
...
* Remove rabl dependency
* Replicate old Oj configuration
7 years ago
fd7be49523
Various fixes
7 years ago
0002d12c24
current_theme -> current_flavour ( #229 )
7 years ago
1221e3075d
Merge branch 'gs-master' into glitch-theme
7 years ago
935946020f
Fixed a name + localizations
7 years ago
882055afd0
Rename themes -> flavours ? ?
7 years ago
822dea26c3
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
1447ef1d44
Add invite filter ( #5862 )
7 years ago
7f0a01a20c
Fix invites form path ( #5861 )
7 years ago
53145abfbf
Allow admin to deactivate invite created by users ( #5860 )
7 years ago
36b9f4df56
Skins support
7 years ago
a1d9c68198
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
d6846dce20
Show "expired" in invite index ( #5838 )
...
* Show "expired" in invite index
* "Force expire" -> "Deactivate"
7 years ago
bc10a0dced
Merge remote-tracking branch 'tootsuite/master'
7 years ago
55d9abcceb
Add UI for setting up account migration ( #5832 )
7 years ago
c9dd67a733
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
d5e4cb2ca1
Use account.username when display_name is empty ( #5828 )
7 years ago
bc8c951083
Add consumable invites ( #5814 )
...
* Add consumable invites
* Add UI for generating invite codes
* Add tests
* Display max uses and expiration in invites table, delete invite
* Remove unused column and redundant validator
- Default follows not used, probably bad idea
- InviteCodeValidator is redundant because RegistrationsController
checks invite code validity
* Add admin setting to disable invites
* Add admin UI for invites, configurable role for invite creation
- Admin UI that lists everyone's invites, always available
- Admin setting min_invite_role to control who can invite people
- Non-admin invite UI only visible if users are allowed to
* Do not remove invites from database, expire them instantly
7 years ago
f504ac4ff6
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
191993c811
Use account.display_name for og:title single toot pages ( #5821 )
7 years ago
359ba16721
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
efc97d404c
Add logging of admin actions ( #5757 )
...
* Add logging of admin actions
* Update brakeman whitelist
* Log creates, updates and destroys with history of changes
* i18n: Update Polish translation (#5782 )
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* Split admin navigation into moderation and administration
* Redesign audit log page
* 🇵🇱 (#5795 )
* Add color coding to audit log
* Change dismiss->resolve, log all outcomes of report as resolve
* Update terminology (e-mail blacklist) (#5796 )
* Update terminology (e-mail blacklist)
imho looks better
* Update en.yml
* Fix code style issues
* i18n-tasks normalize
7 years ago
eadf1c38a5
Minor fixes
7 years ago
8aeda4f064
Finalized theme loading and stuff
7 years ago
1dc24ece41
Merge remote-tracking branch 'tootsuite/master'
7 years ago
bffc1b880b
Add “staff” badge to admin user pages ( #5735 )
...
* Allow staff badge to change from setting to hidden
* i18n: Update Polish translation
7 years ago
b89f614bd7
Profile redirect notes ( #5746 )
...
* Serialize moved accounts into REST and ActivityPub APIs
* Parse federated moved accounts from ActivityPub
* Add note about moved accounts to public profiles
* Add moved account message to web UI
* Fix code style issues
7 years ago
065e2388ba
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
5982d570de
Move "Permissions" row into main table in /admin/accounts/:id ( #5734 )
7 years ago
5845057adb
Themed prefetching
7 years ago
5f689cdf78
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
08cb63c360
Remove empty strings ( #5732 )
7 years ago
21d01d5809
Display moderator badge (green), admin badge changed to red ( #5728 )
7 years ago
02ae609d9a
Merge tootsuite/master at ab48f2b239
7 years ago
80873c1134
Add option to block direct messages from people you don't follow ( #5669 )
...
* Add option to block direct messages from people you don't follow
Fix #5326
* If the DM responds to a toot by recipient, allow it through
* i18n: Update Polish translation (for #5669 ) (#5673 )
7 years ago
c4c9003f84
l10n: PT-BR translation updated ( #5681 )
...
* Improved e-mail messages; delted repeated words
* pt-BR.json translations updated
* Revert "pt-BR.json translations updated"
This reverts commit 108c460531196fed6e6d14f93e8d8d047c835ffd.
* Updated pt-BR.json
* pt-BR.yml updated
7 years ago
97178b6d86
Add moderator role and add pundit policies for admin actions ( #5635 )
...
* Add moderator role and add pundit policies for admin actions
* Add rake task for turning user into mod and revoking it again
* Fix handling of unauthorized exception
* Deliver new report e-mails to staff, not just admins
* Add promote/demote to admin UI, hide some actions conditionally
* Fix unused i18n
7 years ago
a7db7bdd96
i10n OC: Memorial ( #5615 ) + #5467 ( #5623 )
...
* Changed ĩ => ï
* Changed ĩ => ï
* Add ability to disable login and mark accounts as memorial (#5615 )
7 years ago
7f1a0241c1
Add ability to disable login and mark accounts as memorial ( #5615 )
...
Fix #5597
7 years ago
19f82492ab
Show the local couterpart of emoji when it exists in /admin/custom_emojis ( #5467 )
...
* Show the local couterpart of emoji when it exists in admin/custom_emojis
* Fix indentation
* Fix error
* Add class table-action-link to Overwrite link
* Make it enable to overwrite emojis
* Make Code Climate happy
7 years ago
3068add21d
add account search condition (instance domain) ( #5577 )
7 years ago
ba22580c06
Add ServiceWorker caching for static assets ( #5524 )
7 years ago
282f0d7479
Updating Chinese (Simplified) translations ( #5508 )
...
* i18n: (zh-CN) fix punctuations and spaces
Spaces are fixed according to https://github.com/sparanoid/chinese-copywriting-guidelines
* i18n: (zh-CN) fix punctuation
* i18n: (zh-CN) Adapt official translation of Discourse Privacy Policy from GitHub, with minor fixes
https://github.com/discourse/discourse/blob/master/config/locales/server.zh_CN.yml#L2677
* i18n: (zh-CN) Update missing translations
* i18n: (zh-CN) Fixing errors
* i18n: (zh-CN) Fix indent error
* i18n: (zh-CN) Fix language tag
* i18n: (zh-CN) Remove quotes
* i18n: (zh-CN) Update translation (#5485 )
* i18n: (zh-CN) Remove whitespaces, x -> ×
* i18n: (zh-CN) Rewording on time distance
* i18n: (zh-CN) Overall improvements
* i18n: (zh-CN) i18n-tasks normalization
* i18n: (zh-CN) Add missing translation
7 years ago
2085c1fa33
Refactor initial state: reduce_motion and auto_play_gif ( #5501 )
7 years ago
2aec3c073b
Merge branch 'master' into gs-master
7 years ago
0a9cc96cdc
Feature: Unlisted custom emojis ( #5485 )
7 years ago
ce738197b9
Merge pull request #179 from glitch-soc/keyword-mute
...
Keyword muting
7 years ago
eef50289c6
Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
7caca589c1
Override Action View name inference in settings/keyword_mutes.
...
Glitch::KeywordMute's name is inferred as glitch_keyword_mutes, and in
templates this turns into e.g. settings/glitch/keyword_mutes. Going
along with this convention means a lot of file movement, though, and for
a UI that's as temporary and awkward as this one I think it's less
effort to slap a bunch of as: options everywhere.
We'll do the Right Thing when we build out the API and frontend UI.
7 years ago
897931099c
Changes to match other timelines in 2.0
7 years ago
4ab1534f6c
Address unused translation errors.
7 years ago
e3f5ec2652
Fill in create, edit, update, and destroy for keyword mutes interface.
...
Also add a destroy-all action, which can be useful if you're flushing an
old list entirely to start a new one.
7 years ago
018657a0e0
Spike out index and new views for keyword mutes controller.
7 years ago
ebfec40698
Set up /settings/keyword_mutes. #164 .
...
This should eventually be accessible via the API and the web frontend,
but I find it easier to set up an editing interface using Rails
templates and the like. We can always take it out if it turns out we
don't need it.
7 years ago
dd4f9f18cb
Merge tag 'v2.0.0' into gs-master
7 years ago
c06052b7cf
Swedish translation ( #5406 )
...
* Swedish file added
* Swedish file added
* Swedish file updated
* Swedish languagefile added
* Add Swedish translation
* Add Swedish translation
* Started the Swedish translation
* Added Swedish lang settings
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Swedish language completed and added
* Swedish language Simple_form added
* Swedish language Divise added
* Swedish language doorkeeper added
* Swedish language - now all file complete
7 years ago
cda8575ae3
Merge pull request #184 from tootsuite/master
...
Fix reduced motion breaking public galleries (#5423 )
7 years ago
d7b8208a37
Fix reduced motion breaking public galleries ( #5423 )
7 years ago
e19bc7835a
Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
e1357265ed
Fix #5082 - disable retweet link for followers only toot ( #5397 )
...
* Fix #5082 - disable retweet link for followers only toot
* Hide reblog count when it is a direct message
7 years ago
a54c272a1f
Add option to reduce motion ( #5393 )
...
* Add option to reduce motion
* Use HOC to wrap all Motion calls
* fix case-sensitive issue
* Avoid updating too frequently
* Get rid of unnecessary change to _simple_status.html.haml
7 years ago
ec18363c3b
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
9aacf21af7
Adjust public hashtag pages ( #5357 )
7 years ago
d4b9f821ca
Fix #5351 - Redirection with page params after copy emoji ( #5387 )
...
* Fix #5351 - Redirection with page params after copy emoji
* Add page params to copy emoji link
7 years ago
0f542d56b8
add duck beaks in haml
7 years ago
132a22ace5
Merge remote-tracking branch 'upstream/master'
7 years ago
02827345ae
Merge upstream 2.0ish #165
7 years ago
4ee024e296
fix presented og:url is incorrect ( #5320 )
7 years ago
3b6e5360c3
Only preload JS in /web pages ( #5325 )
7 years ago
cfab4a7ce4
sign_in and sign_up views present og meta infos ( #5308 )
7 years ago
5a0e862664
Fix dependency of error page generation on database ( #5280 )
7 years ago
81489970fb
Add moderation note ( #5240 )
...
* Add moderation note
* Add frozen_string_literal
* Make rspec pass
7 years ago
b98cd0041b
Redesign public hashtag pages ( #5237 )
7 years ago
fb05013855
Basic static metadata styling
7 years ago
b4af50c521
Improve admin UI for custom emojis, add copy/disable/enable ( #5231 )
7 years ago
Branko Kokanovic
David Yip
beatrix
Eugen Rochko
Jenkins
Nolan Lawson
ThibG
kibigo!
cwm
Yamagishi Kazutoshi
Alda Marteau-Hardi
unarist
ysksn
Surinna Curtis
Anna e só
Quenty31
nullkal
MitarashiDango
SerCom_KC
Matthew Walsh
Håkan Eriksson
KY
Lynx Kotoura
Ondřej Hruška
takayamaki