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

5417 Commits (02422158aec7b19bdc35c486f602d675bde3a18b)

Author SHA1 Message Date
Thibaut Girka f09150f2a9 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-09 12:12:03 +02:00
ThibG d73c1df33b Merge pull request #770 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-10-09 12:11:14 +02:00
Thibaut Girka e968dcea13 Fix app-wide hotkeys randomly failing to work 2018-10-09 12:10:51 +02:00
mayaeh bcb43baf50 Add Japanese translations. (#8927) 2018-10-09 07:12:37 +09:00
Thibaut Girka 683608dd60 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 15:34:53 +02:00
mayaeh 96a313d02b Fixed error occurrence when pinning the DM column. (#8922) 2018-10-08 14:43:38 +02:00
Thibaut Girka 74e411f4e8 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 13:51:33 +02:00
Thibaut Girka 3f68e9ed11 Move “Show action buttons in collapsed toots” option 2018-10-08 13:49:25 +02:00
Thibaut Girka caa56b01a9 Switch from selects to radio buttons for local settings, improve styling 2018-10-08 13:49:25 +02:00
ashleyhull-versent 00d31a292c rubocop issues - Cleaning up (#8912) 
* cleanup pass

* undo mistakes

* fixed.

* revert
 2018-10-08 04:50:11 +02:00
Eugen Rochko 65d1a2d10a Remove dead code (#8919) 
SignatureVerification#matches_time_window? is not called anywhere.
 2018-10-08 04:48:54 +02:00
ashleyhull-versent ea57aca5e1 Replace SVG asset with Custom mascot (#8766) 2018-10-08 00:20:45 +02:00
Eugen Rochko c9b5168ebd Add conversations API (#8832) 
* Add conversations API

* Add web UI for conversations

* Add test for conversations API

* Add tests for ConversationAccount

* Improve web UI

* Rename ConversationAccount to AccountConversation

* Remove conversations on block and mute

* Change last_status_id to be a denormalization of status_ids

* Add optimistic locking
 2018-10-07 23:44:58 +02:00
Thibaut Girka 58cbb9ef8f [Glitch] Change documentation URL 
Port 7635a136c9 to glitch-soc
 2018-10-07 22:56:24 +02:00
Thibaut Girka 52f97080e7 [Glitch] RTL: fix margins of public-account-header__tabs 
Port e2065ceead to glitch-soc
 2018-10-07 22:56:24 +02:00
Thibaut Girka bdbbbb1bdb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-07 19:47:56 +02:00
ThibG 8b48543b77 Ensure only toots from the reported users are reported (#8916) 2018-10-07 19:45:40 +02:00
Thibaut Girka b4bab7eb35 Do not scroll timelines when *closing* media modals 
Media modals push an history state so that pressing back on mobile closes them.
We made sure to not scroll when opening them, but not when *closing* them,
which caused some issues in rare cases.
 2018-10-07 12:08:32 +02:00
Marcin Mikołajczak 07d123fd3c i18n: Update Polish translation (#8901) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-10-06 20:42:36 +09:00
Eugen Rochko 7635a136c9 Change documentation URL (#8898) 
* Change documentation URL

* Fix hardcoded documentation URL in locales
 2018-10-06 14:33:36 +09:00
Masoud Abkenar e2065ceead RTL: fix margins of public-account-header__tabs (#8897) 
* RTL: fix margins of public-account-header__tabs

* fix style

* even more stylish code :)
 2018-10-06 00:05:11 +02:00
Thibaut Girka 463f250f26 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-05 21:48:25 +02:00
Jeong Arm 708c12af1e Leave unknown language as nil if account is remote (#8861) 
* Force use language detector if account is remote

* Set unknown remote toot's language as nil
 2018-10-05 19:17:46 +02:00
Thibaut Girka 72305816ea [Glitch] Add a confirmation dialog when hitting reply and the compose box isn't empty 2018-10-05 19:08:52 +02:00
ThibG d6df42df16 Add a confirmation dialog when hitting reply and the compose box isn't empty (#8893) 
* Add a confirmation dialog when hitting reply and the compose box isn't empty

Fixes #878

* Performance improvement
 2018-10-05 18:44:44 +02:00
Thibaut Girka f627ea99e4 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb

Took our version, upstream changes were only minor style linting.
 2018-10-05 15:23:57 +02:00
Eugen Rochko 48c2ab8cf5 Limit the number of people that can be followed from one account (#8807) 
Configurable soft limit of 7,500, and above that, configurable
ratio of 1.1 * followers, controlled by:

- MAX_FOLLOWS_THRESHOLD
- MAX_FOLLOWS_RATIO

Fix #2311
 2018-10-04 17:36:11 +02:00
Eugen Rochko 1ae62b87ed Change admin accounts default sort to most recent (#8813) 2018-10-04 16:05:38 +02:00
Eugen Rochko 24f168e58e Fix link verification for remote accounts (#8868) 2018-10-04 15:47:03 +02:00
ThibG 47eaba870e Fix handling of ActivityPub activities lacking some attributes (#8864) 2018-10-03 23:44:13 +02:00
Thibaut Girka 1476e653ec Make hidden media clickable in account media gallery 2018-10-02 22:00:57 +02:00
Thibaut Girka c2f963256c Add media description (or status spoiler) in account media gallery 2018-10-02 22:00:57 +02:00
Thibaut Girka a62e47672e Fix account gallery hidden media background color in mastodon-light 2018-10-02 22:00:57 +02:00
Thibaut Girka e9f2659066 [Glitch] Honour displayMedia setting in accountMedia gallery 
Inspired by aeca336e22
 2018-10-02 22:00:57 +02:00
Thibaut Girka 536d95ae7c [Glitch] Add support for new display_media setting 
Port bb8afc4608 to glitch-soc

[API] [vanilla required] [glitch-soc optional] initial_state show_sensitive_media boolean changed to show_media string with options "default", "hide_all", "show_all"
 2018-10-01 16:48:55 +02:00
Thibaut Girka 56714ef14c [Glitch] RTL: fix margins: public-layout.header.nav-button 
Port bf20094a3f to glitch-soc
 2018-10-01 14:38:35 +02:00
Thibaut Girka 9bec970736 [Glitch] RTL: fix statubar action buttons/counter margins 
Port b837c636ac to glitch-soc
 2018-10-01 14:38:32 +02:00
Thibaut Girka 9617c07724 [Glitch] Separate font-family into variable 
Port 8913189055 to glitch-soc
 2018-10-01 14:38:29 +02:00
Thibaut Girka f5eaefc485 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb
 2018-10-01 12:43:20 +02:00
Eugen Rochko db1a581491 Double the threshold for "read more" functionality (#8835) 2018-10-01 03:38:10 +02:00
Spencer Alves 981a41ca2c Add option to hide action bar in collapsed toots 2018-09-30 08:31:50 +02:00
David Yip d698c06aa8 Merge pull request #681 from ThibG/glitch-soc/fixes/accessibility 
Port various accessibility improvements from upstream
 2018-09-29 19:01:19 -05:00
David Yip 278d21bb0b Merge pull request #755 from ThibG/glitch-soc/features/optional-reply-selection 
Make pre-selection of usernames optional when replying to a toot
 2018-09-29 19:01:05 -05:00
David Yip dc8da22a73 Merge pull request #754 from ThibG/glitch-soc/fixes/scroll-compose-into-view 
Scroll to textarea when composing a toot
 2018-09-29 19:00:31 -05:00
David Yip a469f72e3b Merge pull request #745 from ThibG/glitch-soc/fixes/grey-out-button 
Disable the “TOOT” button (and secondary toot button) if the toot text is empty
 2018-09-29 19:00:06 -05:00
Eugen Rochko 92e5d6b6e5 Fix timeline pagination (#8827) 
Ruby's ** operator does not play well with non-Hash objects, which
the params slice is

Fix #8821
 2018-09-29 19:03:33 +02:00
Masoud Abkenar bf20094a3f RTL: fix margins: public-layout.header.nav-button (#8823) 
* RTL: fix margins: public-layout.header.nav-button

* add empty line to meet style guides
 2018-09-29 11:04:26 +09:00
Thibaut Girka e7ddcf50ab Make pre-selection of usernames optional when replying to a toot 
Fixes #751
 2018-09-28 21:01:09 +02:00
Thibaut Girka 39b29ae6eb Fix styling issue in “Compose box options” local settings page 2018-09-28 18:55:44 +02:00
Thibaut Girka d27b7d7645 Scroll to textarea when composing a toot 2018-09-28 18:44:55 +02:00