Jenkins
96302f7fd4
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC
97bb620b48
i18n: (zh-CN) Add translations for #5746 & #5735 ( #5764 )
7 years ago
kibigo!
3860750d5d
Styling fixes
7 years ago
kibigo!
ea77b60648
Update statuses on hidden toggle ( Fixes #227 )
7 years ago
kibigo!
eadf1c38a5
Minor fixes
7 years ago
Jenkins
a2e4d79b1c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Marcin Mikołajczak
c75bc101ba
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
mayaeh
9841d20c97
Add Japanese translations. ( #5769 )
7 years ago
beatrix
dbafce8535
update code of conduct email address
7 years ago
Marcin Mikołajczak
00be86c25d
i18n: Update Polish translation - back-end ( #230 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
Joan Montané
daec402a58
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
kibigo!
8aeda4f064
Finalized theme loading and stuff
7 years ago
Jenkins
1c33bd3d3a
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ysksn
4086db0929
Add tests for Remotable ( #5768 )
7 years ago
abcang
4e409e629d
Fixed duplicating URL of photo type of oEmbed ( #5763 )
7 years ago
Jenkins
9c9b105d43
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang
ef14321fff
Fix NoMethodError at ActivityPub::FetchRemoteStatusService ( #5753 )
7 years ago
abcang
defb2fd0b0
Fix N+1 at notification ( #5752 )
7 years ago
David Yip
cd2d8dc4a4
Update .following_map examples with show-reblogs information.
7 years ago
David Yip
1dc24ece41
Merge remote-tracking branch 'tootsuite/master'
7 years ago
mayaeh
52111769d0
i18n: Update ja translation for moderator badge. ( #5731 )
...
* Update Japanese translation for moderator badge.
* Follows English notation
7 years ago
ysksn
42cb1425c6
Add tests for AccountInteractions ( #5751 )
...
* Add tests for class methods of AccountInteractions
* Add tests for instance methods of AccountInteractions
7 years ago
Lynx Kotoura
8a8bea2e53
Remove translations of default theme ( #5741 )
7 years ago
ysksn
a7d85563bd
Add a test for Settings::Extend#settings ( #5720 )
7 years ago
ysksn
c09c37af98
Add tests for Status#title ( #5718 )
7 years ago
Yamagishi Kazutoshi
bffc1b880b
Add “staff” badge to admin user pages ( #5735 )
...
* Allow staff badge to change from setting to hidden
* i18n: Update Polish translation
7 years ago
beatrix
34ba45e47c
Merge pull request #226 from glitch-soc/glitch-theme
...
Glitch/Vanilla themes
7 years ago
kibigo!
2b05c3aaa1
Merge remote-tracking branch 'cybre/theme_win95' into glitch-theme
7 years ago
kibigo!
e56a32a46b
WIP static themeing
7 years ago
Marcin Mikołajczak
1f5f446f08
i18n: Update Polish translation ( #5749 )
7 years ago
kibigo!
25361848e3
Enabled vanilla thmee
7 years ago
kibigo!
f0aedba604
Public pack fix
7 years ago
kibigo!
a8c0c7a2c1
Media styling
7 years ago
kibigo!
0c90d1ab38
Font styles are now packagified
7 years ago
Eugen Rochko
b89f614bd7
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
beatrix
27ca589183
Merge pull request #208 from yipdw/keyword-mute
...
Run keyword mutes on hashtags
7 years ago
Jenkins
cea7dec340
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC
e618b6c136
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
Baptiste Gelez
51b2f7d79e
Make it possible to bind streming service to 0.0.0.0 ( #5744 )
7 years ago
kibigo!
b8fdcfd55e
Sets default theme to glitch
7 years ago
kibigo!
5466150ea4
Removed glitch tests
7 years ago
kibigo!
7c5614c667
Restore vanilla components
7 years ago
kibigo!
68304a6ce5
Forking glitch theme
7 years ago
beatrix
61585f2c42
Merge pull request #223 from glitch-soc/glitchsoc/feature/configurable-status-size
...
Make character limit configurable (from tootsuite/mastodon#5697 )
7 years ago
David Yip
7db0145d21
Merge pull request #224 from yipdw/merge-upstream
...
Merge upstream (tootsuite/mastodon#5703 )
7 years ago
David Yip
08751360a0
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
David Yip
f1279d8ff3
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko
e149067561
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
David Yip
ce27681a76
Merge pull request #222 from yipdw/merge/tootsuite/master
...
Merge upstream (5982d57.. 065e238
)
7 years ago
David Yip
e5a2158e2a
Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size
7 years ago