1221e3075d
Merge branch 'gs-master' into glitch-theme
2017-12-04 11:07:01 -06:00
935946020f
Fixed a name + localizations
2017-12-04 00:19:39 -08:00
882055afd0
Rename themes -> flavours ? ?
2017-12-03 23:26:40 -08:00
822dea26c3
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-02 14:17:11 +00:00
1447ef1d44
Add invite filter ( #5862 )
2017-12-01 16:40:02 +01:00
7f0a01a20c
Fix invites form path ( #5861 )
2017-12-01 12:26:57 +01:00
53145abfbf
Allow admin to deactivate invite created by users ( #5860 )
2017-12-01 12:26:19 +01:00
36b9f4df56
Skins support
2017-11-30 19:29:47 -08:00
a1d9c68198
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-28 11:45:13 -06:00
d6846dce20
Show "expired" in invite index ( #5838 )
...
* Show "expired" in invite index
* "Force expire" -> "Deactivate"
2017-11-28 15:41:02 +01:00
bc10a0dced
Merge remote-tracking branch 'tootsuite/master'
2017-11-27 22:33:26 -06:00
55d9abcceb
Add UI for setting up account migration ( #5832 )
2017-11-27 22:47:06 +01:00
c9dd67a733
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-27 11:29:04 -06:00
d5e4cb2ca1
Use account.username when display_name is empty ( #5828 )
2017-11-27 16:09:52 +01:00
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
2017-11-27 16:07:59 +01:00
f504ac4ff6
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-27 05:17:11 +00:00
191993c811
Use account.display_name for og:title single toot pages ( #5821 )
2017-11-27 05:31:26 +01:00
359ba16721
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-24 01:17:20 +00:00
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
2017-11-24 02:05:53 +01:00
eadf1c38a5
Minor fixes
2017-11-21 18:17:38 -08:00
8aeda4f064
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
1dc24ece41
Merge remote-tracking branch 'tootsuite/master'
2017-11-19 01:30:29 -06:00
bffc1b880b
Add “staff” badge to admin user pages ( #5735 )
...
* Allow staff badge to change from setting to hidden
* i18n: Update Polish translation
2017-11-19 04:13:57 +01:00
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
2017-11-18 19:39:02 +01:00
065e2388ba
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-17 20:17:12 +00:00
5982d570de
Move "Permissions" row into main table in /admin/accounts/:id ( #5734 )
2017-11-17 15:18:20 +01:00
5845057adb
Themed prefetching
2017-11-16 21:37:08 -08:00
5f689cdf78
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-16 22:52:37 -06:00
08cb63c360
Remove empty strings ( #5732 )
2017-11-17 10:52:30 +09:00
21d01d5809
Display moderator badge (green), admin badge changed to red ( #5728 )
2017-11-17 01:22:38 +01:00
02ae609d9a
Merge tootsuite/master at ab48f2b239
2017-11-16 01:21:16 -06:00
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 )
2017-11-14 21:12:57 +01:00
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
2017-11-14 11:07:38 +09:00
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
2017-11-11 20:23:33 +01:00
a7db7bdd96
i10n OC: Memorial ( #5615 ) + #5467 ( #5623 )
...
* Changed ĩ => ï
* Changed ĩ => ï
* Add ability to disable login and mark accounts as memorial (#5615 )
2017-11-08 15:19:49 +01:00
7f1a0241c1
Add ability to disable login and mark accounts as memorial ( #5615 )
...
Fix #5597
2017-11-07 19:06:44 +01:00
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
2017-11-07 14:49:32 +01:00
3068add21d
add account search condition (instance domain) ( #5577 )
2017-11-01 14:46:05 +01:00
ba22580c06
Add ServiceWorker caching for static assets ( #5524 )
2017-10-31 12:25:51 +01:00
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
2017-10-30 12:34:58 +09:00
2085c1fa33
Refactor initial state: reduce_motion and auto_play_gif ( #5501 )
2017-10-28 00:04:44 +09:00
2aec3c073b
Merge branch 'master' into gs-master
2017-10-27 09:45:25 -05:00
0a9cc96cdc
Feature: Unlisted custom emojis ( #5485 )
2017-10-27 16:11:30 +02:00
ce738197b9
Merge pull request #179 from glitch-soc/keyword-mute
...
Keyword muting
2017-10-25 17:37:48 -04:00
eef50289c6
Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
2017-10-25 16:01:20 -05:00
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.
2017-10-24 18:40:28 -05:00
897931099c
Changes to match other timelines in 2.0
2017-10-22 18:45:35 -07:00
4ab1534f6c
Address unused translation errors.
2017-10-22 01:05:56 -05:00
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.
2017-10-21 14:54:36 -05:00
018657a0e0
Spike out index and new views for keyword mutes controller.
2017-10-21 14:54:36 -05:00
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.
2017-10-21 14:54:36 -05:00
dd4f9f18cb
Merge tag 'v2.0.0' into gs-master
2017-10-18 11:52:04 -05:00
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
2017-10-17 13:41:36 +09:00
cda8575ae3
Merge pull request #184 from tootsuite/master
...
Fix reduced motion breaking public galleries (#5423 )
2017-10-16 17:05:42 -04:00
d7b8208a37
Fix reduced motion breaking public galleries ( #5423 )
2017-10-16 21:08:01 +02:00
e19bc7835a
Merge remote-tracking branch 'upstream/master' into gs-master
2017-10-16 09:23:59 -05:00
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
2017-10-16 14:10:12 +02:00
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
2017-10-16 09:36:15 +02:00
ec18363c3b
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-16 01:29:02 -05:00
9aacf21af7
Adjust public hashtag pages ( #5357 )
2017-10-14 14:48:12 +02:00
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
2017-10-14 14:40:10 +02:00
0f542d56b8
add duck beaks in haml
2017-10-11 21:34:00 +02:00
132a22ace5
Merge remote-tracking branch 'upstream/master'
2017-10-11 21:27:17 +02:00
02827345ae
Merge upstream 2.0ish #165
2017-10-11 10:43:10 -07:00
4ee024e296
fix presented og:url is incorrect ( #5320 )
2017-10-11 19:22:21 +02:00
3b6e5360c3
Only preload JS in /web pages ( #5325 )
2017-10-11 19:20:55 +02:00
cfab4a7ce4
sign_in and sign_up views present og meta infos ( #5308 )
2017-10-11 00:52:25 +02:00
5a0e862664
Fix dependency of error page generation on database ( #5280 )
2017-10-09 10:05:10 +02:00
81489970fb
Add moderation note ( #5240 )
...
* Add moderation note
* Add frozen_string_literal
* Make rspec pass
2017-10-07 20:26:43 +02:00
b98cd0041b
Redesign public hashtag pages ( #5237 )
2017-10-07 20:00:35 +02:00
fb05013855
Basic static metadata styling
2017-10-06 22:22:34 -07:00
b4af50c521
Improve admin UI for custom emojis, add copy/disable/enable ( #5231 )
2017-10-05 23:42:05 +02:00
06aff382bc
Fix #5050 - Use summary_large_image only with media attachments ( #5219 )
2017-10-04 19:06:23 +02:00
f0aa03095d
Fix style of email domain block table ( #5218 )
2017-10-04 18:16:30 +02:00
51f8cbfbeb
Implement EmailBlackList ( #5109 )
...
* Implement BlacklistedEmailDomain
* Use Faker::Internet.domain_name
* Remove note column
* Add frozen_string_literal comment
* Delete unnecessary codes
* Sort alphabetically
* Change of wording
* Rename BlacklistedEmailDomain to EmailDomainBlock
2017-10-04 15:16:10 +02:00
6bd4e3bf97
Separate notifications preferences from general preferences ( #4447 )
...
* Separate notifications preferences from general preferences
* Refine settings/notifications/show
* remove preferences.notifications
2017-10-04 10:22:52 +02:00
985832e241
Fix stupid typo ( #5184 )
2017-10-02 23:27:52 +02:00
ee21576c19
Korean translation ( #5185 )
...
* Add missing Korean translations
* Add Korean email confirmation template
* Fix Korean typo
2017-10-02 23:26:28 +02:00
0ddea5765c
Append confirmation link as plain text ( #5146 )
...
* Append confirmation link as plain text
Some mail application is malfunctioning with links.
* Change description text
2017-10-02 07:21:46 +02:00
0783f18274
Make Chrome splash screen same color as web UI's background color ( #5169 )
2017-10-02 01:23:32 +02:00
06ef1b0ac4
Reorganize preferences page ( #5161 )
2017-10-01 10:52:39 +02:00
18988b89cf
add login form to landing page if regs are closed
2017-09-29 16:41:18 +02:00
9bee4d313a
HAML fix
2017-09-28 18:16:04 -07:00
20ff1c629d
Remove dependency on db during assets:precompile ( #5138 )
2017-09-29 03:03:03 +02:00
62fbd4d247
Fixed lingering upstream Theme code
2017-09-28 17:45:16 -07:00
9feca5cabf
new HAML for statuses
2017-09-28 17:18:12 -07:00
282a126b3f
Merge remote-tracking branch 'origin/better-themeing' into merging-upstream
2017-09-28 09:20:59 +02:00
0cc795db6b
Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream
2017-09-28 09:18:35 +02:00
914c0465b1
Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
2017-09-28 09:12:17 +02:00
aac16a82d6
Better themeing support!!
2017-09-25 19:24:32 -07:00
1767f9817c
New error page graphic. Other error page improvements ( #5099 )
...
- 500.html generated with admin-set default locale if set
- Error page `<title>` includes Mastodon site title
- 500 title changed to "This page is not
correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A >)
- 500 content appended with "on our end" to make clear it's
not user's fault
2017-09-25 23:05:54 +02:00
6b0ea1e79c
Generate 500.html with assets:precompile, remove loading from Google Fonts ( #5067 )
2017-09-25 04:04:04 +02:00
9ad1bfbc18
In detail status view, display attachment uncropped if there's only one ( #5054 )
...
* In detail status view, display attachment uncropped if there's only one
* Make media spoiler the size of the media it hides, enable on static
2017-09-24 05:58:30 +02:00
da257754b5
Add emoji autosuggest ( #5053 )
...
* Add emoji autosuggest
Some credit goes to glitch-soc/mastodon#149
* Remove server-side shortcode->unicode conversion
* Insert shortcode when suggestion is custom emoji
* Remove remnant of server-side emojis
* Update style of autosuggestions
* Fix wrong emoji filenames generated in autosuggest item
* Do not lazy load emoji picker, as that no longer works
* Fix custom emoji autosuggest
* Fix multiple "Custom" categories getting added to emoji index, only add once
2017-09-23 14:47:32 +02:00
d2aeb45461
Fix custom emojis not detected when used in content warning ( #5049 )
2017-09-23 01:50:17 +02:00
16a5d1450c
Switch from EmojiOne to Twemoji, different emoji picker ( #5046 )
...
* Switch from EmojiOne to Twemoji, different emoji picker
* Make emoji-mart use a local spritesheet
* Fix emojify test
* yarn manage:translations
2017-09-23 01:41:00 +02:00
41832d083e
Pinned toots; embeds
2017-09-20 02:50:53 -07:00
b4842ef0b9
Add support for multiple themes ( #4959 )
...
* Add support for selecting a theme
* Fix codeclimate issues
* Look up site default style if current user is not available due to e.g. not being logged in
* Remove outdated comment in common.js
* Address requested changes in themes PR
* Fix codeclimate issues
* Explicitly check current_account in application controller and only check theme availability if non-nil
* codeclimate
* explicit precedence with &&
* Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml
* codeclimate: indentation + return
2017-09-19 16:36:23 +02:00
57c5493d4e
Hide sensitive image in default on the public pages ( #5009 )
...
Additionally, this restores previous background / text color for media spoiler.
2017-09-19 16:03:45 +02:00
e9bb7e62b1
Admin interface for listing, adding and removing custom emojis ( #5002 )
...
* Admin interface for listing, adding and removing custom emojis
* Only display local ones in the list
2017-09-19 03:52:38 +02:00
David Yip