Renato "Lond" Cerqueira
15bc3398f7
Return false if object does not respond to url ( #5988 )
...
Avoid error when the service returns a mostly valid oembed, but has no
url in it, causing a MethodError: undefined method `url'
for #<OEmbed::Response::Photo:0x000056505def9620>
2017-12-12 15:12:09 +01:00
Renato "Lond" Cerqueira
ab3d248f48
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
beatrix
82ec368680
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
a56c9ac5dc
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
2017-12-12 02:54:13 -06:00
ncls7615
6bfbeb1fe1
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
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
ncls7615
6fb6b1eb5d
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
Eugen Rochko
d5f4baf720
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
3b69e9b99c
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
7e8c87e443
load pack
2017-12-11 17:54:40 -06:00
Quenty31
f75a91716b
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
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
ncls7615
96a7247e9c
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
Eugen Rochko
31fe0d067b
Apply a 25x rate limit by IP even to authenticated requests ( #5948 )
2017-12-11 15:32:29 +01:00
beatrix
cb05ff359f
Merge pull request #255 from KnzkDev/remove-picture
...
Remove getting-started picture
2017-12-11 09:08:13 -05:00
Akihiko Odaki
109886507e
Remove preview_card fabricator ( #5975 )
...
preview_card fabricator has a removed attribute, status, and is no longer
functional.
2017-12-11 22:22:08 +09:00
David Yip
b1f803d360
Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController.
2017-12-11 00:17:30 -06:00
ncls7615
58a133978b
remove picture
2017-12-11 13:52:17 +09:00
kibigo!
d9e1496990
Added styling
2017-12-10 20:32:28 -08:00
kibigo!
a1c79ef544
Screenshot support for themes
2017-12-10 20:32:28 -08:00
kibigo!
901c08a999
Moved flavour UI into own prefs tab
2017-12-10 20:32:27 -08:00
beatrix
252de634bb
Merge pull request #250 from chriswmartin/fav-confirm-modal
...
add favourite confirmation modal
2017-12-10 23:10:19 -05:00
beatrix
bc727ab41c
Merge pull request #252 from ncls7615/glitch-langfiles
...
i18n: Add translate and fix problems
2017-12-10 22:53:48 -05:00
Sylvhem
e38b8c980f
Change the disclaimer under the sign up form ( #5817 )
...
* Change the disclaimer below the sign up form
Change the disclaimer below the sign up form on the home page. The current text is linking to the /about/more page under "our terms of service" and to the /terms page under "privacy policy". This change intend to make the message more coherent.
Change l’avertissement en-dessous du formulaire d’inscription sur la page d’accueil. Le texte actuel redirige vers /about/more sous un lien intitulé "nos conditions d’utilisation" et vers /terms via "notre politique de confidentialité". Ce changement vise à rendre le message plus cohérent.
* Second take on the disclaimer
A new version of the disclaimer, based on feedback.
Une nouvelle version de l’avertissement, basé sur les premiers retours.
2017-12-11 02:30:43 +01:00
ncls7615
b07111ceba
add comma
2017-12-11 09:50:52 +09:00
ncls7615
3e6949b554
" => '
2017-12-11 09:46:17 +09:00
ncls7615
5cd4e577c2
Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles
...
# Conflicts:
# app/javascript/glitch/locales/ja.json
2017-12-11 09:43:21 +09:00
cwm
2f56e7e00d
use single quotes in locale entry
2017-12-10 15:39:23 -06:00
cwm
34630e00cb
pulled master, moved locale entry to new location
2017-12-10 15:22:15 -06:00
cwm
06c490be96
removed unneeded actions_modal div
2017-12-10 15:14:56 -06:00
beatrix
3f30ccbf08
Merge pull request #246 from glitch-soc/theme-intl8n
...
Internationalization for flavours and skins
2017-12-10 15:41:22 -05:00
kibigo!
ea3154176e
Removed MORE theme localizns
2017-12-10 11:38:30 -08:00
kibigo!
bb65adc0c0
Move ja localization to new locaiton
2017-12-10 11:09:59 -08:00
kibigo!
b27126f1d6
Linting fixes
2017-12-10 11:08:04 -08:00
kibigo!
853082e760
Only localize js when there's a theme
2017-12-10 11:08:04 -08:00
kibigo!
99e8710095
Javascript intl8n flavour support
2017-12-10 11:08:04 -08:00
kibigo!
f0c12b28fd
Removed unused theme localization key
2017-12-10 11:08:04 -08:00
kibigo!
f4c233f59f
Ruby intl8n for themes
2017-12-10 11:08:04 -08:00
Andrea Scarpino
e8198cd298
Fix account and tag searches with leading/trailing spaces ( #5965 )
...
* Strip leading & trailing spaces from account query
* Strip leading & trailing spaces from tag search
2017-12-10 19:35:46 +01:00
Lynx Kotoura
188f230f1e
Refix extraspace for emojis ( #5964 )
...
Fix misalignment between emoji sizes
2017-12-10 17:56:05 +01:00
abcang
a55211ee5b
Save media outside transaction ( #5959 )
2017-12-10 16:33:52 +01:00
cwm
4b9fa497c6
removed one last app settings addition
2017-12-10 09:25:44 -06:00
