a96375d2ef
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
8349105f03
Updated Twemoji to 12.1.3 ( #12342 )
5 years ago
c060523dc2
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
41b188dce6
Add OCR tool to media editing modal ( #11566 )
5 years ago
73bc58c656
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
6 years ago
11ca5888f0
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
66758328ba
Change error graphic to hover-to-play ( #10055 )
...
Fix #6060
6 years ago
c8086b6efb
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
b5e767c04b
Change robots.txt to exclude only media proxy URLs ( #10038 )
...
* Revert "Change robots.txt to exclude some URLs (#10037 )"
This reverts commit 0e8ebc2371
6 years ago
0e8ebc2371
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
2059bbd0ed
Replace animated oops.gif by a non-animated image
...
Fixes #6060
6 years ago
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.
6 years ago
250eb6a6c9
update twemojie to v2 ( #7911 )
6 years ago
e5134142bc
Crush PNGs to reduce overall size ( #7954 )
6 years ago
695674b2fa
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
2e4a1d3109
Rename emoji sheet to avoid caching issue ( #7777 )
7 years ago
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
7 years ago
e4e0aa5d21
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
dca7183dfb
Optimize public/headers/missing.png ( #7084 )
7 years ago
5c8ae1c7f8
Fix error 500 page
7 years ago
9ca0336c15
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
README.md
7 years ago
7d455651d3
add new avatar placeholder missing.png ( #6728 )
7 years ago
02ae609d9a
Merge tootsuite/master at ab48f2b239
7 years ago
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.
7 years ago
7d0cf5a6a1
Merge tag 'v2.0.0rc2' into gs-master
7 years ago
d931706bcd
Change Android icon padding again to half of previous ( #5339 )
7 years ago
132a22ace5
Merge remote-tracking branch 'upstream/master'
7 years ago
02827345ae
Merge upstream 2.0ish #165
7 years ago
cb78a30a77
Add padding to Android icon, change Apple and MS icons ( #5321 )
7 years ago
0cbee44d94
Fix wrong dimensions on Android icon ( #5296 )
7 years ago
658635d113
Material app icon for Chrome ( #5291 )
7 years ago
522fa878c3
Fix #5274 - Create symlink from public/500.html to public/assets/500.html ( #5288 )
7 years ago
0cc795db6b
Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream
7 years ago
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
7 years ago
6b0ea1e79c
Generate 500.html with assets:precompile, remove loading from Google Fonts ( #5067 )
7 years ago
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
7 years ago
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
7 years ago
2303725f7d
Add script to make embedded iframes autosize ( #4853 )
7 years ago
2cdee6ae8a
Merge upstream ( #111 )
7 years ago
2e32794a12
Use consistent icons for web push notifications, same as web UI ( #4426 )
7 years ago
c6344547a3
fix #4356 : place sw.js to assets/sw.js ( #4357 )
7 years ago
7072288bcf
Merge git://github.com/tootsuite/mastodon into tootsuite-master
7 years ago
e874a4562e
Use the "m" version of the logo for favicons ( #4345 )
7 years ago
78c7c9fb0f
New logo ( #4306 )
...
* Add new logo
* Remove unused images
7 years ago
f48f42598f
Merge upstream ( #81 )
7 years ago
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
7 years ago
a7a7613e71
cybre cleanup
7 years ago
bf32615615
cybrespace to 1.4.2
7 years ago
2edadd7fe7
All cybrespace changes through 5/28
7 years ago
143ab47410
Fix #3063 - Add dynamic app manifest ( #3563 )
...
* Fix #3063 - Add dynamic app manifest
* Added short_name
* Add background_color
8 years ago
Thibaut Girka
koyu
Eugen Rochko
nightpool
Dryusdan
Maciek Baron
Jenkins
Renato "Lond" Cerqueira
Una
David Yip
Konrad Pozniak
Surinna Curtis
Ondřej Hruška
kibigo!
Satoshi KOJIMA
Sorin Davidoi
Charlotte Fields
Chronister