4476a45444
Fix #6717 : Do not double html-encode page titles ( #6720 )
2018-03-10 11:43:20 +01:00
447d7e6127
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-09 00:17:17 +00:00
ff44b2e92d
Add missing meta description to profiles, some other SEO stuff ( #6706 )
...
- Add missing meta description to profiles
- Add canonical rel link to landing page
- Remove linebreaks from title tags
- Add username to profile title
- Add toots/following/followers to profile description tags
- Add next/prev rel links to profiles
- Do not index follower/following variants of profiles
2018-03-09 00:35:07 +01:00
5acd5315f2
Improve styling of closed registrations message, rename button ( #6695 )
...
* Improve styling of closed registrations message, rename button
"Sign up on another server"
Fix #6683
* Adjust styling of closed registrations message
2018-03-08 11:10:37 +01:00
8de048fcdb
In wide layout, columnize Mastodon features on landing page ( #6674 )
2018-03-07 08:59:27 +01:00
e26d5ca923
Don't escape statuses while truncating ( #6671 )
2018-03-07 07:12:01 +01:00
cb74c0cfe4
Add headings to the security settings page ( #6661 )
...
* Changes the headings' rank of the security settings section
This commit changes the existing headings' rank of the security settings section from level 6 to level 4.
* Renames the auth.change_password string into auth.security
The "Security" preferences' section used to be called "Change password". When it was renamed, the string name wasn't changed.
This commits changes auth.change_password to auth.security.
* Adds a heading to the password change form
There was previously no heading for the part of the "Security" page that contain the password change form.
This commit adds a rank 4 heading to this section and reintroduces an "auth.change_password" string to be used inside it.
* Removes useless HR elements
The various sections of the "Security" settings page were previously separated by HR elements.
Now that there is proper headings, they're not required anymore.
* Updates CSS
This commit updates CSS in such a way that the same style is applied to all the H4 elements of the settings.
* Correct a mistake
A character went missing on one of the previous commits, broking the CSS.
This new commit fixes it.
2018-03-07 01:39:40 +01:00
b66ec3bf95
Fix #6611 : Typo in change password template ( #6616 )
2018-03-04 10:00:24 +01:00
1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
README.md
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/serializers/rest/instance_serializer.rb
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.ja.yml
2018-03-02 21:46:44 -06:00
036dd98abb
Responsively enforce 16:9 ratio on all media thumbnails in web UI ( #6590 )
...
* Responsively enforce 16:9 ratio on all media thumbnails in web UI
Also change video player behaviour to "contain" rather than
"cover" videos that don't fit the ratio, unlike images and GIFs,
it's expected that a video is shown fully.
* Fix spacing issues and remove floor
* Remove floor
2018-03-02 07:00:04 +01:00
473a69ab18
Fix margin on top action button, fix width of counters on frontpage ( #6573 )
2018-03-01 02:48:08 +01:00
47bdb9b33b
Fix #942 : Seamless LDAP login ( #6556 )
2018-02-28 19:04:53 +01:00
7150f2e9d3
Grid layout for tag pages ( #6545 )
...
* Use grid layout for the landing page
* Use grid layout for tag pages
* Set 2 columns width as explicit percentage for tag pages
2018-02-26 17:43:45 +01:00
a40167cf4d
Better grid layout for the landing page ( #6543 )
...
* Use grid layout for the landing page
* Fix column settings
Set the ratio explicitly
* Improve information board
2018-02-26 16:19:07 +01:00
18513a978a
Improve public account cards ( #6559 )
...
- Add follow/unfollow/remote follow buttons
- Format the bio properly
- Always show username@domain, even for local accounts
2018-02-26 16:18:41 +01:00
c33931b613
Fix prev/next links on public profile page ( #6497 )
...
* Fix prev/next links on public profile page
* Don't make pagination urls if no available statuses
* Fix empty check method
* Put left chevron before prev page link
* Add scope for pagination "starting at" a given id
* Status pagination try 2:
s/prev/older and s/next/newer
"older" on left, "newer" on right
Use new scope for "newer" link
Extract magic 20 page size to constant
Remove max_id from feed pagination as it's not respected
* Reinstate max_id for accounts atom stream
* normalize
2018-02-26 03:31:28 +01:00
bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
...
# Conflicts:
# app/controllers/settings/exports_controller.rb
# app/models/media_attachment.rb
# app/models/status.rb
# app/views/about/show.html.haml
# docker_entrypoint.sh
# spec/views/about/show.html.haml_spec.rb
2018-02-23 23:28:31 +09:00
5f3bee345d
Fix container regression ( #6531 )
...
* Update public.html.haml
* Update auth.html.haml
* Update modal.html.haml
2018-02-22 03:04:27 +01:00
c71aa468b5
Redesign landing page (again) ( #6486 )
...
* Redesign landing page (again)
* Move login form in small version to the right column
* Display closed registrations message
* Add site setting for the hero image
* Fix test
* Increase spacing, maximum width, change call to action section
2018-02-22 01:03:48 +01:00
61ed133fea
Account archive download ( #6460 )
...
* Fix #201 : Account archive download
* Export actor and private key in the archive
* Optimize BackupService
- Add conversation to cached associations of status, because
somehow it was forgotten and is source of N+1 queries
- Explicitly call GC between batches of records being fetched
(Model class allocations are the worst offender)
- Stream media files into the tar in 1MB chunks
(Do not allocate media file (up to 8MB) as string into memory)
- Use #bytesize instead of #size to calculate file size for JSON
(Fix FileOverflow error)
- Segment media into subfolders by status ID because apparently
GIF-to-MP4 media are all named "media.mp4" for some reason
* Keep uniquely generated filename in Paperclip::GifTranscoder
* Ensure dumped files do not overwrite each other by maintaing directory partitions
* Give tar archives a good name
* Add scheduler to remove week-old backups
* Fix code style issue
2018-02-21 23:21:32 +01:00
3d033a4687
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
Gemfile
config/locales/simple_form.pl.yml
2018-02-17 00:02:37 -06:00
9dbae6e8a1
Save video metadata and improve video OpenGraph tags ( #6481 )
...
* Save metadata from video attachments, put correct dimensions into OG tags
* Add twitter:player for videos
* Fix code style and test
2018-02-16 07:22:20 +01:00
1122579216
Do not hide NSFW media/CW'd text in OpenGraph tags ( #6479 )
...
Reasoning: HTML title tag affects everyone. But OpenGraph only affects
when somebody is deliberately sharing the content, usually in an
environment where such content is expected. Hiding the content in
OpenGraph tags results in deceitful previews which inhibit the
shareability of the post.
Example: Somebody writes a clever post about politics but kindly
puts a "uspol" content warning on it. Mastodon users are thankful,
but sharing this post on another platform results in non-Mastodon
users believing the entire contents of the post is "uspol" and not
clicking through/reading and re-sharing.
2018-02-16 04:40:53 +01:00
efc9ffcb80
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-02-11 04:10:16 +00:00
411c9ecb4b
Fix password recovery ( #6459 )
...
* Fix password recovery
* Use “resource” instead of “current_user”
2018-02-10 17:09:44 +01:00
020b40efdb
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
.travis.yml
app/lib/user_settings_decorator.rb
app/models/user.rb
app/serializers/initial_state_serializer.rb
app/views/stream_entries/_detailed_status.html.haml
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.en.yml
2018-02-09 09:25:53 -06:00
76f3d5d16b
Add preference to always display sensitive media ( #6448 )
2018-02-09 00:26:57 +01:00
a6fb1c58ee
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
.env.production.sample
app/controllers/auth/confirmations_controller.rb
db/schema.rb
2018-02-04 16:36:19 -06:00
4e4f1b0dcb
Add option to show only local toots in timeline preview ( #6292 )
...
* Add option to show only local toots in timeline preview
Right know, toots from all the known fediverse are shown in the main
page of an instance. That however doesn't reflect the instance itself.
With this option the admin may choose to display only local toots so
that users checking the instance get a better idea of internal
conversations.
* Fix issues pointed by codeclimate and eslint
* Add default message for community timeline
* Update pl.yml
2018-02-04 06:00:10 +01:00
26f21fd5a0
CAS + SAML authentication feature ( #6425 )
...
* Cas authentication feature
* Config
* Remove class_eval + Omniauth initializer
* Codeclimate review
* Codeclimate review 2
* Codeclimate review 3
* Remove uid/email reconciliation
* SAML authentication
* Clean up code
* Improve login form
* Fix code style issues
* Add locales
2018-02-04 05:42:13 +01:00
4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
2018-02-02 08:39:52 -06:00
af40824998
moved save button ( #3792 )
...
* moved save button
* added save back to the bottom
* Update show.html.haml
2018-02-02 10:45:43 +01:00
5da5c65db8
Unify links container implementation in about pages ( #6382 )
...
They were redundant, and also had a inconsistency; the button for
"other instances" had an icon for the external link in "more" page, but
it didn't in the other pages.
This unifies the implementation, and the external link icon is now shown
in all the about pages.
2018-02-02 10:32:21 +01:00
04fef7b888
pam authentication ( #5303 )
...
* add pam support, without extra column
* bugfixes for pam login
* document options
* fix code style
* fix codestyle
* fix tests
* don't call remember_me without password
* fix codestyle
* improve checks for pam usage (should fix tests)
* fix remember_me part 1
* add remember_token column because :rememberable requires either a password or this column.
* migrate db for remember_token
* move pam_authentication to the right place, fix logic bug in edit.html.haml
* fix tests
* fix pam authentication, improve username lookup, add comment
* valid? is sometimes not honored, return nil instead trying to authenticate with pam
* update devise_pam_authenticatable2 and adjust code. Fixes sideeffects observed in tests
* update devise_pam_authenticatable gem, fixes for codeconventions, fix finding user
* codeconvention fixes
* code convention fixes
* fix idention
* update dependency, explicit conflict check
* fix disabled password updates if in pam mode
* fix check password if password is present, fix templates
* block registration if account is maintained by pam
* Revert "block registration if account is maintained by pam"
This reverts commit 8e7a083d650240b6fac414926744b4b90b435f20.
* fix identation error introduced by rebase
* block usernames maintained by pam
* document pam settings better
* fix code style
2018-02-02 10:18:55 +01:00
f4b2478af1
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/views/layouts/mailer.html.haml
config/locales/ko.yml
2018-01-28 22:45:17 -06:00
79bc3d5845
Add direction tags to HTML e-mails for RTL languages ( #6373 )
2018-01-29 00:22:20 +01:00
0e10667fbe
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-24 19:17:11 +00:00
4ec9d8b4d9
Display deleted users' role as “Suspended” ( #6339 )
...
Follow-up to 6eb60260b1
2018-01-23 14:31:31 +01:00
8cc65cde27
Resolve URL for local account in follow authorization success view ( #6324 )
2018-01-22 14:22:14 +01:00
1253279feb
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/settings/two_factor_authentication/confirmations_controller.rb
2018-01-21 13:36:10 -06:00
1287de1b83
Fix invalid value passed to full_asset_url in mailers ( #6312 )
2018-01-21 13:20:00 +01:00
2c578a01d8
Merge remote-tracking branch 'origin/master' into gs-master
2018-01-20 16:42:57 -06:00
72f9eab3d6
Change mailer avatar url ( #6309 )
...
* Change mailer avatar url
* Use full_asset_url method
2018-01-20 19:27:13 +01:00
071c2c9c85
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
2018-01-20 10:45:43 -06:00
872a0d5bd8
Improve HTML e-mails based on Litmus tests ( #6301 )
...
* Use PNG images in HTML e-mails
* Make webpack use URLs with host so fonts load inside HTML e-mails
Convert this back to a relative URL in the premailer CSS loader
since local requests are quicker
* Improve responsive design
* Add missing PNG icon
2018-01-20 01:32:21 +01:00
01421999ae
Make text e-mails consistent with HTML ones in UserMailer ( #6291 )
...
* Make text e-mails consistent with HTML ones in UserMailer
* Fix UserMailer specs
2018-01-20 01:32:05 +01:00
2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
app/javascript/styles/mastodon/modal.scss
2018-01-19 15:22:10 -06:00
d799921c75
Replace tutorial modal with welcome e-mail ( #6273 )
...
* Remove onboarding modal
* Welcome e-mail
* Send welcome e-mail after confirmation
* Remove obsolete translations
2018-01-18 19:17:25 +01:00
aa2bf07281
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-17 16:17:10 +00:00
eed7484cd6
Change mailer image url ( #6279 )
...
* Change image URL in mailer to full path
* Add application_mailer.view_profile localization.
2018-01-17 12:41:24 +01:00
02194838dd
HTML e-mails for NotificationMailer ( #6263 )
...
* HTML e-mails for NotificationMailer (except digest)
* Add HTML template for digest
* Fix build
2018-01-16 20:20:15 +01:00
9a28052e92
Change image URL in mailer to full path ( #6264 )
2018-01-16 06:26:46 +01:00
cda845ae0e
Fix mailer to use webpack core
2018-01-15 21:17:03 -08:00
89a9d629f7
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
Gemfile.lock
2018-01-15 22:17:48 -06:00
5276c0a090
HTML e-mails for UserMailer ( #6256 )
...
- premailer gem to turn CSS into inline styles automatically
- rework UserMailer templates
- reword UserMailer templates
2018-01-16 03:29:11 +01:00
9fa79bc317
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-12 02:17:15 +00:00
704053d221
Handle sessions that can't be translated ( #6245 )
...
* Handle sessions that can't be translated
This commit fixes #6165 .
* Fix typo
2018-01-12 02:44:28 +01:00
991371af5f
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
db/schema.rb
2018-01-09 14:16:45 -06:00
d41f0b66cc
Fix #6204 : Use content warning for page title when present ( #6231 )
2018-01-09 19:34:58 +01:00
44792de49a
Don't show skins selector when there's only one ( #256 )
2018-01-08 16:45:32 -08:00
f839ac694c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-08 10:17:15 +00:00
dbda87c31f
Revert #5772 ( #6221 )
2018-01-08 10:57:52 +01:00
c2e1bfd9ae
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-07 15:17:13 +00:00
c4d36d024c
Update Simplified Chinese translations ( #6215 )
...
* i18n: (zh-CN) Add translations of #6125
* i18n: (zh-CN) Add translations of #6132
* i18n: (zh-CN) Add translations of #6099
* i18n: (zh-CN) Add translations of #6071
* i18n: (zh-CN) Improve translations
2018-01-07 17:32:50 +09:00
f6adb409fd
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-05 22:17:12 +00:00
06636c6eca
l10n Occitan language: mailer update ( #6193 )
...
* Create email_changed.oc.html.erb
* Create email_changed.oc.text.erb
* Update email_changed.oc.html.erb
* Update email_changed.oc.html.erb
* Create reconfirmation_instructions.oc.html.erb
* Create reconfirmation_instructions.oc.text.erb
* Update confirmation_instructions.oc.html.erb
* Update confirmation_instructions.oc.text.erb
* Update confirmation_instructions.oc.html.erb
* Update reconfirmation_instructions.oc.html.erb
* Update reconfirmation_instructions.oc.text.erb
* Update reconfirmation_instructions.oc.html.erb
2018-01-05 18:59:43 +09:00
fc884d015a
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-03 20:17:13 +00:00
161c72d66d
Allow to dereference Follow object for ActivityPub ( #5772 )
...
* Allow to dereference Follow object for ActivityPub
* Accept IRI as object representation for Accept activity
2018-01-03 18:08:57 +01:00
53d99ebf4f
i18n: Update Polish translation ( #6168 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-03 22:45:24 +09:00
1001922156
Add Japanese translations #5997 , #6003 , #6004 , #6071 , #6099 , #6125 and #6132 ( #6167 )
...
* yarn manage:translations
* Add Japanese translation for #5997
* Add Japanese translation for #6003
* Add Japanese translation for #6004
* Add Japanese translation for #6071
* Add Japanese translation for #6099
* Add Japanese translation for #6125
* Add Japanese translation for #6132
2018-01-03 21:00:39 +09:00
933840bebf
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-03 04:17:11 +00:00
04ecf44c2f
Add confirmation step for email changes ( #6071 )
...
* Add confirmation step for email changes
This adds a confirmation step for email changes of existing users.
Like the initial account confirmation, a confirmation link is sent
to the new address.
Additionally, a notification is sent to the existing address when
the change is initiated. This message includes instruction to reset
the password immediately or to contact the instance admin if the
change was not initiated by the account owner.
Fixes #3871
* Add review fixes
2018-01-02 16:55:00 +01:00
ce854ed506
delete X-UA-Compatible ( #6068 )
...
* delete X-UA-Compatible
* undo
* restore
2018-01-02 13:38:12 +01:00
21b9da6418
Adding Serbian latin translations ( #6146 )
...
Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.
2018-01-02 20:39:12 +09:00
54148b9a4a
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/authorize_follows_controller.rb
app/javascript/styles/mastodon/components.scss
2018-01-02 00:11:41 -06:00
2c1ed5f872
Show mastodon on modal ( #6129 )
2018-01-02 05:07:56 +01:00
fa9b7ece2e
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-31 09:17:15 +00:00
7d376e41be
Adding Serbian translation ( #6133 )
...
* Adding Serbian translation
* i18n-tasks normalize
2017-12-31 17:28:20 +09:00
4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/auth/confirmations_controller.rb
2017-12-30 17:20:07 -06:00
a56c4742d3
keep the same filters and page when doing custom emojo stuff ( fixes #6112 ) ( #6114 )
2017-12-30 02:43:43 +01:00
38fc1b498d
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
f77c47d01b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-24 15:17:12 +00:00
a8eb0bf44f
Reduce motion for boost animation ( #5871 )
...
* Reduce motion for boost animation
Fixes #5833
* Fix ternary expression
2017-12-24 04:48:31 +01:00
6d00ca1c71
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-22 04:17:14 +00:00
6eb60260b1
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
82236a3703
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-13 18:17:16 +00:00
ad75ec8b5b
Add filters to admin UI for custom emojis ( #6003 )
2017-12-13 13:28:31 +01:00
20a6584d2d
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
a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
2017-12-12 02:54:13 -06:00
30d2ea03b0
Improve public status page title ( #5985 )
2017-12-12 03:56:30 +01:00
ed7231947c
Added styling
2017-12-10 20:32:28 -08:00
bdca1614d5
Screenshot support for themes
2017-12-10 20:32:28 -08:00
dabf66e676
Moved flavour UI into own prefs tab
2017-12-10 20:32:27 -08:00
072ab191cc
pulled master, moved locale entry to new location
2017-12-10 15:22:15 -06:00
1c728df92e
Only localize js when there's a theme
2017-12-10 11:08:04 -08:00
b28cd6769c
Javascript intl8n flavour support
2017-12-10 11:08:04 -08:00
d08d0f9f33
Ruby intl8n for themes
2017-12-10 11:08:04 -08:00
abe95b614b
add initial components based off of tootsuite pr #1507
2017-12-09 10:26:22 -06:00
931e66e572
Back to Web UI from tag page when signed in ( #5943 )
2017-12-09 14:19:07 +01:00
70ce2a2095
Polish video player CSS, add timer on fullscreen/modal/public pages ( #5928 )
2017-12-09 00:55:58 +01:00
81b0145759
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
8ca91cef45
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-06 20:17:13 +00:00
42bcbd36b7
Remove rabl dependency ( #5894 )
...
* Remove rabl dependency
* Replicate old Oj configuration
2017-12-06 15:04:49 +09:00
5bed0f10ed
Various fixes
2017-12-04 21:58:10 -08:00
a807e3b71b
current_theme -> current_flavour ( #229 )
2017-12-04 11:35:35 -06:00
d9800a5647
Merge branch 'gs-master' into glitch-theme
2017-12-04 11:07:01 -06:00
1c74ede69e
Fixed a name + localizations
2017-12-04 00:19:39 -08:00
bc4fa6b198
Rename themes -> flavours ? ?
2017-12-03 23:26:40 -08:00
933eafdcd3
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-02 14:17:11 +00:00
74320971e2
Add invite filter ( #5862 )
2017-12-01 16:40:02 +01:00
eee3b32b77
Fix invites form path ( #5861 )
2017-12-01 12:26:57 +01:00
df03042a6e
Allow admin to deactivate invite created by users ( #5860 )
2017-12-01 12:26:19 +01:00
541fe9b110
Skins support
2017-11-30 19:29:47 -08:00
95c270f5b1
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-28 11:45:13 -06:00
15fab79cfa
Show "expired" in invite index ( #5838 )
...
* Show "expired" in invite index
* "Force expire" -> "Deactivate"
2017-11-28 15:41:02 +01:00
7463d80ff4
Merge remote-tracking branch 'tootsuite/master'
2017-11-27 22:33:26 -06:00
706e534455
Add UI for setting up account migration ( #5832 )
2017-11-27 22:47:06 +01:00
e77c3996a5
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-27 11:29:04 -06:00
1c5b0e3334
Use account.username when display_name is empty ( #5828 )
2017-11-27 16:09:52 +01:00
740f8a95a9
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
5de42665d7
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-27 05:17:11 +00:00
0ea4478b68
Use account.display_name for og:title single toot pages ( #5821 )
2017-11-27 05:31:26 +01:00
167fe2ab08
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-24 01:17:20 +00:00
e84fecb7e9
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
8812bab687
Minor fixes
2017-11-21 18:17:38 -08:00
bdbbd06dad
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
d083f7741a
Merge remote-tracking branch 'tootsuite/master'
2017-11-19 01:30:29 -06:00
bfdcf76a64
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
58cede4808
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
94c5a11cda
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-17 20:17:12 +00:00
e28b33c89c
Move "Permissions" row into main table in /admin/accounts/:id ( #5734 )
2017-11-17 15:18:20 +01:00
585758a373
Themed prefetching
2017-11-16 21:37:08 -08:00
b28b405b97
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-16 22:52:37 -06:00
9dd5e329ab
Remove empty strings ( #5732 )
2017-11-17 10:52:30 +09:00
2151fd3150
Display moderator badge (green), admin badge changed to red ( #5728 )
2017-11-17 01:22:38 +01:00
35fbdc36f9
Merge tootsuite/master at 3023725936
2017-11-16 01:21:16 -06:00
fbef909c2a
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
0e6c4cb796
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
7bb8b0b2fc
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
eb97bd8af6
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
1032f3994f
Add ability to disable login and mark accounts as memorial ( #5615 )
...
Fix #5597
2017-11-07 19:06:44 +01:00
b6e2e999bd
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
38d072446b
add account search condition (instance domain) ( #5577 )
2017-11-01 14:46:05 +01:00
0692991b54
Add ServiceWorker caching for static assets ( #5524 )
2017-10-31 12:25:51 +01:00
29609fbb6a
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
3de22a82bf
Refactor initial state: reduce_motion and auto_play_gif ( #5501 )
2017-10-28 00:04:44 +09:00
870d71b78b
Merge branch 'master' into gs-master
2017-10-27 09:45:25 -05:00
781105293c
Feature: Unlisted custom emojis ( #5485 )
2017-10-27 16:11:30 +02:00
a2612d0d38
Merge pull request #179 from glitch-soc/keyword-mute
...
Keyword muting
2017-10-25 17:37:48 -04:00
42f2045c21
Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
2017-10-25 16:01:20 -05:00
Eugen Rochko
Jenkins
vpzomtrrfrt
Sylvhem
David Yip
Lynx Kotoura
Ian McCowan
imncls
ThibG
Renato "Lond" Cerqueira
Charlotte Fields
Akihiko Odaki
Alexander
Iijima Yasushi
mayaeh
Yamagishi Kazutoshi
kibi!
Jeong Arm
SerCom_KC
Quenty31
Marcin Mikołajczak
Patrick Figel
Otakan
Branko Kokanovic
beatrix
Nolan Lawson
cwm
Alda Marteau-Hardi
unarist
ysksn
Surinna Curtis
Anna e só
nullkal
MitarashiDango
SerCom_KC