5975446002
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-31 09:17:15 +00:00
34a90dc266
Adding Serbian translation ( #6133 )
...
* Adding Serbian translation
* i18n-tasks normalize
2017-12-31 17:28:20 +09:00
01f91695f5
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/auth/confirmations_controller.rb
2017-12-30 17:20:07 -06:00
d9c2806048
keep the same filters and page when doing custom emojo stuff ( fixes #6112 ) ( #6114 )
2017-12-30 02:43:43 +01:00
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
2017-12-29 19:52:04 +01:00
503e7fb4d8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-24 15:17:12 +00:00
59a50e6489
Reduce motion for boost animation ( #5871 )
...
* Reduce motion for boost animation
Fixes #5833
* Fix ternary expression
2017-12-24 04:48:31 +01:00
9ccad78647
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-22 04:17:14 +00:00
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.
2017-12-22 02:14:17 +01:00
1366e96a02
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-13 18:17:16 +00:00
d6088c5308
Add filters to admin UI for custom emojis ( #6003 )
2017-12-13 13:28:31 +01:00
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
2017-12-13 12:15:10 +01:00
a56c9ac5dc
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
2017-12-12 02:54:13 -06:00
d5f4baf720
Improve public status page title ( #5985 )
2017-12-12 03:56:30 +01:00
d9e1496990
Added styling
2017-12-10 20:32:28 -08:00
a1c79ef544
Screenshot support for themes
2017-12-10 20:32:28 -08:00
901c08a999
Moved flavour UI into own prefs tab
2017-12-10 20:32:27 -08:00
34630e00cb
pulled master, moved locale entry to new location
2017-12-10 15:22:15 -06:00
853082e760
Only localize js when there's a theme
2017-12-10 11:08:04 -08:00
99e8710095
Javascript intl8n flavour support
2017-12-10 11:08:04 -08:00
f4c233f59f
Ruby intl8n for themes
2017-12-10 11:08:04 -08:00
41bbfeec7c
add initial components based off of tootsuite pr #1507
2017-12-09 10:26:22 -06:00
03d28b6ec8
Back to Web UI from tag page when signed in ( #5943 )
2017-12-09 14:19:07 +01:00
b95863ec48
Polish video player CSS, add timer on fullscreen/modal/public pages ( #5928 )
2017-12-09 00:55:58 +01:00
f0b37f92a9
Merge pull request #229 from glitch-soc/glitch-theme
...
Advanced Next-Level Flavours And Skins For Mastodon™
2017-12-06 17:44:07 -05:00
a3a7b6a848
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-06 20:17:13 +00:00
b037fbf9f4
Remove rabl dependency ( #5894 )
...
* Remove rabl dependency
* Replicate old Oj configuration
2017-12-06 15:04:49 +09:00
fd7be49523
Various fixes
2017-12-04 21:58:10 -08:00
0002d12c24
current_theme -> current_flavour ( #229 )
2017-12-04 11:35:35 -06:00
1221e3075d
Merge branch 'gs-master' into glitch-theme
2017-12-04 11:07:01 -06:00
935946020f
Fixed a name + localizations
2017-12-04 00:19:39 -08:00
882055afd0
Rename themes -> flavours ? ?
2017-12-03 23:26:40 -08:00
822dea26c3
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-02 14:17:11 +00:00
1447ef1d44
Add invite filter ( #5862 )
2017-12-01 16:40:02 +01:00
7f0a01a20c
Fix invites form path ( #5861 )
2017-12-01 12:26:57 +01:00
53145abfbf
Allow admin to deactivate invite created by users ( #5860 )
2017-12-01 12:26:19 +01:00
36b9f4df56
Skins support
2017-11-30 19:29:47 -08:00
a1d9c68198
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-28 11:45:13 -06:00
d6846dce20
Show "expired" in invite index ( #5838 )
...
* Show "expired" in invite index
* "Force expire" -> "Deactivate"
2017-11-28 15:41:02 +01:00
bc10a0dced
Merge remote-tracking branch 'tootsuite/master'
2017-11-27 22:33:26 -06:00
55d9abcceb
Add UI for setting up account migration ( #5832 )
2017-11-27 22:47:06 +01:00
c9dd67a733
Merge remote-tracking branch 'origin/master' into gs-master
2017-11-27 11:29:04 -06:00
d5e4cb2ca1
Use account.username when display_name is empty ( #5828 )
2017-11-27 16:09:52 +01:00
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
f504ac4ff6
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-27 05:17:11 +00:00
191993c811
Use account.display_name for og:title single toot pages ( #5821 )
2017-11-27 05:31:26 +01:00
359ba16721
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-11-24 01:17:20 +00:00
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
eadf1c38a5
Minor fixes
2017-11-21 18:17:38 -08:00
8aeda4f064
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
Jenkins