Branko Kokanovic
34a90dc266
Adding Serbian translation ( #6133 )
...
* Adding Serbian translation
* i18n-tasks normalize
2017-12-31 17:28:20 +09:00
David Yip
01f91695f5
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/auth/confirmations_controller.rb
2017-12-30 17:20:07 -06:00
beatrix
d9c2806048
keep the same filters and page when doing custom emojo stuff ( fixes #6112 ) ( #6114 )
2017-12-30 02:43:43 +01:00
Eugen Rochko
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
2017-12-29 19:52:04 +01:00
Jenkins
503e7fb4d8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-24 15:17:12 +00:00
Nolan Lawson
59a50e6489
Reduce motion for boost animation ( #5871 )
...
* Reduce motion for boost animation
Fixes #5833
* Fix ternary expression
2017-12-24 04:48:31 +01:00
Jenkins
9ccad78647
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-22 04:17:14 +00:00
ThibG
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.
2017-12-22 02:14:17 +01:00
Jenkins
1366e96a02
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-13 18:17:16 +00:00
Eugen Rochko
d6088c5308
Add filters to admin UI for custom emojis ( #6003 )
2017-12-13 13:28:31 +01:00
Eugen Rochko
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
2017-12-13 12:15:10 +01:00
David Yip
a56c9ac5dc
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
2017-12-12 02:54:13 -06:00
Eugen Rochko
d5f4baf720
Improve public status page title ( #5985 )
2017-12-12 03:56:30 +01:00
kibigo!
d9e1496990
Added styling
2017-12-10 20:32:28 -08:00
kibigo!
a1c79ef544
Screenshot support for themes
2017-12-10 20:32:28 -08:00
kibigo!
901c08a999
Moved flavour UI into own prefs tab
2017-12-10 20:32:27 -08:00
cwm
34630e00cb
pulled master, moved locale entry to new location
2017-12-10 15:22:15 -06:00
kibigo!
853082e760
Only localize js when there's a theme
2017-12-10 11:08:04 -08:00
kibigo!
99e8710095
Javascript intl8n flavour support
2017-12-10 11:08:04 -08:00
kibigo!
f4c233f59f
Ruby intl8n for themes
2017-12-10 11:08:04 -08:00
cwm
41bbfeec7c
add initial components based off of tootsuite pr #1507
2017-12-09 10:26:22 -06:00
Yamagishi Kazutoshi
03d28b6ec8
Back to Web UI from tag page when signed in ( #5943 )
2017-12-09 14:19:07 +01:00
Eugen Rochko
b95863ec48
Polish video player CSS, add timer on fullscreen/modal/public pages ( #5928 )
2017-12-09 00:55:58 +01:00
beatrix
f0b37f92a9
Merge pull request #229 from glitch-soc/glitch-theme
...
Advanced Next-Level Flavours And Skins For Mastodon™
2017-12-06 17:44:07 -05:00
Jenkins
a3a7b6a848
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-06 20:17:13 +00:00
Eugen Rochko
b037fbf9f4
Remove rabl dependency ( #5894 )
...
* Remove rabl dependency
* Replicate old Oj configuration
2017-12-06 15:04:49 +09:00
kibigo!
fd7be49523
Various fixes
2017-12-04 21:58:10 -08:00
David Yip
0002d12c24
current_theme -> current_flavour ( #229 )
2017-12-04 11:35:35 -06:00
David Yip
1221e3075d
Merge branch 'gs-master' into glitch-theme
2017-12-04 11:07:01 -06:00
kibigo!
935946020f
Fixed a name + localizations
2017-12-04 00:19:39 -08:00
kibigo!
882055afd0
Rename themes -> flavours ? ?
2017-12-03 23:26:40 -08:00
Jenkins
822dea26c3
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-02 14:17:11 +00:00
Yamagishi Kazutoshi
1447ef1d44
Add invite filter ( #5862 )
2017-12-01 16:40:02 +01:00
Yamagishi Kazutoshi
7f0a01a20c
Fix invites form path ( #5861 )
2017-12-01 12:26:57 +01:00
Yamagishi Kazutoshi
53145abfbf
Allow admin to deactivate invite created by users ( #5860 )
2017-12-01 12:26:19 +01:00
kibigo!
36b9f4df56
Skins support
2017-11-30 19:29:47 -08:00
David Yip
a1d9c68198
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-28 11:45:13 -06:00
Yamagishi Kazutoshi
d6846dce20
Show "expired" in invite index ( #5838 )
...
* Show "expired" in invite index
* "Force expire" -> "Deactivate"
2017-11-28 15:41:02 +01:00
David Yip
bc10a0dced
Merge remote-tracking branch 'tootsuite/master'
2017-11-27 22:33:26 -06:00
Eugen Rochko
55d9abcceb
Add UI for setting up account migration ( #5832 )
2017-11-27 22:47:06 +01:00
David Yip
c9dd67a733
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-27 11:29:04 -06:00
Yamagishi Kazutoshi
d5e4cb2ca1
Use account.username when display_name is empty ( #5828 )
2017-11-27 16:09:52 +01:00
Eugen Rochko
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
Jenkins
f504ac4ff6
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-27 05:17:11 +00:00
Alda Marteau-Hardi
191993c811
Use account.display_name for og:title single toot pages ( #5821 )
2017-11-27 05:31:26 +01:00
Jenkins
359ba16721
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-24 01:17:20 +00:00
Eugen Rochko
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
kibigo!
eadf1c38a5
Minor fixes
2017-11-21 18:17:38 -08:00
kibigo!
8aeda4f064
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
David Yip
1dc24ece41
Merge remote-tracking branch 'tootsuite/master'
2017-11-19 01:30:29 -06:00
Yamagishi Kazutoshi
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
Eugen Rochko
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
Jenkins
065e2388ba
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-17 20:17:12 +00:00
unarist
5982d570de
Move "Permissions" row into main table in /admin/accounts/:id ( #5734 )
2017-11-17 15:18:20 +01:00
kibigo!
5845057adb
Themed prefetching
2017-11-16 21:37:08 -08:00
David Yip
5f689cdf78
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-16 22:52:37 -06:00
ysksn
08cb63c360
Remove empty strings ( #5732 )
2017-11-17 10:52:30 +09:00
Eugen Rochko
21d01d5809
Display moderator badge (green), admin badge changed to red ( #5728 )
2017-11-17 01:22:38 +01:00
Surinna Curtis
02ae609d9a
Merge tootsuite/master at ab48f2b239
2017-11-16 01:21:16 -06:00
Eugen Rochko
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
Anna e só
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
Eugen Rochko
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
Quenty31
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
Eugen Rochko
7f1a0241c1
Add ability to disable login and mark accounts as memorial ( #5615 )
...
Fix #5597
2017-11-07 19:06:44 +01:00
nullkal
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
MitarashiDango
3068add21d
add account search condition (instance domain) ( #5577 )
2017-11-01 14:46:05 +01:00
Nolan Lawson
ba22580c06
Add ServiceWorker caching for static assets ( #5524 )
2017-10-31 12:25:51 +01:00
SerCom_KC
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
Nolan Lawson
2085c1fa33
Refactor initial state: reduce_motion and auto_play_gif ( #5501 )
2017-10-28 00:04:44 +09:00
David Yip
2aec3c073b
Merge branch 'master' into gs-master
2017-10-27 09:45:25 -05:00
nullkal
0a9cc96cdc
Feature: Unlisted custom emojis ( #5485 )
2017-10-27 16:11:30 +02:00
beatrix
ce738197b9
Merge pull request #179 from glitch-soc/keyword-mute
...
Keyword muting
2017-10-25 17:37:48 -04:00
David Yip
eef50289c6
Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
2017-10-25 16:01:20 -05:00
David Yip
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
Matthew Walsh
897931099c
Changes to match other timelines in 2.0
2017-10-22 18:45:35 -07:00
David Yip
4ab1534f6c
Address unused translation errors.
2017-10-22 01:05:56 -05:00
David Yip
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
David Yip
018657a0e0
Spike out index and new views for keyword mutes controller.
2017-10-21 14:54:36 -05:00
David Yip
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
David Yip
dd4f9f18cb
Merge tag 'v2.0.0' into gs-master
2017-10-18 11:52:04 -05:00
Håkan Eriksson
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
beatrix
cda8575ae3
Merge pull request #184 from tootsuite/master
...
Fix reduced motion breaking public galleries (#5423 )
2017-10-16 17:05:42 -04:00
Nolan Lawson
d7b8208a37
Fix reduced motion breaking public galleries ( #5423 )
2017-10-16 21:08:01 +02:00
David Yip
e19bc7835a
Merge remote-tracking branch 'upstream/master' into gs-master
2017-10-16 09:23:59 -05:00
KY
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
Nolan Lawson
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
David Yip
ec18363c3b
Merge remote-tracking branch 'origin/master' into gs-master
2017-10-16 01:29:02 -05:00
Lynx Kotoura
9aacf21af7
Adjust public hashtag pages ( #5357 )
2017-10-14 14:48:12 +02:00
KY
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
Ondřej Hruška
0f542d56b8
add duck beaks in haml
2017-10-11 21:34:00 +02:00
Ondřej Hruška
132a22ace5
Merge remote-tracking branch 'upstream/master'
2017-10-11 21:27:17 +02:00
kibigo!
02827345ae
Merge upstream 2.0ish #165
2017-10-11 10:43:10 -07:00
takayamaki
4ee024e296
fix presented og:url is incorrect ( #5320 )
2017-10-11 19:22:21 +02:00
Nolan Lawson
3b6e5360c3
Only preload JS in /web pages ( #5325 )
2017-10-11 19:20:55 +02:00
takayamaki
cfab4a7ce4
sign_in and sign_up views present og meta infos ( #5308 )
2017-10-11 00:52:25 +02:00
Eugen Rochko
5a0e862664
Fix dependency of error page generation on database ( #5280 )
2017-10-09 10:05:10 +02:00
nullkal
81489970fb
Add moderation note ( #5240 )
...
* Add moderation note
* Add frozen_string_literal
* Make rspec pass
2017-10-07 20:26:43 +02:00
Eugen Rochko
b98cd0041b
Redesign public hashtag pages ( #5237 )
2017-10-07 20:00:35 +02:00
kibigo!
fb05013855
Basic static metadata styling
2017-10-06 22:22:34 -07:00
Eugen Rochko
b4af50c521
Improve admin UI for custom emojis, add copy/disable/enable ( #5231 )
2017-10-05 23:42:05 +02:00
