me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
5036 commits 2 branches 0 tags 429 MiB
Commit graph

3420 commits

Author SHA1 Message Date
David Yip
c9dd67a733 Merge remote-tracking branch 'origin/master' into gs-master 2017-11-27 11:29:04 -06:00
Yamagishi Kazutoshi
d5e4cb2ca1 Use account.username when display_name is empty (#5828) 2017-11-27 16:09:52 +01:00
Eugen Rochko
bc8c951083 Add consumable invites (#5814) 
* Add consumable invites

* Add UI for generating invite codes

* Add tests

* Display max uses and expiration in invites table, delete invite

* Remove unused column and redundant validator

- Default follows not used, probably bad idea
- InviteCodeValidator is redundant because RegistrationsController
  checks invite code validity

* Add admin setting to disable invites

* Add admin UI for invites, configurable role for invite creation

- Admin UI that lists everyone's invites, always available
- Admin setting min_invite_role to control who can invite people
- Non-admin invite UI only visible if users are allowed to

* Do not remove invites from database, expire them instantly
 2017-11-27 16:07:59 +01:00
Jenkins
f504ac4ff6 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-11-27 05:17:11 +00:00
Alda Marteau-Hardi
191993c811 Use account.display_name for og:title single toot pages (#5821) 2017-11-27 05:31:26 +01:00
Akihiko Odaki
ce0d30feb7 Do not filter the status collection after muting and blocking (#5815) 
Filtering the status collection wipes out even the profiles of muted and
blocked accounts. However, the behavior is inconsistent with the server-
side behavior.
 2017-11-26 01:45:17 +01:00
SerCom_KC
7cdf02f2d4 i18n: (zh-CN) Add translations for #5746 & #5750 (#5816) 2017-11-26 02:38:40 +09:00
Akihiko Odaki
16a49799cf Allow to open a modal for embedded photo (#5777) 2017-11-25 15:41:45 +01:00
Akihiko Odaki
7df80c9e83 Rename ariaLabel property of Dropdown to title (#5813) 
DropdownMenu has ariaLabel property, but it is actually applied to title
property of IconButton. Keep it consistent.
 2017-11-25 15:41:08 +01:00
spla
eddbf2e485 Updated Catalan strings (#5801) 
* Updated Catalan strings

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* bundle exec i18n-tasks

* Update ca.json

* Update simple_form.ca.yml
 2017-11-25 23:22:59 +09:00
Jenkins
7fcbe5faee Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-11-25 05:17:15 +00:00
Yamagishi Kazutoshi
8fde0aed51 Add Japanese translations (#5810) 
* yarn manage:translations

* Add Japanese translation for #5087

* Add Japanese translation for #5616

* Add Japanese translation for #5746

* Add Japanese translation for #5750
 2017-11-25 03:39:57 +01:00
William Pitcock
a4bb95d8b3 status: preserve visibility attribute when reblogging (infoleak fix) (#5789) 
this should fix *all* remaining visibility-related mastodon ostatus infoleaks.
thanks to @csaurus@gnusocial.de for pointing out the infoleak.
 2017-11-25 01:36:08 +01:00
Eugen Rochko
bf8eab12ba Display list column (#5750) 2017-11-25 00:35:37 +01:00
abcang
3db3ca1258 Fix unnecessary order (#5807) 2017-11-24 18:41:07 +01:00
sdukhovni
019c39bf1d Don't remove originals of boosted toots from timeline (#5479) 
* Don't remove originals of boosted toots from timeline

* Remove unused argument to updateTimeline
 2017-11-24 14:43:53 +01:00
Akihiko Odaki
0319b92979 Do not require onClose property in NavigationBar (#5802) 
NavigationBar can be used as mock as it is in OnboardingModal. In such a
case, onClose property is not required.
 2017-11-24 13:13:17 +01:00
Jenkins
359ba16721 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-11-24 01:17:20 +00:00
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
 2017-11-24 02:05:53 +01:00
kibigo!
3860750d5d Styling fixes 2017-11-21 19:00:07 -08:00
kibigo!
ea77b60648 Update statuses on hidden toggle (Fixes #227) 2017-11-21 18:27:34 -08:00
Jenkins
a2e4d79b1c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-11-21 17:17:11 +00:00
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>
 2017-11-21 17:53:13 +01:00
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>
 2017-11-21 23:17:28 +09:00
Jenkins
1c33bd3d3a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-11-21 05:17:12 +00:00
abcang
4e409e629d Fixed duplicating URL of photo type of oEmbed (#5763) 2017-11-20 20:45:54 +01:00
Jenkins
9c9b105d43 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-11-19 15:17:12 +00:00
abcang
ef14321fff Fix NoMethodError at ActivityPub::FetchRemoteStatusService (#5753) 2017-11-19 15:33:15 +01:00
abcang
defb2fd0b0 Fix N+1 at notification (#5752) 2017-11-19 15:32:48 +01:00
David Yip
1dc24ece41 Merge remote-tracking branch 'tootsuite/master' 2017-11-19 01:30:29 -06:00
Yamagishi Kazutoshi
bffc1b880b Add “staff” badge to admin user pages (#5735) 
* Allow staff badge to change from setting to hidden

* i18n: Update Polish translation
 2017-11-19 04:13:57 +01:00
beatrix
34ba45e47c Merge pull request #226 from glitch-soc/glitch-theme 
Glitch/Vanilla themes
 2017-11-18 20:32:17 -05:00
kibigo!
25361848e3 Enabled vanilla thmee 2017-11-18 11:06:04 -08:00
kibigo!
f0aedba604 Public pack fix 2017-11-18 11:05:39 -08:00
kibigo!
a8c0c7a2c1 Media styling 2017-11-18 11:05:23 -08:00
kibigo!
0c90d1ab38 Font styles are now packagified 2017-11-18 11:05:00 -08:00
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
 2017-11-18 19:39:02 +01:00
beatrix
27ca589183 Merge pull request #208 from yipdw/keyword-mute 
Run keyword mutes on hashtags
 2017-11-18 12:06:40 -05:00
Jenkins
cea7dec340 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-11-18 06:17:14 +00:00
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
 2017-11-18 14:35:11 +09:00
kibigo!
5466150ea4 Removed glitch tests 2017-11-17 19:29:17 -08:00
kibigo!
7c5614c667 Restore vanilla components 2017-11-17 19:29:16 -08:00
kibigo!
68304a6ce5 Forking glitch theme 2017-11-17 19:29:16 -08:00
beatrix
61585f2c42 Merge pull request #223 from glitch-soc/glitchsoc/feature/configurable-status-size 
Make character limit configurable (from tootsuite/mastodon#5697)
 2017-11-17 19:02:40 -05:00
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.
 2017-11-17 17:41:15 -06:00
David Yip
f1279d8ff3 Merge remote-tracking branch 'origin/master' into merge-upstream 2017-11-17 17:40:00 -06:00
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
 2017-11-18 00:16:48 +01:00
David Yip
ce27681a76 Merge pull request #222 from yipdw/merge/tootsuite/master 
Merge upstream (5982d57.. 065e238)
 2017-11-17 14:35:16 -06:00
David Yip
e5a2158e2a Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size 2017-11-17 14:28:16 -06:00
beatrix
57e301c5be Merge pull request #221 from glitch-soc/local-only-policy 
Update StatusPolicy to check current_account for local_only? toots.
 2017-11-17 15:17:49 -05:00