Commit Graph

3370 Commits (8a863d75875537b749b730ed7ef87ee3e529a90d)
 

Author SHA1 Message Date
Alex Gleason 8a863d7587 Merge branch 'mastodon-status-ap-id-redirect' into 'develop'
3 years ago
Alex Gleason 73208ebe4b
Mastodon: redirect ActivityPub ID for statuses
3 years ago
Alex Gleason f03d8861b6 Merge branch 'login-skip-app-token' into 'develop'
3 years ago
Alex Gleason aaad79f6a5
Auth: logIn, don't create an unnecessary app token
3 years ago
Alex Gleason 2982bd1bc1 Merge branch 'ptr-loading-css' into 'develop'
3 years ago
Alex Gleason 4357b6322a
PullToRefresh: don't transform the loading indicator
3 years ago
Alex Gleason 0374b058fa Merge branch 'revert-loading-indicator' into 'develop'
3 years ago
Alex Gleason 0b0e7188e3
PullToRefresh: switch back to the old loading indicator for now
3 years ago
Alex Gleason 94f3133dd4 Merge branch 'ptr-improvements' into 'develop'
3 years ago
Alex Gleason d6bc8d8b6c
PullToRefresh: use iOS style spinner
3 years ago
Alex Gleason c57d50aa4e
PullToRefresh: increase pull resistance and threshold
3 years ago
Alex Gleason 3f11071fba Merge branch 'profile-share' into 'develop'
3 years ago
Alex Gleason ed2866a1e1
Profile: add "Share" button as primary action to own profile
3 years ago
Alex Gleason 0796dc359c Merge branch 'gitignore-ds-store' into 'develop'
3 years ago
Alex Gleason e6cb31b4f7
gitignore .DS_Store and .idea
3 years ago
Alex Gleason 802b9dc7e0 Merge branch 'gitignore-surge' into 'develop'
3 years ago
Alex Gleason 1d2ba33e94
gitignore configuration files from surge.sh
3 years ago
Alex Gleason 3622300487 Merge branch 'suggestions-conditional-admin' into 'develop'
3 years ago
Alex Gleason 4c11a3041f
v2 Suggestions: conditionally display admin actions
3 years ago
Alex Gleason 1e0f76558a Merge branch 'suggestions' into 'develop'
3 years ago
Alex Gleason 92439137c1
v2 Suggestions: add AdminAPI, rearrange sidebars, check instance feature flag
3 years ago
Alex Gleason e3566db690 Merge branch 'manifest' into 'develop'
3 years ago
Alex Gleason bd9c8a8770
Link to manifest.json
3 years ago
Alex Gleason 665d7a1e1f Merge branch 'eslint-rules' into 'develop'
3 years ago
marcin mikołajczak 4e04f06142 eslint: add key-spacing and space-unary-ops rules
3 years ago
Alex Gleason b2845cc686 Merge branch 'stackoverflow' into 'develop'
3 years ago
Alex Gleason b528c4aa63
Contexts: check for cyclical in_reply_tos and prevent stitching them with tombstones
3 years ago
Alex Gleason b76bb097f2
Status: protect against infinite context loops
3 years ago
Alex Gleason b9febfc1a3 Merge branch 'revert-stacked-avatars' into 'develop'
3 years ago
Alex Gleason 679617c877
Revert "MaterialStatus: stack avatars on top"
3 years ago
Alex Gleason cb4a394f09
Revert "MaterialStatus: improve padding for stacked avatar"
3 years ago
Alex Gleason d50e0e7d6f Merge branch 'stacked-avatar-updates' into 'develop'
3 years ago
Alex Gleason 33fa8d0204
MaterialStatus: improve padding for stacked avatar
3 years ago
Alex Gleason 6e030591d8 Merge branch 'stacked-avatars' into 'develop'
3 years ago
Alex Gleason a9a84f6701
MaterialStatus: stack avatars on top
3 years ago
Alex Gleason dbf72550dc Merge branch 'fix-chat-autosuggest-input' into 'develop'
3 years ago
Alex Gleason 09f941a79c Merge branch 'chats-attachments-icon' into 'develop'
3 years ago
Alex Gleason 1ef843d425
Chats: fix styling of autosuggest account in main pane
3 years ago
marcin mikołajczak f4dc4181ad Add icons for chat previews with attachments
3 years ago
Alex Gleason cde08c8556 Merge branch 'update-zh_CN-translation' into 'develop'
3 years ago
Alex Gleason 53826765df Merge branch 'fix-poll-hint-message' into 'develop'
3 years ago
user 47304e0478 fix hint messages when creating new poll
3 years ago
Shevek acf1ee71b5 update zh-CN
3 years ago
Alex Gleason 4c331387df Merge branch 'push-notifications-fix' into 'develop'
3 years ago
Alex Gleason 0e6fac9286
Web Push fixes
3 years ago
Alex Gleason b63993e286 Merge branch 'status-card-link' into 'develop'
3 years ago
Alex Gleason f64cf63108
PlaceholderCard: add .status-card--link so it's responsive
3 years ago
Alex Gleason d4ded71d3a Merge branch 'revert-511f1de4' into 'develop'
3 years ago
Alex Gleason 28d6c93b39 Revert "Merge branch 'react-17-deprecated' into 'develop'"
3 years ago
Alex Gleason 02898b6bd6 Merge branch 'bundle-crash' into 'develop'
3 years ago