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

39673 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
6d50785928 Use .star-icon instead of hardcoding color in detailed statuses (fixes #7610) (#7613) 2018-05-25 10:03:22 +09:00
ThibG
2587fcdd27 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
88ec5193cb
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
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
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
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
bdfce657fb Change notification cleaning checkbox color (fixes #511) 2018-05-23 18:29:15 +02:00
Thibaut Girka
0553496b76 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
Thibaut Girka
e0ef89c73f 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
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
c0b945b77e Fix tests for invites controller (regression from 32c3fc08fe) (#7597) 2018-05-23 06:32:10 +02:00
Yamagishi Kazutoshi
6d99a0b652 Fix tests for invites controller (regression from 4d81809f36) (#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
4d81809f36
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
7745a22ec7
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
Eugen Rochko
f8cf85db3b
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
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
2d34552fbc Do not encode HTML entities in initial Web Push payload body (#7592) 2018-05-22 18:12:45 +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
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
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
0a5527319a Add tests for report notes controller (#7589) 2018-05-22 14:45:10 +02:00
Shuhei Kitagawa
12e590edd7 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
Eugen Rochko
36e47a31e3
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
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
f5421e5309 Change column params on pinned timeline (#7581) 2018-05-22 13:26:06 +02:00
Yamagishi Kazutoshi
06252ec71e 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
bsky
92b09d90c8 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
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
96040c54f5 [RU] Added mastodon-light string (#7583) 2018-05-22 18:06:53 +09:00
Evgeny Petrov
a744042cf1 [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
ThibG
2289250f69
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
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
9b1b968262 🌍: 🇵🇱⬆️ (#7580) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-05-21 23:12:35 +02:00
Marcin Mikołajczak
810f92e697 🌍: 🇵🇱⬆️ (#7580) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-05-21 23:12:35 +02:00