cf8121376b
Merge branch 'master' into glitch-soc/tentative-merge
...
Conflicts:
README.md
app/controllers/statuses_controller.rb
app/lib/feed_manager.rb
config/navigation.rb
spec/lib/feed_manager_spec.rb
Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.
2018-07-09 07:13:59 +02:00
250eb6a6c9
update twemojie to v2 ( #7911 )
2018-07-06 01:58:07 +02:00
e5134142bc
Crush PNGs to reduce overall size ( #7954 )
2018-07-05 15:20:16 +02:00
695674b2fa
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-06-12 13:17:21 +00:00
2e4a1d3109
Rename emoji sheet to avoid caching issue ( #7777 )
2018-06-10 16:12:47 +02:00
ae0b751a30
Update to emojimart 2.6.1 ( #7746 )
...
* Update to emojimart 2.6.1
WIP using local updated version. Sheet comes from emoji-data@4.0.4,
file sheet_twitter_32_indexed_256.png.
* Update to 2.6.1 and uncompress data if needed
* Remove changes that were not needed
* Fix yarn lock file
* Match emojiToShowFilter behavior to new version of emoji-mart
* Fix codeclimate issue
* Match custom emoji behavior to new version of emoji-mart
* Replace emoji without shortcode in tests
* Fix code climate issues
2018-06-07 19:40:23 +02:00
e4e0aa5d21
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-04-11 00:50:09 +00:00
dca7183dfb
Optimize public/headers/missing.png ( #7084 )
2018-04-09 11:34:48 +02:00
5c8ae1c7f8
Fix error 500 page
2018-03-16 22:31:20 +01:00
9ca0336c15
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
README.md
2018-03-12 17:52:19 -05:00
7d455651d3
add new avatar placeholder missing.png ( #6728 )
2018-03-11 14:55:38 +01:00
02ae609d9a
Merge tootsuite/master at ab48f2b239
2017-11-16 01:21:16 -06:00
4d1b81e0db
Add artist, title, and date metadata to boop.{mp3,ogg} ( #5531 )
...
For boop.mp3, this commit adds both ID3v1 and ID3v2 tags. For boop.ogg,
we use Vorbis metadata.
In the case of boop.mp3, this also adds a cover image. Interestingly, it
didn't seem to affect the size of boop.mp3 much, despite being ~8k.
boop.ogg seemed to be much more affected and so no cover image was added
to that version.
2017-10-28 00:05:04 +09:00
7d0cf5a6a1
Merge tag 'v2.0.0rc2' into gs-master
2017-10-12 04:22:59 -05:00
d931706bcd
Change Android icon padding again to half of previous ( #5339 )
2017-10-12 00:58:14 +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
cb78a30a77
Add padding to Android icon, change Apple and MS icons ( #5321 )
2017-10-11 19:11:15 +02:00
0cbee44d94
Fix wrong dimensions on Android icon ( #5296 )
2017-10-10 12:41:30 +02:00
658635d113
Material app icon for Chrome ( #5291 )
2017-10-09 21:27:16 +02:00
522fa878c3
Fix #5274 - Create symlink from public/500.html to public/assets/500.html ( #5288 )
2017-10-09 20:51:24 +02:00
0cc795db6b
Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream
2017-09-28 09:18:35 +02: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
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
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
2303725f7d
Add script to make embedded iframes autosize ( #4853 )
2017-09-09 16:23:44 +02:00
2cdee6ae8a
Merge upstream ( #111 )
2017-08-01 13:20:29 -07:00
2e32794a12
Use consistent icons for web push notifications, same as web UI ( #4426 )
2017-07-28 18:13:42 +02:00
c6344547a3
fix #4356 : place sw.js to assets/sw.js ( #4357 )
2017-07-28 01:55:52 +02:00
7072288bcf
Merge git://github.com/tootsuite/mastodon into tootsuite-master
2017-07-25 21:36:22 +02:00
e874a4562e
Use the "m" version of the logo for favicons ( #4345 )
2017-07-24 19:54:59 +02:00
78c7c9fb0f
New logo ( #4306 )
...
* Add new logo
* Remove unused images
2017-07-23 02:40:39 +02:00
f48f42598f
Merge upstream ( #81 )
2017-07-15 14:33:15 -07: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
a7a7613e71
cybre cleanup
2017-06-23 21:45:14 +00:00
bf32615615
cybrespace to 1.4.2
2017-06-23 21:45:14 +00:00
2edadd7fe7
All cybrespace changes through 5/28
2017-06-23 21:45:14 +00:00
143ab47410
Fix #3063 - Add dynamic app manifest ( #3563 )
...
* Fix #3063 - Add dynamic app manifest
* Added short_name
* Add background_color
2017-06-06 19:29:42 +02:00
67aa79964e
Add boop sounds in Vorbis format ( #2963 )
...
Vorbis is audio format of Open Source.
Can play audio in a free environment where you can not play mp3.
2017-05-10 16:58:54 +02:00
d440601851
Red favicon for dev ( #2470 )
...
* Set a dev specific favicon
* Consistent spacing
* Add trailing slash for consistency
* Update to remove interpolation
2017-04-26 15:45:27 +02:00
dd68c1cc16
Add mask-icon.svg ( #1572 ) ( #1585 )
...
* Add mask-icon (#1572 )
* use updated svg logo for mask-icon
2017-04-17 10:39:54 +02:00
cdbfbbc691
Improve emojis - use SVGs where possible
2017-03-29 22:27:24 +02:00
2c29cc400e
Improve error page layouting. 500 page has to stay static because it's
...
used from nginx when Rails fails.
2017-01-21 22:30:47 +01:00
280348f1e0
Merge branch 'fix/error-pages' of https://github.com/ineffyble/mastodon into ineffyble-fix/error-pages
2017-01-21 22:20:01 +01:00
4dd4664b10
Change missing.png header to 1x1 transparent PNG
2017-01-22 06:42:42 +11:00
d6d5a05e02
Add a default missing.png header image - fixes #492
2017-01-22 05:19:31 +11:00
7865ce28e5
Add sounds for notifications. Boop by @jk@mastodon.social
2017-01-17 20:09:03 +01:00
80f186cdf0
Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether
2017-01-15 10:30:23 +11:00
6860c6bcfd
Use system fonts on more platforms
...
This allows other platforms such as Windows, macOS and iOS to use their system fonts rather than downloading a copy of Roboto. It also makes the app feel a little closer to native on those platforms!
2017-01-04 20:24:27 -08:00
d417da7d3a
Private visibility on statuses prevents non-followers from seeing those
...
Filters out hidden stream entries from Atom feed
Blocks now generate hidden stream entries, can be used to federate blocks
Private statuses cannot be reblogged (generates generic 422 error for now)
POST /api/v1/statuses now takes visibility=(public|unlisted|private) param instead of unlisted boolean
Statuses JSON now contains visibility=(public|unlisted|private) field
2016-12-21 20:04:13 +01:00
4b858ebcf6
Improve icons
2016-12-21 00:44:42 +01:00
ecfd51aaef
Improved launcher icon on Android
2016-12-21 00:28:57 +01:00
a98bd6199f
Fix responsiveness of 500 page
2016-12-15 00:49:17 +01:00
595f592304
Do not autoplay videos, display play button instead. Use expiring links when using S3. Do not keep originals
...
for avatars/headers, resize avatars down to 120x120 instead of 300x300. Set cache headers on S3 stuff, also
make it private (aka only accessible via expiring links to prevent hotlinking)
2016-12-04 12:28:10 +01:00
0f7a388de6
Fix #110 - Make web UI use browser history, change links in e-mails to link to that
2016-11-13 14:02:34 +01:00
46191e7071
Adding Emoji One
2016-11-08 21:46:29 +01:00
b2c6fe9575
Fix 50x page image for non-/ paths
2016-11-08 02:18:09 +01:00
eb6ad973d1
Adding optional S3, fail-mastodon
2016-11-06 18:35:46 +01:00
5b1e01f000
Fix web app manifests
2016-11-04 14:19:58 +01:00
739e8d6605
Add touch icons for Chrome, iOS and Windows 10
2016-11-02 16:05:08 +01:00
6c44d9e7f5
a11y: Add HTML lang attribute and utf8 encoding meta tag
...
See: https://dequeuniversity.com/rules/axe/2.1/html-has-lang
2016-11-02 11:01:18 +01:00
a41c3487bd
Fix #56 - Add default avatar
2016-09-29 21:54:20 +02:00
7e14eefc81
Replace logo, fix #57 - delete/unreblog/unfavourite API, fix #45 - app
...
registration API
2016-09-26 23:56:53 +02:00
15476d505d
Adding favicon
2016-03-18 12:36:57 +01:00
9c4856bdb1
Initial commit
2016-02-20 22:53:20 +01:00
Thibaut Girka