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
1486fd64cc
Move files for GitHub to .github directory ( #5989 )
2017-12-12 15:10:12 +01:00
504c3d650f
Merge pull request #264 from KnzkDev/add-ja
...
i18n: Add ja translate
2017-12-12 08:49:19 -05:00
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
a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
2017-12-12 02:54:13 -06:00
b93ad3d0e8
add ja
2017-12-12 13:13:54 +09:00
c0c4526283
add ja for fav conf
2017-12-12 13:05:48 +09:00
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
c95af71da5
optimize paperclip
2017-12-12 12:29:09 +09:00
14c4a33cd9
Change account_id non-nullable in lists ( #5979 )
2017-12-12 04:11:17 +01:00
30d2ea03b0
Improve public status page title ( #5985 )
2017-12-12 03:56:30 +01:00
1356ed72cd
Fix #5953 - Add GET /api/v1/accounts/:id/lists ( #5983 )
2017-12-12 03:55:39 +01:00
481fac7c84
Exclude moved accounts from search results ( #5984 )
2017-12-12 02:14:33 +01:00
0a52e37648
change pack to 'auth'
2017-12-11 18:14:41 -06:00
44992df257
load pack
2017-12-11 17:54:40 -06:00
c588fcf4bc
Tiny little change ( #5981 )
2017-12-11 20:53:29 +01:00
8aa527434c
Fixed index in webpack config
2017-12-11 10:45:21 -08:00
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
d8206d1931
add ja
2017-12-12 00:28:33 +09:00
771b950feb
Merge pull request #254 from glitch-soc/new-theme-ux
...
New flavour/skin UX
2017-12-11 09:36:14 -05:00
feed07227b
Apply a 25x rate limit by IP even to authenticated requests ( #5948 )
2017-12-11 15:32:29 +01:00
0cd5f2a61f
Merge pull request #255 from KnzkDev/remove-picture
...
Remove getting-started picture
2017-12-11 09:08:13 -05:00
e56323a4dd
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
204688e803
Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController.
2017-12-11 00:17:30 -06:00
9d5ecdbf41
remove picture
2017-12-11 13:52:17 +09:00
ed7231947c
Added styling
2017-12-10 20:32:28 -08:00
bdca1614d5
Screenshot support for themes
2017-12-10 20:32:28 -08:00
dabf66e676
Moved flavour UI into own prefs tab
2017-12-10 20:32:27 -08:00
08b0861b96
Merge pull request #250 from chriswmartin/fav-confirm-modal
...
add favourite confirmation modal
2017-12-10 23:10:19 -05:00
01a3461bef
Merge pull request #252 from ncls7615/glitch-langfiles
...
i18n: Add translate and fix problems
2017-12-10 22:53:48 -05:00
84d5bfb35e
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
d420e2f047
add comma
2017-12-11 09:50:52 +09:00
279231c5dd
" => '
2017-12-11 09:46:17 +09:00
a98b0a47ef
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
0466aa8d08
use single quotes in locale entry
2017-12-10 15:39:23 -06:00
072ab191cc
pulled master, moved locale entry to new location
2017-12-10 15:22:15 -06:00
eec5d350fd
removed unneeded actions_modal div
2017-12-10 15:14:56 -06:00
26c9b9fa27
Merge pull request #246 from glitch-soc/theme-intl8n
...
Internationalization for flavours and skins
2017-12-10 15:41:22 -05:00
64b839b769
Removed MORE theme localizns
2017-12-10 11:38:30 -08:00
cd107e92cb
Move ja localization to new locaiton
2017-12-10 11:09:59 -08:00
6b7085a33e
Linting fixes
2017-12-10 11:08:04 -08:00
1c728df92e
Only localize js when there's a theme
2017-12-10 11:08:04 -08:00
b28cd6769c
Javascript intl8n flavour support
2017-12-10 11:08:04 -08:00
8394430081
Removed unused theme localization key
2017-12-10 11:08:04 -08:00
d08d0f9f33
Ruby intl8n for themes
2017-12-10 11:08:04 -08:00
6a82939adb
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
98aa96b8d6
Refix extraspace for emojis ( #5964 )
...
Fix misalignment between emoji sizes
2017-12-10 17:56:05 +01:00
3caec1ecc2
Save media outside transaction ( #5959 )
2017-12-10 16:33:52 +01:00
066458a659
removed one last app settings addition
2017-12-10 09:25:44 -06:00
2950de86c6
Update devise.fr.yml ( #5963 )
...
ludicrously tiny but necessary typofix (wrong accent)
2017-12-11 00:24:29 +09:00
Renato "Lond" Cerqueira