Jenkins
359ba16721
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko
efc97d404c
Add logging of admin actions ( #5757 )
...
* Add logging of admin actions
* Update brakeman whitelist
* Log creates, updates and destroys with history of changes
* i18n: Update Polish translation (#5782 )
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* Split admin navigation into moderation and administration
* Redesign audit log page
* 🇵🇱 (#5795 )
* Add color coding to audit log
* Change dismiss->resolve, log all outcomes of report as resolve
* Update terminology (e-mail blacklist) (#5796 )
* Update terminology (e-mail blacklist)
imho looks better
* Update en.yml
* Fix code style issues
* i18n-tasks normalize
7 years ago
kibigo!
3860750d5d
Styling fixes
7 years ago
kibigo!
ea77b60648
Update statuses on hidden toggle ( Fixes #227 )
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
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
Jenkins
1c33bd3d3a
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
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
1dc24ece41
Merge remote-tracking branch 'tootsuite/master'
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!
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
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
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
beatrix
57e301c5be
Merge pull request #221 from glitch-soc/local-only-policy
...
Update StatusPolicy to check current_account for local_only? toots.
7 years ago
Jenkins
065e2388ba
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip
87c1f91505
Merge pull request #218 from glitch-soc/themed-prefetching
...
Themed preloading
7 years ago
Lynx Kotoura
731c859097
Increase contrast of Admin badges ( #5740 )
...
To comply WCAG 2.0 guidelines on contrast ratio.
7 years ago
Clworld
6547ebee48
Fix regression #5467 : fixes emoji copy ( #5739 )
7 years ago
David Yip
bcdd0f8b9d
Update StatusPolicy to check current_account for local_only? toots.
...
StatusPolicy#account was renamed to StatusPolicy#current_account in
upstream. This commit renames the local-only changes to match and
augments the #show? policy spec with what we expect for local-only
toots.
7 years ago
unarist
5982d570de
Move "Permissions" row into main table in /admin/accounts/:id ( #5734 )
7 years ago
David Yip
ff4e474bcd
Add trailing comma in mapStateToProps
...
Consistency, eslint, etc.
7 years ago
David Yip
c687853d80
Merge pull request #219 from glitch-soc/no-spin
...
Remove 'spin' theme
7 years ago
David Yip
801ecbfa5a
Throw layout, isWide, navbarUnder back into mapStateToProps.
...
This gets wide view, auto layout, and navbar-under-mobile working again.
7 years ago
kibigo!
bbef750b04
Removes spin theme
7 years ago
kibigo!
5845057adb
Themed prefetching
7 years ago
David Yip
5f689cdf78
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ysksn
08cb63c360
Remove empty strings ( #5732 )
7 years ago
Eugen Rochko
3df46ce5a8
Fix some rubocop style issues ( #5730 )
7 years ago
Eugen Rochko
21d01d5809
Display moderator badge (green), admin badge changed to red ( #5728 )
7 years ago
Renato "Lond" Cerqueira
f366a83c6c
Improve language filter ( #5724 )
...
* Scrub text of html before detecting language.
* Detect language on statuses coming from activitypub.
* Fix rubocop comments.
* Remove custom emoji from text before language detection
7 years ago
ysksn
bf1d4a2cb9
Fix AccountFinderConcern::AccountFinder#with_usernames ( #5722 )
7 years ago