cwm
b6ded7119e
travis fixes
2017-12-12 08:50:31 -06:00
beatrix
65d083338d
Merge pull request #263 from KnzkDev/optimize-paperclip
...
Optimizing paperclip
2017-12-12 09:15:52 -05:00
SerCom_KC
2a61b9f000
Update Chinese (Simplified) translations ( #5991 )
...
* i18n: (zh-CN) Update translations for #5817
* i18n: (zh-CN) Add translation for #5985
* i18n: (zh-CN) Normalization
2017-12-12 15:13:47 +01:00
nullkal
cfea28216f
make it possible to stream public timelines without authorization ( #5977 )
...
* make it possible to stream public timelines without authorization
* Fix
* Make eslint allow `value == null`
* Remove redundant line
* Improve style and revert .eslintrc.yml
* Fix streamWsEnd
* Show IP address instead of (anonymous user)
* Add missing semicolon
2017-12-12 15:13:24 +01:00
Renato "Lond" Cerqueira
19257d91bf
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
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
1486fd64cc
Move files for GitHub to .github directory ( #5989 )
2017-12-12 15:10:12 +01: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
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
a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
2017-12-12 02:54:13 -06:00
cwm
9b7208f4b4
readded connect for onboarding modal
2017-12-12 00:17:07 -06:00
cwm
b358483ef2
remove unneeded imports from getting_started_misc
2017-12-12 00:09:18 -06:00
cwm
37ced4c903
add components to getting started column
2017-12-12 00:01:17 -06:00
ncls7615
b93ad3d0e8
add ja
2017-12-12 13:13:54 +09:00
ncls7615
c0c4526283
add ja for fav conf
2017-12-12 13:05:48 +09: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
c95af71da5
optimize paperclip
2017-12-12 12:29:09 +09:00
Akihiko Odaki
14c4a33cd9
Change account_id non-nullable in lists ( #5979 )
2017-12-12 04:11:17 +01:00
Eugen Rochko
30d2ea03b0
Improve public status page title ( #5985 )
2017-12-12 03:56:30 +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
481fac7c84
Exclude moved accounts from search results ( #5984 )
2017-12-12 02:14:33 +01:00
cwm
0a52e37648
change pack to 'auth'
2017-12-11 18:14:41 -06:00
cwm
44992df257
load pack
2017-12-11 17:54:40 -06:00
Erin
2efffe77dc
reblog_service.rb: Status#local_only -> local_only?
2017-12-11 17:39:11 -06:00
Erin
c5a4eda694
move outbox filtering to Status#permitted_for (as per @ekiru)
2017-12-11 15:28:04 -06:00
Erin
3ec47e732b
post_status_service: stylistic change (local_only -> local_only?)
2017-12-11 15:27:31 -06:00
Quenty31
c588fcf4bc
Tiny little change ( #5981 )
2017-12-11 20:53:29 +01:00
kibigo!
8aa527434c
Fixed index in webpack config
2017-12-11 10:45:21 -08: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
d8206d1931
add ja
2017-12-12 00:28:33 +09:00
beatrix
771b950feb
Merge pull request #254 from glitch-soc/new-theme-ux
...
New flavour/skin UX
2017-12-11 09:36:14 -05:00
Eugen Rochko
feed07227b
Apply a 25x rate limit by IP even to authenticated requests ( #5948 )
2017-12-11 15:32:29 +01:00
beatrix
0cd5f2a61f
Merge pull request #255 from KnzkDev/remove-picture
...
Remove getting-started picture
2017-12-11 09:08:13 -05:00
Akihiko Odaki
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
David Yip
204688e803
Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController.
2017-12-11 00:17:30 -06:00
ncls7615
9d5ecdbf41
remove picture
2017-12-11 13:52:17 +09:00
David Yip
1138d0c321
Add Rake task to backfill local-only flag ( #253 )
2017-12-10 22:49:59 -06:00
kibigo!
ed7231947c
Added styling
2017-12-10 20:32:28 -08:00
kibigo!
bdca1614d5
Screenshot support for themes
2017-12-10 20:32:28 -08:00
kibigo!
dabf66e676
Moved flavour UI into own prefs tab
2017-12-10 20:32:27 -08:00
beatrix
08b0861b96
Merge pull request #250 from chriswmartin/fav-confirm-modal
...
add favourite confirmation modal
2017-12-10 23:10:19 -05:00
beatrix
01a3461bef
Merge pull request #252 from ncls7615/glitch-langfiles
...
i18n: Add translate and fix problems
2017-12-10 22:53:48 -05:00
Erin
288f1293ef
set local_only in a before_create callback instead of status service
2017-12-10 21:39:27 -06:00
Erin
0c46058a43
remove vestigial Status#local_only? definition
2017-12-10 21:25:36 -06:00
Erin
c1410af368
post_status_service.rb: save the status after setting local_only
2017-12-10 20:35:57 -06:00
Erin
24f36ca912
Status#not_local_only scope should match nils too
2017-12-10 20:35:42 -06:00
Sylvhem
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
Erin
f080a9fac7
filter local-only toots from AP outboxes
2017-12-10 19:07:43 -06:00
ncls7615
d420e2f047
add comma
2017-12-11 09:50:52 +09:00
ncls7615
279231c5dd
" => '
2017-12-11 09:46:17 +09:00
