8c41fb4acc
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-17 16:17:10 +00:00
ef20e5d3fd
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
000b0baac2
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
d60d5fbd26
Change image URL in mailer to full path ( #6264 )
2018-01-16 06:26:46 +01:00
be525dd4db
Fix mailer to use webpack core
2018-01-15 21:17:03 -08:00
de7283a318
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
Gemfile.lock
2018-01-15 22:17:48 -06:00
9613c3238c
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
e6049e6fd0
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-12 02:17:15 +00:00
73b6f2ebe9
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
1a7f8eb723
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
db/schema.rb
2018-01-09 14:16:45 -06:00
6d9f2924ad
Fix #6204 : Use content warning for page title when present ( #6231 )
2018-01-09 19:34:58 +01:00
134e6590c6
Don't show skins selector when there's only one ( #256 )
2018-01-08 16:45:32 -08:00
1f469edac1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-08 10:17:15 +00:00
c8f0be1d6d
Revert #5772 ( #6221 )
2018-01-08 10:57:52 +01:00
8704a190c0
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-07 15:17:13 +00:00
154bd8db56
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
86007e913d
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-05 22:17:12 +00:00
cf9323449e
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
a7b8cb9493
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-03 20:17:13 +00:00
7a0479c830
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
b83fb8b107
i18n: Update Polish translation ( #6168 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-01-03 22:45:24 +09:00
d50d61a90c
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
b42e6973a1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-03 04:17:11 +00:00
3c20cfd734
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
1cd5812c6b
delete X-UA-Compatible ( #6068 )
...
* delete X-UA-Compatible
* undo
* restore
2018-01-02 13:38:12 +01:00
1c4142da5b
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
ed572490c1
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
616b6867a0
Show mastodon on modal ( #6129 )
2018-01-02 05:07:56 +01:00
5975446002
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-31 09:17:15 +00:00
34a90dc266
Adding Serbian translation ( #6133 )
...
* Adding Serbian translation
* i18n-tasks normalize
2017-12-31 17:28:20 +09:00
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
d9c2806048
keep the same filters and page when doing custom emojo stuff ( fixes #6112 ) ( #6114 )
2017-12-30 02:43:43 +01:00
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
503e7fb4d8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-24 15:17:12 +00:00
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
9ccad78647
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-22 04:17:14 +00:00
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
1366e96a02
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-13 18:17:16 +00:00
d6088c5308
Add filters to admin UI for custom emojis ( #6003 )
2017-12-13 13:28:31 +01:00
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
a56c9ac5dc
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
2017-12-12 02:54:13 -06:00
d5f4baf720
Improve public status page title ( #5985 )
2017-12-12 03:56:30 +01:00
d9e1496990
Added styling
2017-12-10 20:32:28 -08:00
a1c79ef544
Screenshot support for themes
2017-12-10 20:32:28 -08:00
901c08a999
Moved flavour UI into own prefs tab
2017-12-10 20:32:27 -08:00
34630e00cb
pulled master, moved locale entry to new location
2017-12-10 15:22:15 -06:00
853082e760
Only localize js when there's a theme
2017-12-10 11:08:04 -08:00
99e8710095
Javascript intl8n flavour support
2017-12-10 11:08:04 -08:00
f4c233f59f
Ruby intl8n for themes
2017-12-10 11:08:04 -08:00
41bbfeec7c
add initial components based off of tootsuite pr #1507
2017-12-09 10:26:22 -06:00
03d28b6ec8
Back to Web UI from tag page when signed in ( #5943 )
2017-12-09 14:19:07 +01:00
b95863ec48
Polish video player CSS, add timer on fullscreen/modal/public pages ( #5928 )
2017-12-09 00:55:58 +01:00
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
a3a7b6a848
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-06 20:17:13 +00:00
b037fbf9f4
Remove rabl dependency ( #5894 )
...
* Remove rabl dependency
* Replicate old Oj configuration
2017-12-06 15:04:49 +09:00
fd7be49523
Various fixes
2017-12-04 21:58:10 -08:00
0002d12c24
current_theme -> current_flavour ( #229 )
2017-12-04 11:35:35 -06:00
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
eb345f8e8b
Custom emoji ( #4988 )
...
* Custom emoji
- In OStatus: `<link rel="emoji" name="coolcat" href="http://..." />`
- In ActivityPub: `{ type: "Emoji", name: ":coolcat:", href: "http://..." }`
- In REST API: Status object includes `emojis` array (`shortcode`, `url`)
- Domain blocks with reject media stop emojis
- Emoji file up to 50KB
- Web UI handles custom emojis
- Static pages render custom emojis as `<img />` tags
Side effects:
- Undo #4500 optimization, as I needed to modify it to restore
shortcode handling in emojify()
- Formatter#plaintext should now make sure stripped out line-breaks
and paragraphs are replaced with newlines
* Fix emoji at the start not being converted
2017-09-19 02:42:40 +02:00
f4d0774877
A few updates to the Spanish translation and some typos fixing ( #4997 )
...
* So Spanish. Much changes. Wow.
* Some little fixes
* Updated es.yml, and fixed some ortographical errors
* Some little changes to simple_form.es.yml
* Yeah, so much translations
* Spanish e-mail messages
* Remove unused message
2017-09-19 07:47:48 +09:00
a3d75ce672
Do not add image size without meta to OGP (regression from #4901 ) ( #4995 )
2017-09-18 15:00:29 +02:00
313d90b8f4
Add `strip_insignificant_zeros: true` option to `number_to_human` ( #4993 )
2017-09-18 04:55:23 +02:00
8585421eb1
Oauth code in input form and add description message ( #4986 )
...
* Oauth code in a input form and add description
* New authcode description
2017-09-17 15:23:44 +02:00
9b85c3a13f
Minor Chinese check & jsx addition ( #4973 )
...
* zh-*: transition from "like" back to "fav"
This commit reverts the translation for the yellow-star "fav" button
back to "fav" in Chinese. Some ambuiguity between "like" and "fav" is
deliberately used in zh-TW/HK by using the existing phrase "最爱"
(favorite (adj.), lit. love-most) instead of "收藏" (favourite (v.),
"collect") in some instances.
Fixes #3511 .
* zh-*: apply suggestions for PR #4557
* zh-cn: de-monetize ya account
In Chinese two separate characters, 账 and 帐, can be used to spell the
word for account (账/帐户). However, the one with a 贝 on the left is
evolved from the latter specifically for monetary purposes. Since
people usually can't figure out which one to use, it might be a good
idea to use the original not-so-money one.
* zh-*: complete jsx translation
2017-09-16 18:48:38 +02:00
b5ec3346fa
Adjust landing pages 2 ( #4967 )
...
* Adjust landing pages 2
Fix styles of terms page
Remove action buttons from timeline in about page
Adjust styles of short description
Adjust form inputs
Set autocomplete off for username and email box in registration form. Remove line breakings.
* Revert removing action buttons
2017-09-16 18:39:11 +02:00
fbec33df62
Redesign video player ( #4911 )
...
* Redesign video player
* Use new video player on static public pages too
* Use media gallery component on static public pages too
* Pause video when hiding it
* Full-screen sizing on WebKit
* Add aria labels to video player buttons
* Display link card on public status page
* Fix fullscreen from modal sizing issue
* Remove contain: strict property to fix fullscreen from columns
2017-09-14 03:39:10 +02:00
9ff429aa6d
Uploads for admin site settings ( #4913 )
...
* Improve OpenGraph tags for about pages
* Add thumbnail admin setting
* Fix error
* Fix up
2017-09-14 00:04:30 +02:00
7f432a97a0
Add instance search feature ( #4925 )
2017-09-13 12:30:07 +02:00
405b24ca30
Make instance names in into links to user list in the instance ( #4924 )
2017-09-13 11:34:07 +02:00
94fdf7da70
Add section for protocol specific information on the admin page ( #4910 )
...
This PR adds section for protocol specific information, then always show
both of OStatus and ActivityPub. Specifically, this will help admins to
check PuSH subscription status and unsubscribe manually, even `protocol`
has been changed.
This also includes below changes:
* Add `overflow: hidden` to prevent float leaking
* Add missing fields for ActivityPub
2017-09-12 23:06:10 +02:00
d4fd2a39e6
Clean up and improve generated OpenGraph tags ( #4901 )
...
- Return all images as og:image
- Return videos as og:image (preview) and og:video
- Return profile:username on profiles
2017-09-12 05:39:38 +02:00
b25c112d31
Reset preview image if avatar/header image selection was cancelled ( #4893 )
2017-09-11 16:19:54 +02:00
d639474d8c
l10n: Full PT-BR translation ( #4882 )
...
* devise.pt-BR.yml now fully translated
* pt-BR.json now fully translated
* pt-BR.yml partially translated; 46 lines left
* pt-BR.yml now fully translated
* simple_form.pt-BR.yml fully translated
* doorkeeper.pt-BR.yml now fully translated
* E-mail instructions on app/views/user_mailer added and fully translated
* PT-BR translation for #4871
* Deleted an unwanted caracter on pt-BR.yml
* Fixing typos on pt-BR.yml
* Added translation for Pinned toots tab on pt-BR.json
* Added missing translation for navigation_bar.pins
2017-09-11 08:40:29 +09:00
f90abccf33
Merge tag 'v1.6.0' into sync/upstream
2017-09-10 13:04:27 -05:00
6628ea4a82
Default follows for new users ( #4871 )
...
When a new user confirms their e-mail, bootstrap their home timeline
by automatically following a set of accounts. By default, all local
admin accounts (that are unlocked). Can be customized by new admin
setting (comma-separated usernames, local and unlocked only)
2017-09-10 09:58:38 +02:00
017738c604
Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
...
Conflicts:
app/javascript/mastodon/features/getting_started/index.js
app/javascript/packs/public.js
app/javascript/styles/components.scss
2017-09-09 23:56:21 -05:00
67d9178007
Merge tag 'v1.6.0rc3' into sync/upstream
2017-09-09 14:28:08 -05:00
da3f22ee7d
Merge branch 'origin/master' into sync/upstream
...
Conflicts:
app/javascript/mastodon/components/status_list.js
app/javascript/mastodon/features/notifications/index.js
app/javascript/mastodon/features/ui/components/modal_root.js
app/javascript/mastodon/features/ui/components/onboarding_modal.js
app/javascript/mastodon/features/ui/index.js
app/javascript/styles/about.scss
app/javascript/styles/accounts.scss
app/javascript/styles/components.scss
app/presenters/instance_presenter.rb
app/services/post_status_service.rb
app/services/reblog_service.rb
app/views/about/more.html.haml
app/views/about/show.html.haml
app/views/accounts/_header.html.haml
config/webpack/loaders/babel.js
spec/controllers/api/v1/accounts/credentials_controller_spec.rb
2017-09-09 14:27:47 -05:00
899e7ad811
i10n minors changes for 1.6 ( #4867 )
...
* wrong preposition + typo
* wrong preposition + typo
* Typo
* Typo
* minor changes
* minor changes
2017-09-09 18:22:56 +02:00
c268118e5b
Scrollable tables in settings pages ( #4857 )
...
* Scrollable tables in settings pages
* Add space before curly brace
2017-09-09 02:26:58 +02:00
a27821f725
Fix language filter codes ( #4841 )
...
* Fix language filter codes
CLD3 returns BCP-47 language identifier, filter settings expect
identifiers in the ISO 639-1 format. Convert between formats,
and exclude duplicate languages from filter choices (zh-CN->zh)
* Fix zh name
2017-09-08 12:32:22 +02:00
cbe9eb3f2e
i10n OC / FR update Pinned toots ( #4842 )
...
* Added column.pins
New strings
* Added column.pins
* Update confirmation_instructions.oc.html.erb
* Update confirmation_instructions.oc.text.erb
* Update password_change.oc.html.erb
* Update password_change.oc.text.erb
* Update reset_password_instructions.oc.html.erb
* Update reset_password_instructions.oc.text.erb
* Update confirmation_instructions.oc.html.erb
* Update confirmation_instructions.oc.text.erb
2017-09-07 22:07:03 +02:00
5a27eaae7c
Adjust status embeds ( #4808 )
...
* Adjust status embeds
Adjust styles of embed code. Adjust styles of embed pages. Fix overflow of embed-modal.
* Remove trailing whitespace
* Using width from the variable
2017-09-05 12:31:24 +02:00
ce3a71690b
Fix #4551 - Use correct syntax for content preloading ( #4798 )
2017-09-04 02:14:12 +02:00
f13b1b67f5
Adjust settings pages ( #4765 )
...
* views: Adjust heading positions
* Adjust settings pages
Adjust label. Adjust tables. Adjust admin/reports/* pages. Fix 2FA QR code style for narrow devices. Widen several pages. Increase contrast.
* Remove trailing whitespace
2017-09-02 15:49:28 +02:00
690e59b1f0
Fix profile page when use system's font ( #4774 )
2017-09-02 14:01:59 +02:00
186416830e
Add link to 'noscript' message ( #4561 )
...
* Add link to 'noscript' message
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* remove indent
2017-09-02 01:52:28 +02:00
8d4e705cb0
Use system's default font on non web UI pages ( #4553 )
...
* Use system's default font on non web UI pages
* Remove import for Redirect
2017-09-01 16:13:31 +02:00
651c659fd6
Update status embeds ( #4742 )
...
- Use statuses controller for embeds instead of stream entries controller
- Prefer /@:username/:id/embed URL for embeds
- Use /@:username as author_url in OEmbed
- Add follow link to embeds which opens web intent in new window
- Use redis cache in development
- Cache entire embed
2017-08-30 10:23:43 +02:00
007d26852d
Shorten display of large numbers on public profiles ( #4711 )
2017-08-27 17:04:45 +02:00
dc19078b59
Fix missing at-sign (regression from #4688 ) ( #4705 )
2017-08-26 12:39:26 +02:00
5e3c6f63be
Change timezone of the datetime to what browser specifies ( #4688 )
2017-08-25 17:21:00 +02:00
5482e0d10e
Add label for application scopes ( #4691 )
...
* Add label for application scopes
* hint
2017-08-25 13:03:26 +02:00
3e20cb7025
Pinned statuses ( #4675 )
...
* Pinned statuses
* yarn manage:translations
2017-08-25 01:41:18 +02:00
da85aff49c
Use checkboxes for application scope setting ( #4671 )
2017-08-23 15:16:20 +02:00
b13501268f
Fix up the applications area ( #4664 )
...
- Section it into "Development" area
- Improve UI of application form, index, and details
2017-08-23 00:59:35 +02:00
fd9d66dfd4
Add Mastodon::Source.url ( #4643 )
...
* Add Mastodon::Source.url
* Update spec
* Refactor
Move things frmo Mastodon::Source to Mastodon::Version
2017-08-22 22:54:19 +02:00
63b98318c5
Application prefs section ( #2758 )
...
* Add code for creating/managing apps to settings section
* Add specs for app changes
* Fix controller spec
* Fix view file I pasted over by mistake
* Add locale strings. Add 'my apps' to nav
* Add Client ID/Secret to App page. Add some visual separation
* Fix rubocop warnings
* Fix embarrassing typo
I lost an `end` statement while fixing a merge conflict.
* Add code for creating/managing apps to settings section
- Add specs for app changes
- Add locale strings. Add 'my apps' to nav
- Add Client ID/Secret to App page. Add some visual separation
- Fix some bugs/warnings
* Update to match code standards
* Trigger notification
* Add warning about not sharing API secrets
* Tweak spec a bit
* Cleanup fixture creation by using let!
* Remove unused key
* Add foreign key for application<->user
2017-08-22 18:33:57 +02:00
6cce0bb080
use existing inflections instead of custom helper ( #4624 )
...
* use existing inflections instead of custom helper
* use ActiveSupport versions
2017-08-17 23:20:50 +02:00
a90b5796a1
Show what protocol is used for accounts in admin/accounts#index ( #4622 )
...
* Show what protocol used for in admin/accounts#index
* Add frozen_string_literal
2017-08-17 17:52:40 +02:00
2dba0368f8
Redesign public profiles ( #4608 )
...
* Redesign public profiles
* Responsive design
* Change public profile status filtering defaults and add options
- No longer displays private/direct toots even if you are permitted access
- By default omits replies
- "With replies" option
- "Media only" option
* Redesign account grid cards
* Fix style issues
2017-08-16 17:12:58 +02:00
40ec0f45fb
Update /admin/accounts/:id view for ActivityPub ( #4600 )
...
* Add protocol field
* Switch protocol specific information according to active protocol
* Hide PuSH subscription related buttons if ActivityPub is active
2017-08-14 14:09:00 +02:00
0e5c8372e7
Add protocol handler. Handle follow intents ( #4511 )
...
* Add protocol handler. Handle follow intents
* Add share intent
* Improve code in intents controller
* Adjust share form CSS
2017-08-14 04:53:31 +02:00
34962d9f9d
Add alternate links to ActivityPub resources from HTML/HEAD variants ( #4586 )
2017-08-13 00:45:04 +02:00
cbcac23679
Fix short description in about/more page ( #4554 )
2017-08-08 15:49:32 +02:00
f4017cce3f
unify short description styling ( #4548 )
...
apply same style class to the About description on both the landing page
and the about/more page
2017-08-08 01:50:15 +02:00
913dd13575
Merge remote-tracking branch 'upstream/master'
2017-08-07 22:43:52 +02:00
bac2a77deb
Adjust tags and accounts page ( #4534 )
...
* Adjust tag and accounts page
* Remove units from 0px paddings
2017-08-07 20:33:06 +02:00
fd69694749
Add "signed in as" header to some pages ( #4523 )
2017-08-05 04:24:58 +02:00
2cdee6ae8a
Merge upstream ( #111 )
2017-08-01 13:20:29 -07:00
755a7f2646
i18n: update Persian translation ( #4470 )
...
* i18n: update Persian translation
* i18n: fix quotes
2017-07-31 19:40:57 +02:00
15a8d9b0ca
Make salutation of email localizable ( #4454 )
2017-07-31 00:18:44 +02:00
58446d39d8
Multiple frontend support ( #110 )
...
* Initial multiple frontend support
* Removed unnecessary require()
* Moved styles/images out of common
2017-07-30 19:28:21 +02:00
5d364da590
Do not create empty a element when there is no e-mail ( #4455 )
...
Empty a element is created when there is no business e-mail input.
2017-07-30 16:24:18 +02:00
71bea1cd76
Set contact address in about/more as mailto link ( #4450 )
...
* Set contact address as mailto link
To be able to copy long email address
* Set style for mailto link
2017-07-30 12:56:04 +02:00
b7482e4a9f
Fix autocomplete option in haml files ( #4438 )
...
* Fix autocomplete in two_factor.html.haml
* Fix autocomplete in registrations edit.html.haml
* Fix autocomplete in passwords edit.html.haml
* Fix autocomplete in _registration.html.haml
* Fix autocomplete in new.html.haml
* Fix autocomplete in show.html.haml
* Add autocomplete option to sessions new.html.haml
* Add autocomplete option to 2FA new.html.haml
* Add autocomplete option to 2FA show.html.haml
2017-07-29 14:20:31 +02:00
043dfdb474
Fix current session not being displayed in sessions list ( #4424 )
2017-07-28 15:30:06 +02:00
74e54cd45b
Added external link icons to joinmastodon navbar buttons ( #4368 )
2017-07-26 02:00:36 +02:00
affd86c1dc
Add .fa-external-link to instance list link
2017-07-25 23:30:13 +02:00
2129485669
Fix JS errors and add back commit hash
2017-07-25 21:54:12 +02:00
7072288bcf
Merge git://github.com/tootsuite/mastodon into tootsuite-master
2017-07-25 21:36:22 +02:00
9510179cc1
Send short account URL to remote instance (regression from #3844 ) ( #4355 )
...
* Send short account URL to remote instance (regression from #3844 )
Resolve #4347
* remove format: 'json'
2017-07-25 15:59:43 +02:00
0d0b225136
Fix oddities with public profile CSS ( #4341 )
...
* Fix oddities with public profile CSS
* Remove trailing whitespace
2017-07-24 17:56:50 +02:00
fae1d9052b
Redesign /terms page ( #4338 )
...
* Redesign /terms page
* Fix tests
* Remove unused keys
2017-07-24 17:15:15 +02:00
e43e0e959c
Redesign extended information page ( #4322 )
...
* Redesign extended information page
* Remove unused keys
* Add $ui-base-lighter-color variable to SCSS
2017-07-24 15:09:08 +02:00
961f103c35
Allow domain blocks that only reject media without silencing or suspending ( #4325 )
...
* Allow domain blocks to reject media without silencing or suspending
* Fix typo
* Hide 'Reject media' button when superfluous, instead of disabling it
* Properly hide 'reject media' checkbox on page load if needed
This may happen when resubmitting the domain block form after an error.
* Don't ask whether undoing a media-only block should be retroactive
* Rename :media_only block to :noop
* Display :noop block as None in frontend, allow blocks that do nothing
* Remove 'coding' line auto-added by emacs
2017-07-24 14:26:55 +02:00
99dfbbf623
Fix manifest description (regression from #4122 ) ( #4324 )
2017-07-23 23:04:44 +02:00
cdaf19daeb
Improve noscript message and style ( #4315 )
2017-07-23 20:28:06 +02:00
2e766841f3
Change logo.png to logo.svg for web UI ( #4307 )
2017-07-23 11:09:42 +02:00
78c7c9fb0f
New logo ( #4306 )
...
* Add new logo
* Remove unused images
2017-07-23 02:40:39 +02:00
1dda0acdcb
Merge pull request #92 from tootsuite/master
...
tiny upstream merge
2017-07-22 22:20:17 +02:00
6ab3893157
Turn clouds on landing page into SVGs, use SCSS variables to color them ( #4299 )
2017-07-22 16:36:54 +02:00
8deb2072ef
Merge that good fresh upstream shit
2017-07-22 01:16:53 +00:00
c35ea3636c
Fix #3220 - Show avatar/header on edit profile page ( #4288 )
2017-07-21 05:28:51 +02:00
9d8d1d90e0
Add button to re-subscribe to all accounts from a domain ( #4285 )
2017-07-20 23:07:13 +02:00
64a107bc64
Merge pull request #87 from tootsuite/master
...
merge upstream
2017-07-20 11:24:32 -04:00
9392d10250
Add feature to revoke sessions ( #4259 )
2017-07-19 04:59:04 +02:00
0b64d60988
Fix for stylesheet split
2017-07-18 11:28:52 -07:00
ed6c60a0c2
Merge changes from upstream with the CSS reload fix
2017-07-18 18:58:47 +02:00
87bb16a236
Add unfollow modal (optional) ( #4246 )
...
* Add unfollow modal
* unfollowing someone
* remove unnecessary prop
2017-07-18 17:14:43 +02:00
e3251e74c1
Improve admin page ( #4121 )
...
* Improve admin page
* Fix test
* Add spec
* Improve select style
2017-07-18 16:38:22 +02:00
fe4429446f
Add empty alt attribute to img elements in landing page ( #4243 )
2017-07-18 15:22:09 +02:00
f48f42598f
Merge upstream ( #81 )
2017-07-15 14:33:15 -07:00
c99f41dc3c
Improve ActivityPub representations ( #3844 )
...
* Improve webfinger templates and make tests more flexible
* Clean up AS2 representation of actor
* Refactor outbox
* Create activities representation
* Add representations of followers/following collections, do not redirect /users/:username route if format is empty
* Remove unused translations
* ActivityPub endpoint for single statuses, add ActivityPub::TagManager for better
URL/URI generation
* Add ActivityPub::TagManager#to
* Represent all attachments as Document instead of Image/Video specifically
(Because for remote ones we may not know for sure)
Add mentions and hashtags representation to AP notes
* Add AP-resolvable hashtag URIs
* Use ActiveModelSerializers for ActivityPub
* Clean up unused translations
* Separate route for object and activity
* Adjust cc/to matrices
* Add to/cc to activities, ensure announce activity embeds target status and
not the wrapper status, add "id" to all collections
2017-07-15 03:01:39 +02:00
8207918890
🎄 🔨 Force tree shake emojione ( #4202 )
...
* chore(yarn): Install babel-plugin-preval as development dependency
* feat(babel): Add preval as a plugin
* feat(emojione_light): Prevaled module what tree-shaked emojione
* refactor(emoji): Use emojione_light
* feat: Preload emojione_picker bundle
* fix(emojione_light): Do not use Object.entries
* fix(emojify): Update tests
* chore(emojione_light): Remove silly ascii art
2017-07-14 20:30:12 +02:00
7d8fd050eb
Add option to opt out of search engines on public profile/status pages ( #4199 )
2017-07-14 16:41:02 +02:00
5b2a54e305
Do not load unnecessary script files ( #4193 )
2017-07-14 11:08:56 +02:00
ecab38fd66
Web Push Notifications ( #3243 )
...
* feat: Register push subscription
* feat: Notify when mentioned
* feat: Boost, favourite, reply, follow, follow request
* feat: Notification interaction
* feat: Handle change of public key
* feat: Unsubscribe if things go wrong
* feat: Do not send normal notifications if push is enabled
* feat: Focus client if open
* refactor: Move push logic to WebPushSubscription
* feat: Better title and body
* feat: Localize messages
* chore: Fix lint errors
* feat: Settings
* refactor: Lazy load
* fix: Check if push settings exist
* feat: Device-based preferences
* refactor: Simplify logic
* refactor: Pull request feedback
* refactor: Pull request feedback
* refactor: Create /api/web/push_subscriptions endpoint
* feat: Spec PushSubscriptionController
* refactor: WebPushSubscription => Web::PushSubscription
* feat: Spec Web::PushSubscription
* feat: Display first media attachment
* feat: Support direction
* fix: Stuff broken while rebasing
* refactor: Integration with session activations
* refactor: Cleanup
* refactor: Simplify implementation
* feat: Set VAPID keys via environment
* chore: Comments
* fix: Crash when no alerts
* fix: Set VAPID keys in testing environment
* fix: Follow link
* feat: Notification actions
* fix: Delete previous subscription
* chore: Temporary logs
* refactor: Move migration to a later date
* fix: Fetch the correct session activation and misc bugs
* refactor: Move migration to a later date
* fix: Remove follow request (no notifications)
* feat: Send administrator contact to push service
* feat: Set time-to-live
* fix: Do not show sensitive images
* fix: Reducer crash in error handling
* feat: Add badge
* chore: Fix lint error
* fix: Checkbox label overlap
* fix: Check for payload support
* fix: Rename action "type" (crash in latest Chrome)
* feat: Action to expand notification
* fix: Lint errors
* fix: Unescape notification body
* fix: Do not allow boosting if the status is hidden
* feat: Add VAPID keys to the production sample environment
* fix: Strip HTML tags from status
* refactor: Better error messages
* refactor: Handle browser not implementing the VAPID protocol (Samsung Internet)
* fix: Error when target_status is nil
* fix: Handle lack of image
* fix: Delete reference to invalid subscriptions
* feat: Better error handling
* fix: Unescape HTML characters after tags are striped
* refactor: Simpify code
* fix: Modify to work with #4091
* Sort strings alphabetically
* i18n: Updated Polish translation
it annoys me that it's not fully localized :P
* refactor: Use current_session in PushSubscriptionController
* fix: Rebase mistake
* fix: Set cacheName to mastodon
* refactor: Pull request feedback
* refactor: Remove logging statements
* chore(yarn): Fix conflicts with master
* chore(yarn): Copy latest from master
* chore(yarn): Readd offline-plugin
* refactor: Use save! and update!
* refactor: Send notifications async
* fix: Allow retry when push fails
* fix: Save track for failed pushes
* fix: Minify sw.js
* fix: Remove account_id from fabricator
2017-07-13 22:15:32 +02:00
bcc30c8697
Merge upstream!! #64 <3 <3
2017-07-12 02:03:17 -07:00
8abeec1f4f
Improve UI of admin site settings ( #4163 )
2017-07-12 03:24:04 +02:00
be8eed1bd9
First lame pass at adding optional git commit hash display on /about/… ( #67 )
...
* First lame pass at adding optional git commit hash display on /about/more page.
Currently, this is implemented by checking for the existence of a file called CURRENT_RELEASE in the home directory of the user running Mastodon. If the file exists, its contents are added.
I've modified my update process to include the following before precompiling assets:
git log -1 | head -n 1 | cut -d " " -f2 > ~/CURRENT_RELEASE
That puts the current commit hash into the file ~/CURRENT_RELEASE, but you figured that out because you're a smart cookie.
As I am quite sure this is a horrible methodology for implementing this, I look forward to any improvements you have to offer!
* Updated to handle instances that share a user - the CURRENT_RELEASE file now lives in the instance's base directory.
This also requires modifying the update hook to `git log -1 | head -n 1 | cut -d " " -f2 > CURRENT_RELEASE`
2017-07-11 20:32:16 -04:00
Jenkins