a7b8cb9493
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
7a0479c830
Allow to dereference Follow object for ActivityPub ( #5772 )
...
* Allow to dereference Follow object for ActivityPub
* Accept IRI as object representation for Accept activity
7 years ago
b83fb8b107
i18n: Update Polish translation ( #6168 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
d50d61a90c
Add Japanese translations #5997 , #6003 , #6004 , #6071 , #6099 , #6125 and #6132 ( #6167 )
...
* yarn manage:translations
* Add Japanese translation for #5997
* Add Japanese translation for #6003
* Add Japanese translation for #6004
* Add Japanese translation for #6071
* Add Japanese translation for #6099
* Add Japanese translation for #6125
* Add Japanese translation for #6132
7 years ago
b42e6973a1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
3c20cfd734
Add confirmation step for email changes ( #6071 )
...
* Add confirmation step for email changes
This adds a confirmation step for email changes of existing users.
Like the initial account confirmation, a confirmation link is sent
to the new address.
Additionally, a notification is sent to the existing address when
the change is initiated. This message includes instruction to reset
the password immediately or to contact the instance admin if the
change was not initiated by the account owner.
Fixes #3871
* Add review fixes
7 years ago
1cd5812c6b
delete X-UA-Compatible ( #6068 )
...
* delete X-UA-Compatible
* undo
* restore
7 years ago
1c4142da5b
Adding Serbian latin translations ( #6146 )
...
Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.
7 years ago
ed572490c1
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/authorize_follows_controller.rb
app/javascript/styles/mastodon/components.scss
7 years ago
616b6867a0
Show mastodon on modal ( #6129 )
7 years ago
5975446002
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
34a90dc266
Adding Serbian translation ( #6133 )
...
* Adding Serbian translation
* i18n-tasks normalize
7 years ago
01f91695f5
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/auth/confirmations_controller.rb
7 years ago
d9c2806048
keep the same filters and page when doing custom emojo stuff ( fixes #6112 ) ( #6114 )
7 years ago
9427823d5c
Add more instance stats APIs ( #6125 )
...
* Add GET /api/v1/instance/peers API to reveal known domains
* Add GET /api/v1/instance/activity API
* Make new APIs disableable, exclude private statuses from activity stats
* Fix code style issue
* Fix week timestamps
7 years ago
503e7fb4d8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
59a50e6489
Reduce motion for boost animation ( #5871 )
...
* Reduce motion for boost animation
Fixes #5833
* Fix ternary expression
7 years ago
9ccad78647
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
87ee458079
Display deleted users' role as “Suspended” ( #6080 )
...
Deleted users are technically suspended, but the code displaying their status
in the admin interface was broken and displayed a javascript object holding
translations of the possible user roles instead.
7 years ago
1366e96a02
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
d6088c5308
Add filters to admin UI for custom emojis ( #6003 )
7 years ago
aea3d0814b
Clean up admin UI for accounts ( #6004 )
...
* Add staff filter to admin UI for accounts, remove obsolete columns
* Only display OStatus section in admin UI for accounts when OStatus data
7 years ago
a56c9ac5dc
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
d5f4baf720
Improve public status page title ( #5985 )
7 years ago
d9e1496990
Added styling
7 years ago
a1c79ef544
Screenshot support for themes
7 years ago
901c08a999
Moved flavour UI into own prefs tab
7 years ago
34630e00cb
pulled master, moved locale entry to new location
7 years ago
853082e760
Only localize js when there's a theme
7 years ago
99e8710095
Javascript intl8n flavour support
7 years ago
f4c233f59f
Ruby intl8n for themes
7 years ago
41bbfeec7c
add initial components based off of tootsuite pr #1507
7 years ago
03d28b6ec8
Back to Web UI from tag page when signed in ( #5943 )
7 years ago
b95863ec48
Polish video player CSS, add timer on fullscreen/modal/public pages ( #5928 )
7 years ago
f0b37f92a9
Merge pull request #229 from glitch-soc/glitch-theme
...
Advanced Next-Level Flavours And Skins For Mastodon™
7 years ago
a3a7b6a848
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
b037fbf9f4
Remove rabl dependency ( #5894 )
...
* Remove rabl dependency
* Replicate old Oj configuration
7 years ago
fd7be49523
Various fixes
7 years ago
0002d12c24
current_theme -> current_flavour ( #229 )
7 years ago
1221e3075d
Merge branch 'gs-master' into glitch-theme
7 years ago
935946020f
Fixed a name + localizations
7 years ago
882055afd0
Rename themes -> flavours ? ?
7 years ago
822dea26c3
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
1447ef1d44
Add invite filter ( #5862 )
7 years ago
7f0a01a20c
Fix invites form path ( #5861 )
7 years ago
53145abfbf
Allow admin to deactivate invite created by users ( #5860 )
7 years ago
36b9f4df56
Skins support
7 years ago
a1d9c68198
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
d6846dce20
Show "expired" in invite index ( #5838 )
...
* Show "expired" in invite index
* "Force expire" -> "Deactivate"
7 years ago
bc10a0dced
Merge remote-tracking branch 'tootsuite/master'
7 years ago
Jenkins
Akihiko Odaki
Marcin Mikołajczak
Yamagishi Kazutoshi
Patrick Figel
Otakan
Branko Kokanovic
David Yip
beatrix
Eugen Rochko
Nolan Lawson
ThibG
kibigo!
cwm