Commit graph

6663 commits

Author SHA1 Message Date
ThibG
88ec5193cb
Merge pull request #510 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2018-05-23 19:19:28 +02:00
ThibG
7719fe0df2
Merge pull request #505 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 #512 from ThibG/glitch-soc/fixes/fix-ckbox-color
Change notification cleaning checkbox color (fixes #511)
2018-05-23 18:54:31 +02:00
Thibaut Girka
0553496b76 Change notification cleaning checkbox color (fixes #511) 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 (#7595)
* Fix media upload reseting caret position to last inserted emoji

* Fix caret position after inserting suggestions (fixes #6089)
2018-05-23 15:20:15 +02:00
Yamagishi Kazutoshi
6d99a0b652 Fix tests for invites controller (regression from 4d81809f36) (#7597) 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 (#7594) 2018-05-22 19:38:37 +02:00
ThibG
39d70f375f Remove unneeded code now that attachment URL isn't appended to toots (#7593) 2018-05-22 19:32:02 +02:00
Eugen Rochko
1a564df586
Do not encode HTML entities in initial Web Push payload body (#7592) 2018-05-22 18:12:45 +02:00
SerCom_KC
4c9d5a500d [WIP] i18n: Update Simplified Chinese translations (#7576)
* i18n: (zh-CN) #7027

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

* i18n: (zh-CN) #6425

* i18n: (zh-CN) #6497

* i18n: (zh-CN) #6246

* i18n: (zh-CN) Improvements
2018-05-22 15:26:42 +02:00
Shuhei Kitagawa
12e590edd7 Add tests for report notes controller (#7589) 2018-05-22 14:45:10 +02:00
Eugen Rochko
36e47a31e3
Enforce order on authorized applications page (#7587)
Fix #7586
2018-05-22 14:44:53 +02:00
Yamagishi Kazutoshi
4eeda67727 Hide section headline for timelines in production (#7590)
* 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 (#7581) 2018-05-22 13:26:06 +02:00
bsky
92b09d90c8 Remove outline (#7582) 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 (#7583) 2018-05-22 18:06:53 +09:00
ThibG
2289250f69
Merge pull request #503 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 🌍: 🇵🇱⬆️ (#7580)
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 #495 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 #499 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 (#7575) 2018-05-21 17:49:10 +02:00
Eugen Rochko
40ef46dbef
Display only domain of report account if remote under comment (#7574) 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 #492 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 (#7572)
* 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 (#7571)
Fix #7568
2018-05-21 16:04:01 +02:00
Eugen Rochko
32d4372381
Use #any? instead of #exists? when checking media attachments (#7570)
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 (#7569) 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 (#7565)
* i18n: (zh-CN) #7532

* i18n: (zh-CN) #6984

* i18n: (zh-CN) #7391, #7507

* i18n: (zh-CN) #6998

* i18n: (zh-CN) #7074

* i18n: (zh-CN) #7000, #7032, #7131 (#7032, #7040)

* i18n: (zh-CN) #7130, #7188

* i18n: (zh-CN) #6486

* i18n: (zh-CN) #6292

* i18n: (zh-CN) #7347

* i18n: (zh-CN) #6661

* i18n: (zh-CN) #6425

* i18n: (zh-CN) #6597

* i18n: (zh-CN) #6695

* i18n: (zh-CN) #6325

* i18n: (zh-CN) #6460, #7375

* i18n: (zh-CN) #6872

* i18n: (zh-CN) #6818

* i18n: (zh-CN) #7452

* i18n: (zh-CN) #7176

* i18n: (zh-CN) #6460

* i18n: (zh-CN) #7213

* i18n: (zh-CN) #7376

* i18n: (zh-CN) #6556

* i18n: (zh-CN) #6645

* i18n: (zh-CN) #6448

* i18n: (zh-CN) #5303

* i18n: (zh-CN) #7445

* i18n: (zh-CN) Normalization and improvements

* i18n: (zh-CN) #7391

* i18n: (zh-CN) #6627

* i18n: (zh-CN) #6956, #7546

* i18n: (zh-CN) #6636

* i18n: (zh-CN) #6610, #6875

* i18n: (zh-CN) #6887

* i18n: (zh-CN) #4514

* i18n: (zh-CN) #6628

* i18n: (zh-CN) #6771

* i18n: (zh-CN) #6772

* i18n: (zh-CN) #7178

* i18n: (zh-CN) #7521

* i18n: (zh-CN) #6570

* i18n: (zh-CN) #6593

* i18n: (zh-CN) #6423

* i18n: (zh-CN) #6157

* i18n: (zh-CN) #7089

* i18n: (zh-CN) #6733

* i18n: (zh-CN) #7072

* i18n: (zh-CN) #6520

* i18n: (zh-CN) Improvment

* i18n: (zh-CN) #6631
2018-05-21 13:40:48 +02:00
Sylvhem
ea969000a5 Add a light theme (#7027)
* 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
7403e5d306 Add media timeline (#6631) 2018-05-21 12:43:38 +02:00
Eugen Rochko
05f8c375a2
Remove small pagination limit from context API (#7564)
Fix #7557
2018-05-21 12:43:05 +02:00
Eugen Rochko
9ada532809
Convert rich push notifications to plaintext in webapp (#7563)
* Convert rich push notifications to plaintext in webapp

* Fix code style issues
2018-05-21 03:35:37 +02:00
Quentí
6eb2bc4348 [i18n] Update for Occitan (#7558)
* Update oc.json

* Update oc.yml

* Update simple_form.oc.yml
2018-05-20 20:26:32 +02:00
Eugen Rochko
779eb07d75
Improve default background of public profile header (#7556)
Looks better when no header image is set
2018-05-20 13:09:28 +02:00
Thibaut Girka
d250e072a2 In footer, replace text "Mastodon" with logo
Port SCSS changes from 93c66f0c03 to glitch-soc
2018-05-20 11:29:06 +02:00
Thibaut Girka
9ed8051961 Add preference to hide following/followers lists
Port SCSS from 1e02dc8715
2018-05-20 11:28:58 +02:00
Thibaut Girka
50540446f5 [Glitch] Improvements to toots display in admin view
Port SCSS changes from 0f2fbf7d05
(I'm sorry for the animated rainbows)
2018-05-20 11:28:58 +02:00
David Yip
2f9bd86f6e
Merge pull request #470 from ThibG/glitch-soc/fixes/status-click-detailed
Widen clickable area of toots
2018-05-20 03:03:39 -05:00