tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,667 Commits 10 Branches 0 Tags
ff2270cd061b2dc3fc86a5b2bd77d0a3408b5716
Commit Graph
757 Commits
Author SHA1 Message Date
Naoki KosakaandEugen Rochko 8bae14591b Migrate to font-awesome 5.0. (#8799) 2018-09-27 17:08:56 +02:00
Haelwenn MonnierandEugen Rochko 15fc2b76f9 Show "read more" link on overly long in-stream statuses (#8205) 
Show "read more" link on overly long in-stream statuses
 2018-09-27 17:04:33 +02:00
rhoioandYamagishi Kazutoshi c6e765f81e remove meta label in settings column (#8704) 2018-09-25 22:59:19 +09:00
Maciek BaronandEugen Rochko 4b794e134d Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484) 
* Migrate to newer version of Font Awesome

* Add bot icon to bot avatars
 2018-09-25 05:08:55 +02:00
Masoud AbkenarandEugen Rochko 9f6662fcc9 RTL: fix statubar action buttons/counter margins (#8767) 
* RTL: fix statubar action buttons/counter margins

* remove trailing whitespaces
 2018-09-24 16:30:02 +02:00
Minku LeeandEugen Rochko d0d65b5a28 Separate font-family into variable (#8763) 
This will allow easier customization of font family instead of going
through all occurrences of 'mastodon-font-sans-serif'.
 2018-09-23 20:41:24 +02:00
Masoud AbkenarandEugen Rochko ef11347281 RTL: fix settings button margins in column headers (#8764) 2018-09-23 20:40:37 +02:00
Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	Vagrantfile
	app/javascript/packs/public.js
	app/views/admin/settings/edit.html.haml
	app/views/settings/preferences/show.html.haml
	app/views/settings/profiles/show.html.haml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/webpack/configuration.js
	config/webpack/loaders/babel.js
	package.json
	yarn.lock

Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js
 2018-09-19 21:46:01 +02:00
Eugen RochkoandGitHub f4d549d300 Redesign forms, verify link ownership with rel="me" (#8703) 
* Verify link ownership with rel="me"

* Add explanation about verification to UI

* Perform link verifications

* Add click-to-copy widget for verification HTML

* Redesign edit profile page

* Redesign forms

* Improve responsive design of settings pages

* Restore landing page sign-up form

* Fix typo

* Support <link> tags, add spec

* Fix links not being verified on first discovery and passive updates
 2018-09-18 16:45:58 +02:00
Eugen RochkoandGitHub 011437dcb5 Group reports by target account (#8674) 
* Group reports by target account

* Improve CSS
 2018-09-13 03:44:08 +02:00
rhoioandEugen Rochko 7b7c26063e Highlight active tab in action bar (#8673) 
* NavLinks with activeclass instead of Link in actionbar to highlight active tab

* highlight border-bottom in action bar consistent to public view
 2018-09-13 01:50:41 +02:00
Thibaut Girka cd99255698 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/controllers/oauth/authorizations_controller.rb

Just two changes being too close to one another.
Took both.
 2018-09-11 16:51:26 +02:00
ThibGandEugen Rochko bda0f7ac73 Add a few black emojis that are to have a white outline (#8597) 2018-09-10 18:26:47 +02:00
Sorin DavidoiandEugen Rochko 8fefcb86ea feat(css): Styled scrollbars in Firefox Nightly (#8653) 
You currently need to enable `layout.css.scrollbar-colors.enabled` in `about:config` in Firefox
Nightly.
 2018-09-09 02:08:49 +02:00
ThibGandEugen Rochko 0c5db3163a Fix dropdown arrow position (#8637) 2018-09-07 01:18:46 +02:00
Thibaut Girka 6f75a9001f Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/views/stream_entries/_simple_status.html.haml
- config/locales/nl.yml

Deleted unused translation strings (themes) and adapted minor changes to
_simple_status.html.haml
 2018-08-31 19:10:57 +02:00
takayamakiandEugen Rochko f5c052b5e6 refactor: getting-started__wrapper should contained in getting-started (#8532) 2018-08-31 03:43:02 +02:00
M SomervilleandEugen Rochko 1bfe735d57 Inactive header in main profile to match column. (#8520) 2018-08-30 23:53:30 +02:00
Thibaut Girka c24491a8df Merge branch 'master' into glitch-soc/merge-upstream 2018-08-29 13:57:56 +02:00
Mélanie Chauvel (ariasuni)andEugen Rochko 9463bba5fb Reduce padding of profile metadata boxes to allow more text (#8491) 2018-08-29 01:20:11 +02:00
Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/controllers/application_controller.rb

Changed instance theme selection by instance flavour selection.
 2018-08-24 15:10:34 +02:00
Eugen RochkoandGitHub a2cabf3f4a Add admin custom CSS setting (#8399) 
Fix #3894
 2018-08-24 04:33:27 +02:00
Eugen RochkoandGitHub 5b5ae01824 Update light theme (#8392) 
Fix #8209
Fix #7566
 2018-08-23 19:20:49 +02:00
Thibaut Girka e70fc059a9 Merge branch 'master' into glitch-soc/merge-upstream 2018-08-22 20:56:32 +02:00
Eugen RochkoandGitHub 2374a00c10 Add confirmation step to account suspensions (#8353) 
* Add confirmation page for suspensions

* Suspension confirmation closes reports, linked from report UI

* Fix tests
 2018-08-22 11:53:41 +02:00
Thibaut Girka 8b4abaa90d Merge branch 'master' into glitch-soc/master 
Conflicts:
	config/routes.rb

Added the “endorsements” route from upstream.
 2018-08-21 18:24:48 +02:00
NecroTechnoandEugen Rochko 6a0d4d36ad reorder simple form ul to list vertically (fixes #8236) (#8322) 
* reorder simple form ul to list vertically (fixes #8236)

* remove browser specific prefixes
 2018-08-20 23:58:57 +02:00
cpsdqsandEugen Rochko 8fe1f8d4ce Make dropdown animations respect their placement (#8292) 
* Make dropdown animations respect their placement

Also fix the corner radius on the privacy dropdown button when using top placement

* Fix code style issue
 2018-08-19 17:11:12 +02:00
mayaehandEugen Rochko 0d1d9b9a33 Fix report text color. (#8288) 2018-08-19 15:51:57 +02:00
Thibaut Girka 88a0395a58 Merge branch 'master' into glitch-soc/merge-upstream 2018-08-19 09:27:18 +02:00
Eugen RochkoandGitHub 19b07ba260 Make unfollow button light up red when hovered (#8286) 
Fix #8284
 2018-08-19 03:28:43 +02:00
Thibaut Girka bfeac6747a Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	.circleci/config.yml
	app/controllers/authorize_follows_controller.rb
	app/javascript/packs/public.js

Moved new stuff from packs/public.js to core/public.js.
Added appropriate use_pack in new controllers.
 2018-08-18 18:04:49 +02:00
Eugen RochkoandGitHub 85bb32c410 Add "sign in to participate" message to public toot page (#8200) 2018-08-18 12:48:27 +02:00
Eugen RochkoandGitHub 78fa926ed5 Add remote interaction dialog for toots (#8202) 
* Add remote interaction dialog for toots

* Change AuthorizeFollow into AuthorizeInteraction, support statuses

* Update brakeman.ignore

* Adjust how interaction buttons are display on public pages

* Fix tests
 2018-08-18 03:03:12 +02:00
Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/models/status.rb
	db/migrate/20180528141303_fix_accounts_unique_index.rb
	db/schema.rb

Resolved by taking upstream changes (no real conflicts, just glitch-soc
specific code too close to actual changes).
 2018-08-17 17:43:54 +02:00
ThibGandEugen Rochko 625b5a567b Get rid of the Content Warning rainbows (#8129) 
* Disable the animated rainbow text when the “Reduce motion” setting is set

* Get rid of the Content Warning rainbows

* Revert to default color for CWs in admin view

Since that colorscheme is apparently broken for some colorblind people.

* Use HTML5's details and summary for statuses with CWs in admin interface
 2018-08-15 19:38:56 +02:00
Eugen RochkoandGitHub 4df9cabb22 Display replies count in web UI (#8181) 2018-08-15 19:29:52 +02:00
Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/controllers/accounts_controller.rb
	app/javascript/mastodon/locales/pl.json
	app/views/about/more.html.haml

Conflicts in `accounts_controller.rb` resolved by taking upstream's
version + our `use_pack`.

Conflicts in `pl.json` resolved by taking upstream's changes.

Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.
 2018-08-10 16:22:31 +02:00
Eugen RochkoandGitHub 5b8603879f Adjust responsive design for /about/more and /terms (#8158) 
Follow-up to #8142
 2018-08-10 06:43:02 +02:00
Eugen RochkoandGitHub 0dcc1950d1 Update /terms and /about/more to use public layout (#8142) 2018-08-09 12:58:20 +02:00
Eugen RochkoandGitHub f2404de871 Public profile endorsements (accounts picked by profile owner) (#8146) 2018-08-09 09:56:53 +02:00
Thibaut Girka c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream 
Manually-resolved conflicts:
	.circleci/config.yml
	app/controllers/accounts_controller.rb
	app/controllers/auth/passwords_controller.rb
	app/controllers/statuses_controller.rb
	app/javascript/packs/public.js
	app/models/media_attachment.rb
	app/views/stream_entries/_content_spoiler.html.haml
	app/views/stream_entries/_media.html.haml
	config/locales/en.yml
	config/locales/ja.yml
	config/locales/pl.yml
	lib/mastodon/version.rb

Some content from app/javascript/packs/public.js has been split to
app/javascript/core/settings.js.

Translation strings for glitch-soc's keyword mutes were dropped.

Everything else was mostly “take both”.
 2018-08-01 00:18:13 +02:00
Eugen RochkoandGitHub 13ac8ca66a Do not hide hashtag timeline in mobile view, make it full-window (#8093) 2018-07-31 02:54:25 +02:00
Eugen RochkoandGitHub 60df87f6f0 Compensate for scrollbar disappearing when media modal visible (#8100) 
* Compensate for scrollbar disappearing when media modal visible

Make auth pages backgrounds lighter

* Fix typo
 2018-07-31 01:14:33 +02:00
Eugen RochkoandGitHub 1d773b3a46 Add missing formatting to the text in hero widget (#8089) 2018-07-28 23:52:20 +02:00
Mélanie Chauvel (ariasuni)andEugen Rochko 2ccef52a4f Improve account bar css (#8087) 
* Remove superfluous span tags

* Make account bar items (except dropdown) flexible to work well with custom CSS

* Fix CSS lint warning (0px → 0)
 2018-07-28 20:09:58 +02:00
Eugen RochkoandGitHub bb71538bb5 Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
Thibaut Girka 6141c2a035 Merge branch 'master' into glitch-soc/merge-upstream 2018-07-26 21:22:43 +02:00
EaiandEugen Rochko c9739ca86b Fix .column-back-button line-height (#8074) 2018-07-26 04:49:45 +02:00
Thibaut Girka 7dbed4dab9 Merge branch 'master' into glitch-soc/merge-upstream 2018-07-17 22:05:25 +02:00