Commit Graph

1992 Commits (b2fde53adc4547e2a393139d00fec027fc602918)
 

Author SHA1 Message Date
Alex Gleason 811ccdce20 Merge branch 'develop' into 'develop'
4 years ago
ruine 954145763c Update ja.json
4 years ago
Alex Gleason 7f9b783510 Merge branch 'stream-following-relationships' into 'develop'
4 years ago
Alex Gleason 6c18050636
Fix jumpy follow relationship in Pleroma
4 years ago
Alex Gleason 36f6f12856
Stream following relationships
4 years ago
Alex Gleason e1d77a7012 Merge branch 'public-timelines' into 'develop'
4 years ago
Alex Gleason 5d418d9269
Let public timelines be viewed
4 years ago
Alex Gleason da7e6cc17e Merge branch 'remote_follow' into 'develop'
4 years ago
Alex Gleason d0600aef02
Refactor Follow button and remote follow
4 years ago
Alex Gleason a5ed1998d7
Merge remote-tracking branch 'origin/develop' into remote_follow
4 years ago
Alex Gleason 100fbba536 Merge branch '1337god-develop-patch-07579' into 'develop'
4 years ago
Bane 6c3585f45a Update pt.json
4 years ago
Alex Gleason 76af310ab6 Merge branch 'mkljczk-develop-patch-87473' into 'develop'
4 years ago
marcin mikołajczak 5ba4453950 Polish translation: Fix typo
4 years ago
Alex Gleason f8609378f6 Merge branch 'mkljczk-develop-patch-95952' into 'develop'
4 years ago
marcin mikołajczak 2e30f1cefc Update Polish translation
4 years ago
Alex Gleason 77315ef9c5 Merge branch 'develop' into 'develop'
4 years ago
matrix07012 e4b47ee2f7 Updated Czech translation
4 years ago
Alex Gleason f3bcc375a4 Merge branch 'fix_rm_typo' into 'develop'
4 years ago
Alex Gleason bdccacea36 Merge branch 'feature/emoji-react-notifications' into 'develop'
4 years ago
The Stranjer aa2386f92a Use correct index.html location in README.md
4 years ago
Sean King ac3dbaab94
Add ability to opt-out or opt-in to emoji react notifications
4 years ago
Alex Gleason e84a2bd2d2 Merge branch 'drakz-develop-patch-17333' into 'develop'
4 years ago
João Rodrigues 9fe3512a2f Update app/soapbox/locales/pt.json
4 years ago
Alex Gleason 5715479747 Merge branch 'feature/admin-posts-sensitive' into 'develop'
4 years ago
Sean King 89785fa84c
Change to new convention for acct
4 years ago
Sean King 9309ef4893
Fix merge conflicts
4 years ago
Sean King 39b50e8fe1
Add moderator button for marking posts sensitive or not sensitive
4 years ago
Alex Gleason d5660c50ee Merge branch 'user-panel-overflow' into 'develop'
4 years ago
Alex Gleason 7f9508f117
Fix sharp corners on user panel
4 years ago
Alex Gleason 2c49bdb577 Merge branch 'admin-short-names' into 'develop'
4 years ago
Alex Gleason 498471958b
Use short names for admin quick actions
4 years ago
Alex Gleason 0671712f2f Merge branch 'drakz-develop-patch-97045' into 'develop'
4 years ago
João Rodrigues 9539654d7f Update app/soapbox/locales/pt.json
4 years ago
Alex Gleason 5b5397312b Merge branch 'admin-improvements' into 'develop'
4 years ago
Alex Gleason c80797ccf8
Admin: delete status directly from menu
4 years ago
Alex Gleason 361cdc662f
Reports: overflow fix for status content
4 years ago
Alex Gleason 926335b268
Add "deactivate" and "delete" user modals to every status and account profile
4 years ago
Alex Gleason bdf0d3618d
Refactor mod report modals
4 years ago
Alex Gleason af92caa6e2
Import users from reports
4 years ago
Alex Gleason acdb884d70 Merge branch 'drakz-develop-patch-16517' into 'develop'
4 years ago
Alex Gleason d97f9d7472 Merge branch 'rgi-reacts' into 'develop'
4 years ago
João Rodrigues d396a0fb20 Update app/soapbox/locales/pt.json
4 years ago
Alex Gleason 4044b4b14f
Reports: fix overflow on mobile and link color
4 years ago
Alex Gleason 47ed1e42c9
Run rootReducer in tests
4 years ago
Alex Gleason f8fa7007e7 Merge branch 'normalize-pleroma-user-fields' into 'develop'
4 years ago
João Rodrigues ea680903fe Update app/soapbox/locales/pt.json
4 years ago
Alex Gleason f24e1c9929
Normalize Pleroma user fields, fixes #549
4 years ago
Alex Gleason 43854c0dc1 Merge branch 'refactor/bot-badge' into 'develop'
4 years ago
Alex Gleason fb99d36494
Support RGI emoji reacts conditionally
4 years ago