Commit Graph

6772 Commits (3413105ec7b7c2d5afc94e1bb91f19714cf49887)

Author SHA1 Message Date
Lynx Kotoura 499af41a9d More polished light theme ()
* Revert "Remove pointer to light theme until it is more polished ()"

This reverts commit ab94772b5c.

* True up the hierarchical structure of mastodon-light theme

* Fix mastodon-light theme
2018-05-25 18:36:26 +02:00
Lynx Kotoura f78eee8d6a Fix color of /about/more link anchors () 2018-05-25 16:48:17 +02:00
ThibG d99f5bf6b5 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 daff01a5a5 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 d1b2466320 Ignore multiple occurrences of a hashtag within a status (fixes ) () 2018-05-25 14:26:45 +02:00
Thibaut Girka 5d64e6a618 Add missing comma in InitalStateSerializer (fixes ) 2018-05-25 14:06:48 +02:00
Thibaut Girka 2b26e7ed5f [Glitch] Use .star-icon instead of hardcoding color in detailed statuses
Port 6d50785928 to glitch-soc
2018-05-25 11:16:11 +02:00
ThibG 6d50785928 Use .star-icon instead of hardcoding color in detailed statuses (fixes ) () 2018-05-25 10:03:22 +09:00
ThibG 67f74f71aa Merge pull request from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2018-05-23 19:19:28 +02:00
ThibG e2697a3657 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 6b93ea6b27 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 bdfce657fb Change notification cleaning checkbox color (fixes ) 2018-05-23 18:29:15 +02:00
Thibaut Girka 28ccf0a464 Merge branch 'master' into glitch-soc/merge-upstream 2018-05-23 16:05:19 +02:00
ThibG a4527fe33c 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 c0b945b77e Fix tests for invites controller (regression from 32c3fc08fe) () 2018-05-23 06:32:10 +02:00
Eugen Rochko 32c3fc08fe Yeah, it was supposed to be #create? 2018-05-22 20:05:24 +02:00
Eugen Rochko 8205147d04 Bump version to 2.4.0 2018-05-22 19:39:35 +02:00
Eugen Rochko ab94772b5c Remove pointer to light theme until it is more polished () 2018-05-22 19:38:37 +02:00
ThibG 0f523757f2 Remove unneeded code now that attachment URL isn't appended to toots () 2018-05-22 19:32:02 +02:00
Eugen Rochko 2d34552fbc Do not encode HTML entities in initial Web Push payload body () 2018-05-22 18:12:45 +02:00
SerCom_KC 82da8b7ec6 [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 0a5527319a Add tests for report notes controller () 2018-05-22 14:45:10 +02:00
Eugen Rochko fd007264dc Enforce order on authorized applications page ()
Fix 
2018-05-22 14:44:53 +02:00
Yamagishi Kazutoshi ff98de966f 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 f5421e5309 Change column params on pinned timeline () 2018-05-22 13:26:06 +02:00
bsky 818fa6fc80 Remove outline () 2018-05-22 13:24:54 +02:00
Thibaut Girka cdb1d08119 [Glitch] Fetch relationships for search results in UI
Port webui changes from 750f3e64c9 to glitch-soc
2018-05-22 13:05:40 +02:00
Evgeny Petrov 96040c54f5 [RU] Added mastodon-light string () 2018-05-22 18:06:53 +09:00
ThibG 4749fe5019 Merge pull request from glitch-soc/merge-upstream
Merge upstream
2018-05-22 10:02:33 +02:00
David Yip 647f58f92a 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 9b1b968262 🌍: 🇵🇱⬆️ ()
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-05-21 23:12:35 +02:00
Jenkins 8f74ec1286 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-05-21 18:17:23 +00:00
ThibG f6d0f955bf 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 3315877afe Fix width only being set for standalone media 2018-05-21 18:25:41 +02:00
Thibaut Girka df3fa2cb78 [Glitch] Use real container width in MediaGallery srcSet
Port 765a8dad9a to glitch-soc
2018-05-21 17:55:07 +02:00
Thibaut Girka 4e5afb1c41 [Glitch] Do not override the default push notification settings
Port 6bee19117f to glitch-soc
2018-05-21 17:52:26 +02:00
ThibG abc2e46848 Merge pull request from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2018-05-21 17:51:06 +02:00
Eugen Rochko 20c650b644 Save onlyMedia prop when pinning column () 2018-05-21 17:49:10 +02:00
Eugen Rochko f548332935 Display only domain of report account if remote under comment () 2018-05-21 17:33:20 +02:00
Thibaut Girka 72c454e2b3 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 42531f89f8 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 4a0207e3ea 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 bbdce87b80 Bump version to 2.4.0rc5 2018-05-21 16:05:31 +02:00
Eugen Rochko 765a8dad9a Use real container width in MediaGallery srcSet ()
Fix 
2018-05-21 16:04:01 +02:00
Eugen Rochko f68736088b 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 ed4949c676 Unescape HTML entities in rich web push notifications in web UI () 2018-05-21 16:00:56 +02:00
Thibaut Girka cabd24ffc4 Recover glitch-soc specific styles that were removed by accident 2018-05-21 15:56:47 +02:00
SerCom_KC 8a8a47892a 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 eeb6fd44e1 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
Yamagishi Kazutoshi ccc240b59c Add media timeline () 2018-05-21 12:43:38 +02:00