77 Commits (b0a7cb71becafa95121c1e8c608e17163bf4508d)

Author	SHA1	Message	Date
Thibaut Girka	ff67385cfb	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code	5 years ago
koyu	823dcc4dc6	Updated Twemoji to 12.1.3 (#12342)	5 years ago
Thibaut Girka	1488be7d96	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json	5 years ago
Eugen Rochko	28636f43e4	Add OCR tool to media editing modal (#11566)	5 years ago
Thibaut Girka	33c80e0783	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb	6 years ago
ThibG	c4f2433300	Disallow robots from indexing /interact/ (#10666) ... This does not provide any new information and may just triple the number of crawled pages	6 years ago
Eugen Rochko	80388a3ffe	Change error graphic to hover-to-play (#10055) ... Fix #6060	6 years ago
Thibaut Girka	06cc04fd23	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
nightpool	a5992e5883	Change robots.txt to exclude only media proxy URLs (#10038) ... * Revert "Change robots.txt to exclude some URLs (#10037)" This reverts commit 80161f4351. * Let's block media_proxy /media_proxy/ is a dynamic route used for requesting uncached media, so it's probably bad to let crawlers use it * misleading comment	6 years ago
Eugen Rochko	80161f4351	Change robots.txt to exclude some URLs (#10037) ... - Exclude static assets - Exclude uploaded files - Exclude alternate versions of the profile page - Exclude media proxy URLs	6 years ago
Thibaut Girka	0c2d48b60a	Replace animated oops.gif by a non-animated image ... Fixes #6060	6 years ago
Thibaut Girka	d392020da6	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.	6 years ago
Dryusdan	17b928502a	update twemojie to v2 (#7911)	6 years ago
Maciek Baron	ca2cc556f1	Crush PNGs to reduce overall size (#7954)	6 years ago
Jenkins	4d8d1fa129	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Renato "Lond" Cerqueira	268d90e810	Rename emoji sheet to avoid caching issue (#7777)	7 years ago
Renato "Lond" Cerqueira	0c3ce41031	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	7 years ago
Jenkins	33c2bbdda7	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Una	e057c0e525	Optimize public/headers/missing.png (#7084)	7 years ago
Thibaut Girka	cf754e6a91	Fix error 500 page	7 years ago
David Yip	f8e934f955	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md	7 years ago
Konrad Pozniak	cd252b794e	add new avatar placeholder missing.png (#6728)	7 years ago
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at 3023725936	7 years ago
David Yip	37b267e2ab	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.	7 years ago
David Yip	13e05fece2	Merge tag 'v2.0.0rc2' into gs-master	7 years ago
Eugen Rochko	8e9911962d	Change Android icon padding again to half of previous (#5339)	7 years ago
Ondřej Hruška	0bf9261e65	Merge remote-tracking branch 'upstream/master'	7 years ago
kibigo!	8d6b9ba494	Merge upstream 2.0ish #165	7 years ago
Eugen Rochko	b17e571bc2	Add padding to Android icon, change Apple and MS icons (#5321)	7 years ago
Eugen Rochko	96c942e8ab	Fix wrong dimensions on Android icon (#5296)	7 years ago
Eugen Rochko	aafe55af81	Material app icon for Chrome (#5291)	7 years ago
Eugen Rochko	92e7815d1d	Fix #5274 - Create symlink from public/500.html to public/assets/500.html (#5288)	7 years ago
Ondřej Hruška	83bda6c1a8	Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream	7 years ago
Eugen Rochko	3b60832214	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	7 years ago
Eugen Rochko	2c8e3fbbfb	Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067)	7 years ago
Eugen Rochko	846cd4e838	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	7 years ago
David Yip	67ad453373	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	7 years ago
Eugen Rochko	6867681c7c	Add script to make embedded iframes autosize (#4853)	7 years ago
kibigo!	8150689b48	Merge upstream (#111)	7 years ago
Eugen Rochko	13bb1ddc7f	Use consistent icons for web push notifications, same as web UI (#4426)	7 years ago
Satoshi KOJIMA	e54cc15cbd	fix #4356 : place sw.js to assets/sw.js (#4357)	7 years ago
Ondřej Hruška	7e5691804d	Merge git://github.com/tootsuite/mastodon into tootsuite-master	7 years ago
Eugen Rochko	88b5e0b703	Use the "m" version of the logo for favicons (#4345)	7 years ago
Eugen Rochko	0e0f18ce7c	New logo (#4306) ... * Add new logo * Remove unused images	7 years ago
kibigo!	09cfc079b0	Merge upstream (#81)	7 years ago
Sorin Davidoi	0c7c188c45	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	7 years ago
Charlotte Fields	b27842dc70	cybre cleanup	8 years ago
Chronister	39b6b37b74	cybrespace to 1.4.2	8 years ago
Chronister	65528fc54e	All cybrespace changes through 5/28	8 years ago
Eugen Rochko	722d152082	Fix #3063 - Add dynamic app manifest (#3563) ... * Fix #3063 - Add dynamic app manifest * Added short_name * Add background_color	8 years ago