Renato "Lond" Cerqueira
fe180f18ff
Change conditional to avoid nil into string error in sidekiq ( #5987 )
...
* Change conditional to avoid nil into string error in sidekiq
When obtaining information about users with mastodon in a different
subdomain, sidekiq was giving out a 'no implicit conversion of nil into String'
* Use presence instead of blank? with ternary.
Following suggestion on PR
2017-12-12 15:11:13 +01:00
Yamagishi Kazutoshi
b1d02c96db
Move files for GitHub to .github directory ( #5989 )
2017-12-12 15:10:12 +01:00
Yamagishi Kazutoshi
1486fd64cc
Move files for GitHub to .github directory ( #5989 )
2017-12-12 15:10:12 +01:00
beatrix
82ec368680
Merge pull request #264 from KnzkDev/add-ja
...
i18n: Add ja translate
2017-12-12 08:49:19 -05:00
beatrix
504c3d650f
Merge pull request #264 from KnzkDev/add-ja
...
i18n: Add ja translate
2017-12-12 08:49:19 -05:00
David Yip
ec9670a306
Remove themes.default from nl and pt-BR locales.
...
This translation has been supplanted by the flavours-related
translations.
2017-12-12 03:28:15 -06:00
David Yip
be33247235
Remove themes.default from nl and pt-BR locales.
...
This translation has been supplanted by the flavours-related
translations.
2017-12-12 03:28:15 -06:00
David Yip
a56c9ac5dc
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
2017-12-12 02:54:13 -06:00
David Yip
a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
2017-12-12 02:54:13 -06:00
cwm
6cbf55ce7b
readded connect for onboarding modal
2017-12-12 00:17:07 -06:00
cwm
9b7208f4b4
readded connect for onboarding modal
2017-12-12 00:17:07 -06:00
cwm
c746388452
remove unneeded imports from getting_started_misc
2017-12-12 00:09:18 -06:00
cwm
b358483ef2
remove unneeded imports from getting_started_misc
2017-12-12 00:09:18 -06:00
cwm
975d888f5c
add components to getting started column
2017-12-12 00:01:17 -06:00
cwm
37ced4c903
add components to getting started column
2017-12-12 00:01:17 -06:00
ncls7615
6bfbeb1fe1
add ja
2017-12-12 13:13:54 +09:00
ncls7615
b93ad3d0e8
add ja
2017-12-12 13:13:54 +09:00
ncls7615
a559a2cc9d
add ja for fav conf
2017-12-12 13:05:48 +09:00
ncls7615
c0c4526283
add ja for fav conf
2017-12-12 13:05:48 +09:00
Gô Shoemake
8932a56d58
Merge pull request #262 from chriswmartin/fix-oauth-pack
...
Add missing set pack to authorizations_controller
2017-12-11 19:34:19 -08:00
Gô Shoemake
04eaa1943f
Merge pull request #262 from chriswmartin/fix-oauth-pack
...
Add missing set pack to authorizations_controller
2017-12-11 19:34:19 -08:00
ncls7615
6fb6b1eb5d
optimize paperclip
2017-12-12 12:29:09 +09:00
ncls7615
c95af71da5
optimize paperclip
2017-12-12 12:29:09 +09:00
Akihiko Odaki
a90fa13235
Change account_id non-nullable in lists ( #5979 )
2017-12-12 04:11:17 +01:00
Akihiko Odaki
14c4a33cd9
Change account_id non-nullable in lists ( #5979 )
2017-12-12 04:11:17 +01:00
Eugen Rochko
d5f4baf720
Improve public status page title ( #5985 )
2017-12-12 03:56:30 +01:00
Eugen Rochko
30d2ea03b0
Improve public status page title ( #5985 )
2017-12-12 03:56:30 +01:00
Eugen Rochko
7f286d1af0
Fix #5953 - Add GET /api/v1/accounts/:id/lists ( #5983 )
2017-12-12 03:55:39 +01:00
Eugen Rochko
1356ed72cd
Fix #5953 - Add GET /api/v1/accounts/:id/lists ( #5983 )
2017-12-12 03:55:39 +01:00
Eugen Rochko
3b69e9b99c
Exclude moved accounts from search results ( #5984 )
2017-12-12 02:14:33 +01:00
Eugen Rochko
481fac7c84
Exclude moved accounts from search results ( #5984 )
2017-12-12 02:14:33 +01:00
cwm
690cd248b1
change pack to 'auth'
2017-12-11 18:14:41 -06:00
cwm
0a52e37648
change pack to 'auth'
2017-12-11 18:14:41 -06:00
cwm
7e8c87e443
load pack
2017-12-11 17:54:40 -06:00
cwm
44992df257
load pack
2017-12-11 17:54:40 -06:00
Erin
bdf25f5a60
reblog_service.rb: Status#local_only -> local_only?
2017-12-11 17:39:11 -06:00
Erin
2efffe77dc
reblog_service.rb: Status#local_only -> local_only?
2017-12-11 17:39:11 -06:00
Erin
eb0660f6ef
move outbox filtering to Status#permitted_for (as per @ekiru)
2017-12-11 15:28:04 -06:00
Erin
c5a4eda694
move outbox filtering to Status#permitted_for (as per @ekiru)
2017-12-11 15:28:04 -06:00
Erin
080149acaf
post_status_service: stylistic change (local_only -> local_only?)
2017-12-11 15:27:31 -06:00
Erin
3ec47e732b
post_status_service: stylistic change (local_only -> local_only?)
2017-12-11 15:27:31 -06:00
Quenty31
f75a91716b
Tiny little change ( #5981 )
2017-12-11 20:53:29 +01:00
Quenty31
c588fcf4bc
Tiny little change ( #5981 )
2017-12-11 20:53:29 +01:00
kibigo!
1d7b78817a
Fixed index in webpack config
2017-12-11 10:45:21 -08:00
kibigo!
8aa527434c
Fixed index in webpack config
2017-12-11 10:45:21 -08:00
beatrix
7e1a419585
Merge pull request #259 from KnzkDev/flavours-ja
...
i18n: Add ja translate for flavour/skin ux
2017-12-11 10:56:41 -05:00
beatrix
7d024a6b68
Merge pull request #259 from KnzkDev/flavours-ja
...
i18n: Add ja translate for flavour/skin ux
2017-12-11 10:56:41 -05:00
ncls7615
96a7247e9c
add ja
2017-12-12 00:28:33 +09:00
ncls7615
d8206d1931
add ja
2017-12-12 00:28:33 +09:00
beatrix
af0031fe1b
Merge pull request #254 from glitch-soc/new-theme-ux
...
New flavour/skin UX
2017-12-11 09:36:14 -05:00
