Commit Graph

  • 9a41ae3eaa Merge branch 'master' into dependabot/bundler/puma-3.10.0 Eugen Rochko 2017-09-11 23:04:46 +0200
  • bbff144004 Bump rails from 5.1.3 to 5.1.4 (#4875) Grey Baker 2017-09-11 22:03:14 +0100
  • 727ca91426 Merge b44a2dab49 into 47d48fed8d Sorin Davidoi 2017-09-11 14:21:08 +0000
  • 47d48fed8d Reset preview image if avatar/header image selection was cancelled (#4893) unarist 2017-09-11 23:19:54 +0900
  • f39029d5d9 Merge tag 'v1.6.0' into catgram tristar 2017-09-11 23:15:32 +0900
  • 3018043fc2 Add OpenStack Keystone V3 support (#4889) Patrick Figel 2017-09-11 15:11:13 +0200
  • 5736e23b08 Merge tag 'v1.6.0' into imastodon lnanase 2017-09-11 21:43:31 +0900
  • 40cd942f81 Merge pull request #14 from kabuakan/update/v1.6.0 kabuakan 2017-09-11 20:45:39 +0900
  • 364317fdbb Reset preview image if avatar/header image selection was cancelled unarist 2017-09-11 19:07:41 +0900
  • b43cd50c61 Merge tag 'v1.6.0' into update/v1.6.0 akanyatsu man 2017-09-11 20:26:47 +0900
  • ce680f84a5 Add OpenStack Keystone V3 support Patrick Figel 2017-09-11 05:52:05 +0200
  • 3cac5bc2c3 Fix a spuriously failing spec that assumed we required short bios like upstream Surinna Curtis 2017-09-10 19:43:52 -0500
  • c2bee07dbc l10n: Full PT-BR translation (#4882) Anna e só 2017-09-10 20:40:29 -0300
  • a345479de2 l10n: update Persian translation (#4880) Masoud Abkenar 2017-09-11 01:35:27 +0200
  • 29c44fa5fa Remove unused imports Surinna Curtis 2017-09-10 16:00:26 -0500
  • 7a9c7d4e0b Merge pull request #143 from yipdw/sync/upstream Surinna Curtis 2017-09-10 14:10:30 -0500
  • 932571fa22 Merge tag 'v1.6.0' into sync/upstream David Yip 2017-09-10 13:04:27 -0500
  • c9df53044a Merge pull request #142 from glitch-soc/sync/upstream-1.6.0rc4 beatrix 2017-09-10 13:34:14 -0400
  • 08f00df94b i18n: Update Polish translation (#4881) m4sk1n 2017-09-10 17:25:39 +0200
  • 8b5341cb2a Added missing translation for navigation_bar.pins Anna e só 2017-09-10 11:17:40 -0300
  • ca8775ff7d i18n: Update Polish translation m4sk1n 2017-09-10 16:13:10 +0200
  • bfacb10e40 Added translation for Pinned toots tab on pt-BR.json Anna e só 2017-09-10 11:01:11 -0300
  • e54cf29767 Fixing typos on pt-BR.yml Anna e só 2017-09-10 10:51:55 -0300
  • ec44da8884 Deleted an unwanted caracter on pt-BR.yml Anna e só 2017-09-10 10:39:18 -0300
  • 55a21ba7d7 l10n: fix missing Persian translation Masoud Akenar 2017-09-10 15:37:45 +0200
  • 231ee4ce64 l10n: update Persian translation Masoud Akenar 2017-09-10 15:31:33 +0200
  • 69fe5385b2 PT-BR translation for #4871 Anna e só 2017-09-10 10:11:28 -0300
  • ab71cf4593 Bump to 1.6.0 v1.6.0 Eugen Rochko 2017-09-10 15:10:03 +0200
  • c450ddb613 Fix POST /api/v1/follows error when already following (#4878) Eugen Rochko 2017-09-10 15:09:06 +0200
  • d370ceb8a9 Fix POST /api/v1/follows error when already following Eugen Rochko 2017-09-10 14:59:43 +0200
  • 337f9d3f9c Merge remote-tracking branch 'upstream/master' Anna e só 2017-09-10 09:55:01 -0300
  • 3e848b0979 correcting visibility setting fvh_P 2017-09-10 11:39:34 +0000
  • 15b886a6f0 Fix Japanese translation (#4876) yoshipc 2017-09-10 20:34:15 +0900
  • 3199d1b926 Fix Japanese translation yoshipc 2017-09-10 19:44:48 +0900
  • 8bdcdec698 Bump rails from 5.1.3 to 5.1.4 dependabot[bot] 2017-09-10 10:27:29 +0000
  • a574c8cc82 Bump puma from 3.9.1 to 3.10.0 dependabot[bot] 2017-09-10 10:27:09 +0000
  • 4819e2913d Bump version to 1.6.0rc5 v1.6.0rc5 Eugen Rochko 2017-09-10 10:26:51 +0200
  • 72e662bb0d Hide modal loading screen for media/video/boost/confirm/actions modals (#4873) Eugen Rochko 2017-09-10 10:26:01 +0200
  • 387d1315e4 Hide modal loading screen for media/video/boost/confirm/actions modals Eugen Rochko 2017-09-10 01:52:01 +0200
  • 7d7844a47f Default follows for new users (#4871) Eugen Rochko 2017-09-10 09:58:38 +0200
  • f2cbfb2eb3 Fix dimensions of loading component for compose drawer (#4872) Eugen Rochko 2017-09-10 08:48:11 +0200
  • 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 David Yip 2017-09-09 23:56:21 -0500
  • 3dff74eecf Merge pull request #141 from yipdw/sync/upstream beatrix 2017-09-09 20:11:48 -0400
  • 298da0a230 Fix dimensions of loading component for compose drawer Eugen Rochko 2017-09-10 01:41:45 +0200
  • 433ca67cb2 Default follows for new users Eugen Rochko 2017-09-10 00:14:08 +0200
  • 4f25a9de13 Merge tag 'v1.6.0rc4' into becodon Hirochika Yuda 2017-09-09 22:31:30 +0000
  • 4f683fe1d8 Set client max body size. Ref: https://redmine.kuropen.org/issues/8 Hirochika Yuda 2017-09-09 22:29:07 +0000
  • 3f333a8d31 Set fallback address when empty notification address (#4868) Yamagishi Kazutoshi 2017-09-10 04:31:48 +0900
  • 14e1fb8d36 Add missing import (patch by @MightyPork) David Yip 2017-09-09 10:18:21 -0500
  • 514fc908a3 Merge tag 'v1.6.0rc3' into sync/upstream David Yip 2017-09-09 14:28:08 -0500
  • b9f7bc149b Merge branch 'origin/master' into sync/upstream David Yip 2017-09-09 14:27:47 -0500
  • cdde492981 Set fallback address when empty notification address Yamagishi Kazutoshi 2017-09-10 04:02:24 +0900
  • bc077018b8 i10n minors changes for 1.6 (#4867) Quent-in 2017-09-09 18:22:56 +0200
  • 88d002a57f minor changes Quent-in 2017-09-09 18:12:50 +0200
  • e18b0861f0 minor changes Quent-in 2017-09-09 18:12:24 +0200
  • 0af54b93b3 Typo Quent-in 2017-09-09 18:11:02 +0200
  • a400855361 Typo Quent-in 2017-09-09 18:10:47 +0200
  • f99aa93e5c wrong preposition + typo Quent-in 2017-09-09 18:10:13 +0200
  • ca295d1a5d wrong preposition + typo Quent-in 2017-09-09 18:09:44 +0200
  • 90712d4293 Fix errors preventing UnsubscribeService from working (#4866) v1.6.0rc4 Eugen Rochko 2017-09-09 17:36:27 +0200
  • 62991f0bbc Fix errors preventing UnsubscribeService from working Eugen Rochko 2017-09-09 16:30:43 +0200
  • f3b6364161 E-mail instructions on app/views/user_mailer added and fully translated Anna e só 2017-09-09 11:54:54 -0300
  • 4898fa3a98 doorkeeper.pt-BR.yml now fully translated Anna e só 2017-09-09 11:26:15 -0300
  • 6867681c7c Add script to make embedded iframes autosize (#4853) Eugen Rochko 2017-09-09 16:23:44 +0200
  • bf74002b07 simple_form.pt-BR.yml fully translated Anna e só 2017-09-09 10:57:15 -0300
  • 3c16e8d7be pt-BR.yml now fully translated Anna e só 2017-09-09 10:34:17 -0300
  • bdc8b4fd91 Disable mouse-based pause from #4859 (#4865) Eugen Rochko 2017-09-09 15:09:50 +0200
  • 0a32fd02d5 Disable mouse-based pause from #4859 Eugen Rochko 2017-09-09 14:55:52 +0200
  • 2ff7146b6d Bump version to 1.6.0rc4 Eugen Rochko 2017-09-09 14:53:49 +0200
  • 3db47ba874 Add script to make embedded iframes autosize Eugen Rochko 2017-09-08 16:25:19 +0200
  • f6ff2cec0d Merge 21dc84172f into c7908e2d09 Eugen Rochko 2017-09-09 12:16:22 +0000
  • c7908e2d09 Fix scroll behavior and others on paused timeline (#4864) unarist 2017-09-09 21:16:11 +0900
  • 30a3a5cd31 Fix scroll behavior and others on paused timeline unarist 2017-09-09 20:55:38 +0900
  • c9d04f1c39 Fix second report (regression from 3b81baaaaf) (#4863) Yamagishi Kazutoshi 2017-09-09 20:42:48 +0900
  • 9e15eeec63 Add missing reject_media check before avatar download via ActivityPub (#4862) Eugen Rochko 2017-09-09 13:41:45 +0200
  • 181202e1f9 Fix second report (regression from 3b81baaaaf) Yamagishi Kazutoshi 2017-09-09 20:04:45 +0900
  • 6000c47503 Add missing reject_media check before avatar download via ActivityPub Eugen Rochko 2017-09-09 03:49:49 +0200
  • 3c45d3963a Scrollable tables in settings pages (#4857) Lynx Kotoura 2017-09-09 09:26:58 +0900
  • baa8b82179 Fix #1004 - Temporarily pause timeline if there's been recent mouse movement (#4859) Eugen Rochko 2017-09-09 02:26:41 +0200
  • 4b460bc571 Fix #4852 - Check if already requested from FollowService (#4855) Eugen Rochko 2017-09-09 02:02:44 +0200
  • 7ca173be47 Fix #4850 - When visibility missing from API call to toot, fallback to user preference (#4861) Eugen Rochko 2017-09-09 02:02:29 +0200
  • ec2350243d Fix #4850 - When visibility missing from API call to toot, fallback to user preference Eugen Rochko 2017-09-08 22:18:11 +0200
  • 1ae5d49a71 Refresh timeline after toot while the timeline is disconnected (#4858) unarist 2017-09-09 04:43:34 +0900
  • 4df831078f Fix #1004 - Temporarily pause timeline if there's been recent mouse movement Eugen Rochko 2017-09-08 21:22:14 +0200
  • 20d845a41d pt-BR.yml partially translated; 46 lines left Anna e só 2017-09-08 15:57:45 -0300
  • fa5ce851df Refresh timeline after toot while the timeline is disconnected unarist 2017-09-09 03:28:09 +0900
  • 541069141f Add space before curly brace Lynx Kotoura 2017-09-09 03:14:22 +0900
  • 198a757324 Scrollable tables in settings pages Lynx Kotoura 2017-09-09 02:43:22 +0900
  • c79797f532 pt-BR.json now fully translated Anna e só 2017-09-08 13:59:25 -0300
  • a12572e074 Handle stream_entry URL correctly in ActivityPub (#4854) unarist 2017-09-09 01:20:03 +0900
  • ee7f5a152b Handle stream_entry URL correctly in ActivityPub unarist 2017-09-09 00:07:28 +0900
  • 61411b7299 Fix #4852 - Check if already requested from FollowService Eugen Rochko 2017-09-08 17:21:35 +0200
  • 89a0ca47f9 devise.pt-BR.yml now fully translated Anna e só 2017-09-08 11:24:23 -0300
  • dabc309ca3 i10n update OC and FR (#4849) Quent-in 2017-09-08 13:55:47 +0200
  • 4a2137d89e Missing "navigation_bar.pins" Quent-in 2017-09-08 13:42:38 +0200
  • 9fc620239d Missing "navigation_bar.pins" Quent-in 2017-09-08 13:41:48 +0200
  • 1caf11ddcc Fix language filter codes (#4841) Eugen Rochko 2017-09-08 12:32:22 +0200
  • 95f018a3d4 "Mute conversation" option on all own toots, not just in notifications (#4844) Eugen Rochko 2017-09-08 12:00:30 +0200
  • a4caa7eb62 Fetch statuses/following/followers numbers from ActivityPub collections (#4840) Eugen Rochko 2017-09-08 12:00:17 +0200
  • bc0712bb61 Merge b52bab2a85 into 7c2d84910c Yoshihiro Saito 2017-09-07 23:25:34 +0000