treehouse
/
mastodon
20
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
5,508 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

722 Commits (d1ddba043a0cefdf68d625a3d7116ab4232b1ff1)

Author SHA1 Message Date
kibigo! 134e6590c6 Don't show skins selector when there's only one (#256) 2018-01-08 16:45:32 -08:00
Jenkins 1f469edac1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-08 10:17:15 +00:00
Eugen Rochko c8f0be1d6d Revert #5772 (#6221) 2018-01-08 10:57:52 +01:00
Jenkins 8704a190c0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-07 15:17:13 +00:00
SerCom_KC 154bd8db56 Update Simplified Chinese translations (#6215) 
* i18n: (zh-CN) Add translations of #6125

* i18n: (zh-CN) Add translations of #6132

* i18n: (zh-CN) Add translations of #6099

* i18n: (zh-CN) Add translations of #6071

* i18n: (zh-CN) Improve translations
 2018-01-07 17:32:50 +09:00
Jenkins 86007e913d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-05 22:17:12 +00:00
Quenty31 cf9323449e l10n Occitan language: mailer update (#6193) 
* Create email_changed.oc.html.erb

* Create email_changed.oc.text.erb

* Update email_changed.oc.html.erb

* Update email_changed.oc.html.erb

* Create reconfirmation_instructions.oc.html.erb

* Create reconfirmation_instructions.oc.text.erb

* Update confirmation_instructions.oc.html.erb

* Update confirmation_instructions.oc.text.erb

* Update confirmation_instructions.oc.html.erb

* Update reconfirmation_instructions.oc.html.erb

* Update reconfirmation_instructions.oc.text.erb

* Update reconfirmation_instructions.oc.html.erb
 2018-01-05 18:59:43 +09:00
Jenkins a7b8cb9493 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-03 20:17:13 +00:00
Akihiko Odaki 7a0479c830 Allow to dereference Follow object for ActivityPub (#5772) 
* Allow to dereference Follow object for ActivityPub

* Accept IRI as object representation for Accept activity
 2018-01-03 18:08:57 +01:00
Marcin Mikołajczak b83fb8b107 i18n: Update Polish translation (#6168) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-01-03 22:45:24 +09:00
Yamagishi Kazutoshi 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
 2018-01-03 21:00:39 +09:00
Jenkins b42e6973a1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-03 04:17:11 +00:00
Patrick Figel 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
 2018-01-02 16:55:00 +01:00
Otakan 1cd5812c6b delete X-UA-Compatible (#6068) 
* delete X-UA-Compatible

* undo

* restore
 2018-01-02 13:38:12 +01:00
Branko Kokanovic 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.
 2018-01-02 20:39:12 +09:00
David Yip ed572490c1 Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/controllers/authorize_follows_controller.rb
	app/javascript/styles/mastodon/components.scss
 2018-01-02 00:11:41 -06:00
Akihiko Odaki 616b6867a0 Show mastodon on modal (#6129) 2018-01-02 05:07:56 +01:00
Jenkins 5975446002 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-31 09:17:15 +00:00
Branko Kokanovic 34a90dc266 Adding Serbian translation (#6133) 
* Adding Serbian translation

* i18n-tasks normalize
 2017-12-31 17:28:20 +09:00
David Yip 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
beatrix d9c2806048 keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114) 2017-12-30 02:43:43 +01:00
Eugen Rochko 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
Jenkins 503e7fb4d8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-24 15:17:12 +00:00
Nolan Lawson 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
Jenkins 9ccad78647 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-22 04:17:14 +00:00
ThibG 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
Jenkins 1366e96a02 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-13 18:17:16 +00:00
Eugen Rochko d6088c5308 Add filters to admin UI for custom emojis (#6003) 2017-12-13 13:28:31 +01:00
Eugen Rochko 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
David Yip a56c9ac5dc Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2017-12-12 02:54:13 -06:00
Eugen Rochko d5f4baf720 Improve public status page title (#5985) 2017-12-12 03:56:30 +01:00
kibigo! d9e1496990 Added styling 2017-12-10 20:32:28 -08:00
kibigo! a1c79ef544 Screenshot support for themes 2017-12-10 20:32:28 -08:00
kibigo! 901c08a999 Moved flavour UI into own prefs tab 2017-12-10 20:32:27 -08:00
cwm 34630e00cb pulled master, moved locale entry to new location 2017-12-10 15:22:15 -06:00
kibigo! 853082e760 Only localize js when there's a theme 2017-12-10 11:08:04 -08:00
kibigo! 99e8710095 Javascript intl8n flavour support 2017-12-10 11:08:04 -08:00
kibigo! f4c233f59f Ruby intl8n for themes 2017-12-10 11:08:04 -08:00
cwm 41bbfeec7c add initial components based off of tootsuite pr #1507 2017-12-09 10:26:22 -06:00
Yamagishi Kazutoshi 03d28b6ec8 Back to Web UI from tag page when signed in (#5943) 2017-12-09 14:19:07 +01:00
Eugen Rochko b95863ec48 Polish video player CSS, add timer on fullscreen/modal/public pages (#5928) 2017-12-09 00:55:58 +01:00
beatrix 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
Jenkins a3a7b6a848 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-06 20:17:13 +00:00
Eugen Rochko b037fbf9f4 Remove rabl dependency (#5894) 
* Remove rabl dependency

* Replicate old Oj configuration
 2017-12-06 15:04:49 +09:00
kibigo! fd7be49523 Various fixes 2017-12-04 21:58:10 -08:00
David Yip 0002d12c24 current_theme -> current_flavour (#229) 2017-12-04 11:35:35 -06:00
David Yip 1221e3075d Merge branch 'gs-master' into glitch-theme 2017-12-04 11:07:01 -06:00
kibigo! 935946020f Fixed a name + localizations 2017-12-04 00:19:39 -08:00
kibigo! 882055afd0 Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00
Jenkins 822dea26c3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-02 14:17:11 +00:00