monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,336 Commits 1 Branch 0 Tags 261 MiB
Commit Graph

9336 Commits

Author SHA1 Message Date
Alix Rossi a5c60f87b1 i18n: Update Corsican translations (#10538) 2019-04-10 14:49:06 +02:00
Eugen Rochko 92e1950194 [Glitch] Fix glitched out "not found" message for non-existing profiles in web UI 
Port 56f29c38b6 to glitch-soc
 2019-04-10 09:33:47 +02:00
Eugen Rochko fa4b51a110 [Glitch] Add "why do you want to join" field to invite requests 
Port SCSS changes from 8b69a66380 to glitch-soc
 2019-04-10 09:22:45 +02:00
Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.
 2019-04-10 09:16:08 +02:00
Eugen Rochko 830c2a9ccb
Bump version to 2.8.0rc3 (#10535) 2019-04-10 04:25:09 +02:00
Eugen Rochko 9b0d8f74cb
Change the groupings of menu items in settings navigation (#10533) 
* Change the groupings of menu items in settings navigation

Fix #10307

* Remove unused translations
 2019-04-10 03:47:11 +02:00
Eugen Rochko 400397c0c7
Change HTML validator to ignore all errors except unmatched tags (#10534) 2019-04-10 03:34:16 +02:00
Eugen Rochko 46cb36fd2c
Add invite request to pending account notification e-mail (#10528) 
Fix sorting of the pending accounts page
 2019-04-10 00:36:01 +02:00
Eugen Rochko 36b39fbac5
Add preference to disable e-mails about new pending accounts (#10529) 2019-04-10 00:35:49 +02:00
Yağızhan 2cb16c20a6 Fixed terrible grammar and translated the most (#10527) 
The translation was written in bad Turkish grammar. I fixed those terrible phrases and translated %93 of Mastodon.

I'll come back and finish the translation.
 2019-04-09 20:42:01 +02:00
Hinaloe 48f466daf1 Allow set the voting period to just 5 minutes (#10525) 
* Add spec of PollValidator for #10190

* Raise fraction less than 1 second

* format

* simplify time initialize
 2019-04-09 17:02:12 +02:00
Eugen Rochko 8b69a66380 Add "why do you want to join" field to invite requests (#10524) 
* Add "why do you want to join" field to invite requests

Fix #10512

* Remove unused translations

* Fix broken registrations when no invite request text is submitted
 2019-04-09 23:06:30 +09:00
dependabot[bot] 0f3719f16f Bump hamlit-rails from 0.2.2 to 0.2.3 (#10522) 
Bumps [hamlit-rails](https://github.com/mfung/hamlit-rails) from 0.2.2 to 0.2.3.
- [Release notes](https://github.com/mfung/hamlit-rails/releases)
- [Commits](https://github.com/mfung/hamlit-rails/compare/v0.2.2...v0.2.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-09 17:23:52 +09:00
dependabot[bot] 819d053be8 Bump bootsnap from 1.4.2 to 1.4.3 (#10523) 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.2...v1.4.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-09 17:23:18 +09:00
Eugen Rochko 654f79d2b1
Fix permission denied bug on approve all/reject all pending accounts (#10519) 2019-04-09 07:19:52 +02:00
Eugen Rochko c03f926cf3
Bump version to 2.8.0rc2 (#10501) 2019-04-09 05:04:11 +02:00
Eugen Rochko 56f29c38b6
Fix glitched out "not found" message for non-existing profiles in web UI (#10517) 2019-04-09 05:02:48 +02:00
Quentí ba1a78d168 [i18n] Update and correction (#10511) 
* [i18n] Update and correction

* Update oc.json

* Update oc.json
 2019-04-09 07:39:50 +09:00
Thibaut Girka cb410f80a4 Add column title to “Favourited by” and “Boosted by” columns 2019-04-08 21:59:30 +02:00
Alix Rossi 2a168a002c i18n: Update Corsican translations (#10510) 
* i18n: Update Corsican translations

* i18n: Update Corsican translations
 2019-04-08 19:01:41 +02:00
ThibG 5247ea4efd Fix batch actions not working on pending accounts (#10508) 2019-04-08 18:35:41 +02:00
ThibG fc2f7ee871
Merge pull request #983 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-04-08 18:17:22 +02:00
Thibaut Girka 63837a4b78 Fix pending accounts management 2019-04-08 16:40:11 +02:00
ashleyhull-versent ac071d65de [Glitch] Duplicate values 
Port bd365cc38b to glitch-soc
 2019-04-08 16:22:20 +02:00
Eugen Rochko df42de68e5 [Glitch] Port SCSS changes from "Improve blocked view of profiles" 
Port public pages SCSS changes from 67b3b62b98
 2019-04-08 16:20:46 +02:00
Thibaut Girka f5f6d23d55 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/pl.yml
  Conflict caused by new upstream string too close to glitch-specific
  “flavour” string. Took both strings.
 2019-04-08 15:57:56 +02:00
koyu 3f036ac6b8 Updated German locales (#10505) 
* Updated German locales

* Added account approval locales (German)

* Updated JSON locales (German)
 2019-04-08 21:14:08 +09:00
Alix Rossi 6e111152e0 i18n: Update Corsican translations (#10504) 2019-04-08 21:12:06 +09:00
Aditoo17 ae58bbd705 i18n: Update Czech translation (#10506) 2019-04-08 21:11:39 +09:00
Takeshi Umeda a4d5e15327 Fix config serializer regex (#10487) 2019-04-08 07:55:38 +02:00
Takeshi Umeda 08ba69b538 Add `tootctl accounts reset-relationships` (#10483) 
* Add `tootctl accounts reset`

* Rename reset to reset-relationships

* Improve command description
 2019-04-08 07:46:55 +02:00
ThibG cb71c95e22 Export and import show_reblogs together with following list (#10495) 
* Refactor imports

* Export show_reblogs when exporting list of followed users

* Add support for importing show_reblogs with following collection

* Fix tests
 2019-04-08 07:28:27 +02:00
Jeong Arm 619bbc23ef Translate Korean (#10499) 2019-04-08 12:35:37 +09:00
Hugo "Slaynash" Flores 38b8a5c5b2 Updated french translations (#10498) 
* updated "Invalid email or password" french translation

* Updated FR translations ("instance" in now "serveur")
 2019-04-08 09:22:09 +09:00
mayaeh a265696991 i18n: Update Japanese translations (#10494) 
* Update Japanese translations

* Update Japanese translations.
 2019-04-08 09:16:14 +09:00
Alix Rossi 3563ce34e7 i18n: Update Corsican translations (#10496) 
* Update Corsican translation

* Fix brackets typo
 2019-04-07 21:32:27 +09:00
Eugen Rochko 67b3b62b98
Improve blocked view of profiles (#10491) 
* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447)"

This reverts commit 120544067f.

* Revert "Hide blocking accounts from blocked users (#10442)"

This reverts commit 62bafa20a1.

* Improve blocked view of profiles

- Change "You are blocked" to "Profile unavailable"
- Hide following/followers in API when blocked
- Disable follow button and show "Profile unavailable" on public profile as well
 2019-04-07 04:59:13 +02:00
Eugen Rochko 0e8819f0e8
Add rate limit for media proxy requests (#10490) 
30 per 30 minutes, like media uploads
 2019-04-07 04:26:43 +02:00
Aditoo17 6a0cd366ef I18n: Update Czech translation (#10489) 2019-04-07 09:34:52 +09:00
koyu b703899773 Updated German locales (#10488) 2019-04-07 03:13:03 +09:00
Eugen Rochko e1d0390e29
Add batch actions for approving and rejecting pending accounts (#10469) 2019-04-06 17:53:45 +02:00
Eugen Rochko 2c63e0292a
Fix admin validation being too strict about usernames (#10449) 
* Fix admin validation being too strict about usernames

Fix #10446

* Strip Setting.site_contact_username consistently throughout the codebase
 2019-04-06 17:53:17 +02:00
Marek Ľach 78a8a99b0b Improve sk translation further (#10484) 
* Further improving Slovak translation

* Update sk.json
 2019-04-06 23:26:51 +09:00
ashleyhull-versent 2b68fe5442 tinyfix 2: unrequired arguments (#10471) 
* unrequired argument

* unrequired argument
 2019-04-06 12:02:03 +09:00
Eugen Rochko 20d301c383
Fix missing long description on `tootctl statuses remove` (#10482) 2019-04-06 04:47:26 +02:00
Eugen Rochko 6689e572f3
Add `tootctl emoji purge` (#10481) 
Fix #10441
 2019-04-06 04:47:16 +02:00
Eugen Rochko e007c7a99b
Add `tootctl accounts approve` (#10480) 2019-04-06 04:47:05 +02:00
dependabot[bot] fb8557e652 Bump rubocop from 0.66.0 to 0.67.1 (#10475) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.66.0 to 0.67.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.66.0...v0.67.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-06 11:41:19 +09:00
marcin mikołajczak 4be7952892 i18n: Update Polish translation (#10479) 
Signed-off-by: Marcin Mikołajczak <m4sk1n@m4sk1n.nazwa.pl>
 2019-04-06 02:51:13 +09:00
Marek Ľach e0137c5884 Updates the Slovak translation (#10477) 
* Update sk.json

* Update sk.json

* Update sk.json
 2019-04-05 22:16:28 +09:00