41c71565c2
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
bc4a726c24
i18n: (zh-CN) Add translations for #5746 & #5735 ( #5764 )
7 years ago
2585649b20
Styling fixes
7 years ago
12c0011fee
Update statuses on hidden toggle ( Fixes #227 )
7 years ago
8812bab687
Minor fixes
7 years ago
2a5af9c10c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
3c83b7e06e
i18n: Update Polish translation - front-end added ( #231 )
...
* i18n: Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* i18n: Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
fc2155019b
Add Japanese translations. ( #5769 )
7 years ago
b7a7eb84dd
update code of conduct email address
7 years ago
1a07b83c69
i18n: Update Polish translation - back-end ( #230 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
53b7b81b43
Update and fix Catalan translation ( #5773 )
...
* Update activerecord.ca.yml
* Update ca.yml
* Update devise.ca.yml
* Update doorkeeper.ca.yml
* Update simple_form.ca.yml
* fix syntax error for ca translation
* fix syntax errors in ca translations
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
bdbbd06dad
Finalized theme loading and stuff
7 years ago
8f3e5f6128
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
6f609dc4b4
Add tests for Remotable ( #5768 )
7 years ago
3dce6cbbd7
Fixed duplicating URL of photo type of oEmbed ( #5763 )
7 years ago
a36a2c1796
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
2bcc81700c
Fix NoMethodError at ActivityPub::FetchRemoteStatusService ( #5753 )
7 years ago
53e95c4efc
Fix N+1 at notification ( #5752 )
7 years ago
e45cb0837b
Update .following_map examples with show-reblogs information.
7 years ago
d083f7741a
Merge remote-tracking branch 'tootsuite/master'
7 years ago
08deec4c84
i18n: Update ja translation for moderator badge. ( #5731 )
...
* Update Japanese translation for moderator badge.
* Follows English notation
7 years ago
2590aac863
Add tests for AccountInteractions ( #5751 )
...
* Add tests for class methods of AccountInteractions
* Add tests for instance methods of AccountInteractions
7 years ago
3d1d3d9a20
Remove translations of default theme ( #5741 )
7 years ago
8f638a2bf2
Add a test for Settings::Extend#settings ( #5720 )
7 years ago
9d9b1aff1e
Add tests for Status#title ( #5718 )
7 years ago
bfdcf76a64
Add “staff” badge to admin user pages ( #5735 )
...
* Allow staff badge to change from setting to hidden
* i18n: Update Polish translation
7 years ago
bcda3f85ce
Merge pull request #226 from glitch-soc/glitch-theme
...
Glitch/Vanilla themes
7 years ago
321fa41930
Merge remote-tracking branch 'cybre/theme_win95' into glitch-theme
7 years ago
a9ed857171
WIP static themeing
7 years ago
b380e9d2cb
i18n: Update Polish translation ( #5749 )
7 years ago
92cc79be72
Enabled vanilla thmee
7 years ago
08a01dd037
Public pack fix
7 years ago
672ace5a20
Media styling
7 years ago
f51f7b0e06
Font styles are now packagified
7 years ago
58cede4808
Profile redirect notes ( #5746 )
...
* Serialize moved accounts into REST and ActivityPub APIs
* Parse federated moved accounts from ActivityPub
* Add note about moved accounts to public profiles
* Add moved account message to web UI
* Fix code style issues
7 years ago
dec960c828
Merge pull request #208 from yipdw/keyword-mute
...
Run keyword mutes on hashtags
7 years ago
eed50514be
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
6be72a3ec6
Updating Chinese (Simplified) translations ( #5725 )
...
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Change `静音` to `隐藏`
* i18n: (zh-CN) Add translations for #5087 & #5669
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Improve translations
* i18n: (zh-CN) Add missing translation for #5728
7 years ago
2864e5e077
Make it possible to bind streming service to 0.0.0.0 ( #5744 )
7 years ago
a618df7998
Sets default theme to glitch
7 years ago
fc2c8b50dd
Removed glitch tests
7 years ago
e19fc6a9f8
Restore vanilla components
7 years ago
45c44989c8
Forking glitch theme
7 years ago
5a9982b425
Merge pull request #223 from glitch-soc/glitchsoc/feature/configurable-status-size
...
Make character limit configurable (from tootsuite/mastodon#5697 )
7 years ago
284e2cde81
Merge pull request #224 from yipdw/merge-upstream
...
Merge upstream (tootsuite/mastodon#5703 )
7 years ago
130aa90d55
Update annotations on Follow, FollowRequest, and Mute.
...
Follow and FollowRequest had conflicts in their schema annotations, so I
ran latest migrations and let annotate_models fix them up.
7 years ago
1ab12ba38e
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
24cafd73a2
Lists ( #5703 )
...
* Add structure for lists
* Add list timeline streaming API
* Add list APIs, bind list-account relation to follow relation
* Add API for adding/removing accounts from lists
* Add pagination to lists API
* Add pagination to list accounts API
* Adjust scopes for new APIs
- Creating and modifying lists merely requires "write" scope
- Fetching information about lists merely requires "read" scope
* Add test for wrong user context on list timeline
* Clean up tests
7 years ago
6f8ccbfcdf
Merge pull request #222 from yipdw/merge/tootsuite/master
...
Merge upstream (e28b33c.. 94c5a11
7 years ago
dc16d73bf5
Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size
7 years ago
Jenkins