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
Erin
6f3321fe4f
set local_only in a before_create callback instead of status service
2017-12-10 21:39:27 -06:00
Erin
7fc6f40a88
remove vestigial Status#local_only? definition
2017-12-10 21:25:36 -06:00
Erin
c3e84d208c
post_status_service.rb: save the status after setting local_only
2017-12-10 20:35:57 -06:00
Erin
278d34a0ec
Status#not_local_only scope should match nils too
2017-12-10 20:35:42 -06: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
Erin
3d1bef760d
filter local-only toots from AP outboxes
2017-12-10 19:07:43 -06: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
Erin
b463321c6f
filter local-only statuses from public pages
2017-12-10 17:23:01 -06:00
Erin
a80c329328
replace reblog service check for an 👁️ with #local_only
2017-12-10 17:12:21 -06:00
Erin
d431bb8930
set local_only flag on statuses in post_status_service
2017-12-10 17:04:32 -06:00
Erin
993449ee59
status: stub local_only?, add scope, add marked_local_only?
2017-12-10 17:04:28 -06:00
Erin
5eadff9883
add a local_only column to the statuses table
2017-12-10 16:41:25 -06: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
goofy-bz
9becc9b0fe
Update devise.fr.yml ( #5963 )
...
ludicrously tiny but necessary typofix (wrong accent)
2017-12-11 00:24:29 +09:00
cwm
0d6a515145
removed app settings additions
2017-12-10 09:10:47 -06:00
Quenty31
7f56924d71
l10n i18n OC: corrections ( #5962 )
...
* filling missing strings
* Small changes
Better way of saying
+ removed 2 finals dots
* Corrections
* Corrections
Now with final point or without, just like the EN file
* Update oc.json
2017-12-11 00:07:24 +09:00
ncls7615
2a69b778c1
add and fix
2017-12-10 17:33:22 +09:00
beatrix
f836468a7e
Merge pull request #248 from chriswmartin/glitch-theme-lists
...
add lists to glitch flavour!
2017-12-10 00:53:37 -05:00
beatrix
ce2528c50b
Merge pull request #237 from dexamphetamine/jpn-localization
...
i18n: add ja glitch strings
2017-12-09 23:34:13 -05:00
amphetamine
5c58c4cbb3
i18n: add ja glitch strings
2017-12-09 19:39:41 -08:00
Yamagishi Kazutoshi
07030db7ad
Add Galician language support ( #5955 )
2017-12-10 04:19:07 +01:00
Olivier Humbert
74cdbdcc51
French translation update ( #5954 )
...
* Update French translation
* fix
2017-12-10 09:47:59 +09:00
abcang
cef07895a9
Remove unused function ( #5950 )
2017-12-09 23:37:31 +01:00
ButterflyOfFire
d095955705
Create activerecord.ar.yml ( #5951 )
2017-12-09 23:37:18 +01:00
cwm
7a066e814b
moved locales to glitch, created add settings entry
2017-12-09 15:15:11 -06:00
cwm
38a5aa6c9e
ran i18n-tasks normalize for simple_form.en.yml
2017-12-09 13:00:07 -06:00
cwm
c47e5232bd
remove trailing spaces
2017-12-09 12:41:24 -06:00
cwm
98815c76ce
fixed fav setting change
2017-12-09 12:17:20 -06:00
cwm
ac42b2b95d
fixes, functioning now
2017-12-09 12:06:00 -06:00
cwm
7ff586054c
added a few more things
2017-12-09 11:21:41 -06:00
cwm
09c82d4343
remove keyboard shortcuts from getting started because thats a different thing
2017-12-09 10:32:46 -06:00
cwm
41bbfeec7c
add initial components based off of tootsuite pr #1507
2017-12-09 10:26:22 -06:00
