me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
6777 commits 2 branches 0 tags 429 MiB
Commit graph

6777 commits

This branch
This branch
All branches
Author SHA1 Message Date
ThibG
2e58fed4c6 Merge pull request #518 from ThibG/glitch-soc/merge-master 
Merge upstream changes
 2018-05-25 21:41:25 +02:00
Thibaut Girka
4cb367e6d4 Merge branch 'master' into glitch-soc/merge-master 
Conflicts:
	app/javascript/styles/mastodon-light.scss
	config/themes.yml

Removed config/themes.yml, took upstream's mastodon-light.scss
 2018-05-25 18:59:02 +02:00
Isatis
a1db299d79 Remove Puma pidfile before boot if container receives SIGTERM (#7052) 2018-05-25 18:50:31 +02:00
Akihiko Odaki
4e718bbb25 Introduce flat layout to contexts reducer (#7150) 
This allows to filter out replies in threads even if contexts of those
replies are not fetched.
 2018-05-25 18:46:28 +02:00
Yamagishi Kazutoshi
590ae5ac66 Enable media timeline (#7598) 2018-05-25 18:36:46 +02:00
Lynx Kotoura
499af41a9d More polished light theme (#7620) 
* Revert "Remove pointer to light theme until it is more polished (#7594)"

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 (#7618) 2018-05-25 16:48:17 +02:00
ThibG
d99f5bf6b5 Merge pull request #517 from ThibG/glitch-soc/fixes/max_toot_chars 
Add missing comma in InitalStateSerializer (fixes #516)
 2018-05-25 14:44:20 +02:00
Jeroen
daff01a5a5 Added the law requirements for the EU/EEA (#7605) 
* 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 #7585) (#7606) 2018-05-25 14:26:45 +02:00
Thibaut Girka
5d64e6a618 Add missing comma in InitalStateSerializer (fixes #516) 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 #7610) (#7613) 2018-05-25 10:03:22 +09:00
ThibG
67f74f71aa Merge pull request #510 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-05-23 19:19:28 +02:00
ThibG
e2697a3657 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
6b93ea6b27 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
bdfce657fb Change notification cleaning checkbox color (fixes #511) 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 (#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
c0b945b77e Fix tests for invites controller (regression from 32c3fc08fe) (#7597) 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 (#7594) 2018-05-22 19:38:37 +02:00
ThibG
0f523757f2 Remove unneeded code now that attachment URL isn't appended to toots (#7593) 2018-05-22 19:32:02 +02:00
Eugen Rochko
2d34552fbc Do not encode HTML entities in initial Web Push payload body (#7592) 2018-05-22 18:12:45 +02:00
SerCom_KC
82da8b7ec6 [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
0a5527319a Add tests for report notes controller (#7589) 2018-05-22 14:45:10 +02:00
Eugen Rochko
fd007264dc Enforce order on authorized applications page (#7587) 
Fix #7586
 2018-05-22 14:44:53 +02:00
Yamagishi Kazutoshi
ff98de966f 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
f5421e5309 Change column params on pinned timeline (#7581) 2018-05-22 13:26:06 +02:00
bsky
818fa6fc80 Remove outline (#7582) 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 (#7583) 2018-05-22 18:06:53 +09:00
ThibG
4749fe5019 Merge pull request #503 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 🌍: 🇵🇱⬆️ (#7580) 
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 #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
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 #499 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 (#7575) 2018-05-21 17:49:10 +02:00
Eugen Rochko
f548332935 Display only domain of report account if remote under comment (#7574) 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 #492 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 (#7572) 
* 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 (#7571) 
Fix #7568
 2018-05-21 16:04:01 +02:00
Eugen Rochko
f68736088b 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