tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,988 Commits 5 Branches 0 Tags
Commit Graph

975 Commits

Author SHA1 Message Date
kedama
25f9ead041 Fix domain label position and color (#9033) 
* Fix position of the domain label

* Fix position of the domain label for RTL

- Fix color mismatch of linear gradient which assigned to "::after" pseudo class
 2018-10-21 14:35:25 +09:00
Eugen Rochko
eb1b9903a6
Redesign direct messages column (#9022) 2018-10-20 02:23:58 +02:00
Masoud Abkenar
029943d59b RTL: fix preferences layout (#9021) 2018-10-20 01:05:17 +02:00
bsky
065b39e7a4 Fix admin account avatar margin (#9020) 2018-10-19 20:35:42 +02:00
Masoud Abkenar
301cbcc980 RTL: fix user stats in about page (#9018) 2018-10-19 20:16:13 +09:00
Eugen Rochko
a38a452481
Add unread indicator to conversations (#9009) 2018-10-19 01:47:29 +02:00
Masoud Abkenar
65b3804a6c RTL: fix domain append at signup form (#9007) 2018-10-18 21:19:31 +02:00
Masoud Abkenar
f8c1b32541 RTL: fix admin account margins in about page (#9005) 2018-10-18 14:35:49 +02:00
Masoud Abkenar
d35801aaa2 Fixes 8987 broken alignment at "Remote interaction dialog" (#8988) 2018-10-15 16:09:08 +02:00
Masoud Abkenar
efd09e2ebb undo part of PR 8202 to fix RTL (#8979) 2018-10-15 04:39:20 +02:00
Eugen Rochko
b972478812
Improve style of notice/alert messages (#8973) 2018-10-13 01:51:30 +02:00
Thibaut Girka
d17844e6d1 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 13:51:33 +02:00
Eugen Rochko
774ac47373
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
611740ce81 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-07 19:47:56 +02:00
Masoud Abkenar
185cb2dc3a 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
c91d9b7389 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
Masoud Abkenar
df2f4052b8 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
Eugen Rochko
3d7f68c273
Revert Font Awesome 5 upgrade (#8810) 
* Revert "Fix some icon names changed by the Font Awesome 5. (#8796)"

This reverts commit 3f9ec3de82c1a3879a2b092672f51c1caca76f5c.

* Revert "Migrate to font-awesome 5.0. (#8799)"

This reverts commit 8bae14591bfb4fc9dd9d89d8082ac0123b03edaa.

* Revert "Fix some icons names, unavailable in fontawesome5 (free license). (#8792)"

This reverts commit b9c727a945fea5afffb3e3a53279164adfc6e88f.

* Revert "Update the icon name changed by the Font Awesome 5. (#8776)"

This reverts commit 17af4d27da484fc35ecd4b4dce2443d24aa35d23.

* Revert "Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484)"

This reverts commit 4b794e134d427dbc716606324adb9a885a74abec.
 2018-09-28 02:11:14 +02:00
Naoki Kosaka
8bae14591b Migrate to font-awesome 5.0. (#8799) 2018-09-27 17:08:56 +02:00
Haelwenn Monnier
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
rhoio
c6e765f81e remove meta label in settings column (#8704) 2018-09-25 22:59:19 +09:00
Maciek Baron
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 Abkenar
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 Lee
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 Abkenar
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 Rochko
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 Rochko
011437dcb5
Group reports by target account (#8674) 
* Group reports by target account

* Improve CSS
 2018-09-13 03:44:08 +02:00
rhoio
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
ThibG
bda0f7ac73 Add a few black emojis that are to have a white outline (#8597) 2018-09-10 18:26:47 +02:00
Sorin Davidoi
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
ThibG
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
takayamaki
f5c052b5e6 refactor: getting-started__wrapper should contained in getting-started (#8532) 2018-08-31 03:43:02 +02:00
M Somerville
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)
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 Rochko
a2cabf3f4a
Add admin custom CSS setting (#8399) 
Fix #3894
 2018-08-24 04:33:27 +02:00
Eugen Rochko
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 Rochko
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
NecroTechno
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
cpsdqs
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
mayaeh
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 Rochko
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