1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-30 12:20:35 +00:00
Commit graph

6973 commits

Author SHA1 Message Date
Yamagishi Kazutoshi 8182b61518 Enable media timeline () 2018-05-25 18:36:46 +02:00
Lynx Kotoura 7ea91dcbb3 More polished light theme ()
* Revert "Remove pointer to light theme until it is more polished ()"

This reverts commit f8cf85db3b.

* True up the hierarchical structure of mastodon-light theme

* Fix mastodon-light theme
2018-05-25 18:36:26 +02:00
Lynx Kotoura 6042403621 Fix color of /about/more link anchors () 2018-05-25 16:48:17 +02:00
ThibG 9b75a13104
Merge pull request from ThibG/glitch-soc/fixes/max_toot_chars
Add missing comma in InitalStateSerializer (fixes )
2018-05-25 14:44:20 +02:00
Jeroen 3f8f5642a1 Added the law requirements for the EU/EEA ()
* Added the law requirements for the EU/EEA

See article 8 of the GDPR

* fix

* i18n-tasks normalize
2018-05-25 14:27:14 +02:00
ThibG cdbdf7f98b Ignore multiple occurrences of a hashtag within a status (fixes ) () 2018-05-25 14:26:45 +02:00
Thibaut Girka c1d0f96bb4 Add missing comma in InitalStateSerializer (fixes ) 2018-05-25 14:06:48 +02:00
Thibaut Girka 4c91215e1f [Glitch] Use .star-icon instead of hardcoding color in detailed statuses
Port 2587fcdd27 to glitch-soc
2018-05-25 11:16:11 +02:00
ThibG 2587fcdd27 Use .star-icon instead of hardcoding color in detailed statuses (fixes ) () 2018-05-25 10:03:22 +09:00
ThibG 88ec5193cb
Merge pull request from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2018-05-23 19:19:28 +02:00
ThibG 7719fe0df2
Merge pull request from ThibG/glitch-soc/features/fetch-relationships-on-search
[Glitch] Fetch relationships for search results in UI
2018-05-23 18:54:51 +02:00
ThibG e4c82e33e4
Merge pull request from ThibG/glitch-soc/fixes/fix-ckbox-color
Change notification cleaning checkbox color (fixes )
2018-05-23 18:54:31 +02:00
Thibaut Girka 0553496b76 Change notification cleaning checkbox color (fixes ) 2018-05-23 18:29:15 +02:00
Thibaut Girka e0ef89c73f Merge branch 'master' into glitch-soc/merge-upstream 2018-05-23 16:05:19 +02:00
ThibG d8864b9e9d Fix caret position after selected suggestion and media upload ()
* Fix media upload reseting caret position to last inserted emoji

* Fix caret position after inserting suggestions (fixes )
2018-05-23 15:20:15 +02:00
Yamagishi Kazutoshi 6d99a0b652 Fix tests for invites controller (regression from 4d81809f36) () 2018-05-23 06:32:10 +02:00
Eugen Rochko 4d81809f36
Yeah, it was supposed to be #create? 2018-05-22 20:05:24 +02:00
Eugen Rochko 7745a22ec7
Bump version to 2.4.0 2018-05-22 19:39:35 +02:00
Eugen Rochko f8cf85db3b
Remove pointer to light theme until it is more polished () 2018-05-22 19:38:37 +02:00
ThibG 39d70f375f Remove unneeded code now that attachment URL isn't appended to toots () 2018-05-22 19:32:02 +02:00
Eugen Rochko 1a564df586
Do not encode HTML entities in initial Web Push payload body () 2018-05-22 18:12:45 +02:00
SerCom_KC 4c9d5a500d [WIP] i18n: Update Simplified Chinese translations ()
* i18n: (zh-CN) 

* Rewording
This placeholder is also seen on single user page at Moderation > Accounts, where "this report" doesn't make sense.

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) Improvements
2018-05-22 15:26:42 +02:00
Shuhei Kitagawa 12e590edd7 Add tests for report notes controller () 2018-05-22 14:45:10 +02:00
Eugen Rochko 36e47a31e3
Enforce order on authorized applications page ()
Fix 
2018-05-22 14:44:53 +02:00
Yamagishi Kazutoshi 4eeda67727 Hide section headline for timelines in production ()
* Hide section headline for timelines in production

* comment out
2018-05-22 14:44:32 +02:00
Yamagishi Kazutoshi 06252ec71e Change column params on pinned timeline () 2018-05-22 13:26:06 +02:00
bsky 92b09d90c8 Remove outline () 2018-05-22 13:24:54 +02:00
Thibaut Girka 247f55f673 [Glitch] Fetch relationships for search results in UI
Port webui changes from cba2897108 to glitch-soc
2018-05-22 13:05:40 +02:00
Evgeny Petrov a744042cf1 [RU] Added mastodon-light string () 2018-05-22 18:06:53 +09:00
ThibG 2289250f69
Merge pull request from glitch-soc/merge-upstream
Merge upstream
2018-05-22 10:02:33 +02:00
David Yip 6dd676e006
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
 	config/locales/pl.yml

The conflict in config/locales/pl.yml concerns the themes key, which is
not used in glitchsoc.  Resolution: remove the themes key-related
changes, i.e. accept-ours.
2018-05-21 16:30:24 -05:00
Marcin Mikołajczak 810f92e697 🌍: 🇵🇱⬆️ ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-05-21 23:12:35 +02:00
Jenkins f93806ea55 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-05-21 18:17:23 +00:00
ThibG cc230e5d57
Merge pull request from ThibG/glitch-soc/fixes/port-upstream-fixes
Port various WebUI fixes from upstream
2018-05-21 19:20:17 +02:00
Thibaut Girka d0b2f71501 Fix width only being set for standalone media 2018-05-21 18:25:41 +02:00
Thibaut Girka 3ad3cee44c [Glitch] Use real container width in MediaGallery srcSet
Port 22e067bf5c to glitch-soc
2018-05-21 17:55:07 +02:00
Thibaut Girka 463078dcc4 [Glitch] Do not override the default push notification settings
Port 1951ff41b3 to glitch-soc
2018-05-21 17:52:26 +02:00
ThibG 162f1863a7
Merge pull request from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2018-05-21 17:51:06 +02:00
Eugen Rochko 5ea643b279
Save onlyMedia prop when pinning column () 2018-05-21 17:49:10 +02:00
Eugen Rochko 40ef46dbef
Display only domain of report account if remote under comment () 2018-05-21 17:33:20 +02:00
Thibaut Girka a4c9bda771 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/javascript/styles/mastodon-light.scss
	config/locales/en.yml
	config/locales/fr.yml
	config/locales/simple_form.pl.yml
	config/themes.yml

Conflicts resolved by deleting config/themes.yml,
marking app/javascript/styles/mastodon-light.scss as added,
and taking all new translation strings, not removing anything from
them.
2018-05-21 16:40:02 +02:00
ThibG 98ecadbf99
Merge pull request from ThibG/glitch-soc/fixes/port-scss
Port SCSS changes from upstream
2018-05-21 16:29:05 +02:00
Yamagishi Kazutoshi 46061dc041 Add exact attribute to WrappedRoute for community timeline ()
* Add extra attribute to WrappedRoute for community timeline

* fix
2018-05-21 16:26:00 +02:00
Eugen Rochko 292c987522
Bump version to 2.4.0rc5 2018-05-21 16:05:31 +02:00
Eugen Rochko 22e067bf5c
Use real container width in MediaGallery srcSet ()
Fix 
2018-05-21 16:04:01 +02:00
Eugen Rochko 32d4372381
Use #any? instead of #exists? when checking media attachments ()
If media_attachments are not loaded, SQL query is the same, but
the #exists? method performs SQL query even if preloaded
2018-05-21 16:01:16 +02:00
Eugen Rochko e583f110c3
Unescape HTML entities in rich web push notifications in web UI () 2018-05-21 16:00:56 +02:00
Thibaut Girka c53aacdfa0 Recover glitch-soc specific styles that were removed by accident 2018-05-21 15:56:47 +02:00
SerCom_KC 41b2cfe5b8 i18n: Update Simplified Chinese translations ()
* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) , 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) , ,  (, )

* i18n: (zh-CN) , 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) , 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) Normalization and improvements

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) , 

* i18n: (zh-CN) 

* i18n: (zh-CN) , 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) 

* i18n: (zh-CN) Improvment

* i18n: (zh-CN) 
2018-05-21 13:40:48 +02:00
Sylvhem ea969000a5 Add a light theme ()
* Add a light theme to Mastodon

This add a second default theme to Mastodon. This new theme is supposed to be a light version of the dark original one.

* Update locales

Update the English and French locales.

* Change capitalization of hexadecimal triplets

Change capitalization of hexadecimal color codes to match Code Climate's recomandation.

* Add variable

Add a new variable to use instead of hardcoding a color. Change made to match Code Climate's recomandation.

* Use Mastodon branding palette

Replace the colors previously used by the ones found in Mastodon branding palette.
The resulting theme is lighter than the previous version.

* Make the overlay background white

Make the overly background used on on sensitive medias white instead of black

* Change the color used on the envelop icon

Change the color used on the envelop icon for a darker one. The same color is now used on both the envelop icon and the padlock icon.

* Add contrast

Add contrast to various places inside the main interface and the profile pages.

* Change the text color used in the compose form

Change the text color used in the compose form for a darker one.

* Make the code easier to read

Add some blank lines to make the code easier to parse for a human eye.

* Change columns' background default colors

Change columns' background default colors, making the composition column the darker one.

* Change the color of the log in button

Change the log in button's text color to make it more readable.

* Fix the color of the boost buttons on the landing page

The disabled boost buttons on the landing page are now of the same color that the other disabled buttons.

* Change the colors used in the dropdown menu

Make the dropdown menu light instead of dark.
2018-05-21 13:40:31 +02:00