Commit Graph

  • a6b5caf9df add timed silence routes Lynn Cyrin 2017-04-09 02:34:51 -0700
  • 39b4cf7ba1 add timed silence controller actions Lynn Cyrin 2017-04-09 02:34:34 -0700
  • a48730ee96 fix boolean issue Lynn Cyrin 2017-04-09 02:34:06 -0700
  • 6dc059d61a add unsilence worker Lynn Cyrin 2017-04-09 02:33:10 -0700
  • a83be2a413 1 MastodonRussia 2017-04-09 13:29:47 +0300
  • fa5e12e166 Update fr.jsx StefOfficiel 2017-04-09 12:27:44 +0200
  • a6f5dccafa 1 MastodonRussia 2017-04-09 13:25:43 +0300
  • 15dead9a03 1 MastodonRussia 2017-04-09 13:22:24 +0300
  • 68989f9da4 Merge 9e57c67ce2 into b1881a3d48 Alex Dunn 2017-04-09 10:21:44 +0000
  • f5f18e9aa8 1 MastodonRussia 2017-04-09 13:18:41 +0300
  • fadb09832e 1 MastodonRussia 2017-04-09 13:15:44 +0300
  • 6dc37aa400 1 MastodonRussia 2017-04-09 13:11:47 +0300
  • 8fd6695d8d Merge remote-tracking branch 'refs/remotes/tootsuite/master' into RussianLanguage MastodonRussia 2017-04-09 13:08:37 +0300
  • adc5907844 Update components.scss StefOfficiel 2017-04-09 11:47:24 +0200
  • 10d9a8c1ac Merge remote-tracking branch 'origin/RussianLanguage' into RussianLanguage MastodonRussia 2017-04-09 12:36:50 +0300
  • 4b2e052b81 Add Russian translation MastodonRussia 2017-04-09 11:58:50 +0300
  • b1881a3d48 Fix nonworking clear notices button (#1316) Rachel H 2017-04-09 02:35:23 -0700
  • ebb5dd13c8 Add Russian translation MastodonRussia 2017-04-09 12:27:41 +0300
  • 44d47fec23 Add Russian translation MastodonRussia 2017-04-09 11:58:50 +0300
  • a3d236702e Merge branch 'master' into master Valentin Ouvrard 2017-04-09 19:30:12 +1100
  • e1efcea9f4 readd root /home/mastodon/live/public; Valentin Ouvrard 2017-04-09 19:29:47 +1100
  • 810269b0ea Update List-of-Mastodon-instances.md MastodonRussia 2017-04-09 11:19:14 +0300
  • 9848f1820c Datetime french translation SansPseudoFix 2017-04-08 14:08:42 +0200
  • b5010d8501 French typo SansPseudoFix 2017-04-08 14:07:00 +0200
  • 07b318d737 Merge remote-tracking branch 'refs/remotes/tootsuite/master' Savarice 2017-04-09 03:05:31 -0400
  • b9f757d94c Add Russian translation MastodonRussia 2017-04-09 08:54:42 +0300
  • baa3100c6b Add Russian translation MastodonRussia 2017-04-09 08:44:08 +0300
  • 86ead64d85 Update List-of-Mastodon-instances.md zaclys 2017-04-09 07:26:47 +0200
  • 65b4d9cd1f Fix nonworking clear notices button Rachel 2017-04-08 22:17:12 -0700
  • 2a611aa318 Update List-of-Mastodon-instances.md zaclys 2017-04-09 06:50:59 +0200
  • e29a60e2e0 code climate Ben Roberts 2017-04-09 00:22:10 -0400
  • 55b3390980 trying to pass code climate tests Ben Roberts 2017-04-09 00:19:50 -0400
  • fe41c810e7 Merge remote-tracking branch 'upstream/master' Ben Roberts 2017-04-09 00:18:28 -0400
  • d5a675099a Add env variable to disable prepared statements (#1293) Eugen 2017-04-09 05:46:32 +0200
  • 933d143baa Sidekiq listens single stack on 127.0.0.1. The nginx config in the Mastodon documentation proxy passes to sidekiq with the hostname localhost, which resolves dual stack to 127.0.0.1 and ::1. staticsafe 2017-04-09 03:07:00 +0000
  • 392d0b5002 Revert "Add build-essential to dependencies list." staticsafe 2017-04-09 03:04:33 +0000
  • b455f0cf19 Fixes #1311 margin shouldn't stay fixed Brian Mock 2017-04-08 19:29:26 -0700
  • 6fe231d718 link to the better guide Edward Vielmetti 2017-04-08 21:51:42 -0400
  • c3e7bac1cc Allows setting log level in env variable (#1290) Ash Furrow 2017-04-08 19:42:13 -0400
  • 2705d1696e Add more specific class names to notification divs Chris Martin 2017-04-06 21:02:59 -0400
  • 6e3925521d Adds user confirmation rake task (#1300) Ash Furrow 2017-04-08 19:09:46 -0400
  • f0898d89dd
    Made changes based on feedback in #1290. Ash Furrow 2017-04-08 19:05:10 -0400
  • b328bbf8a5 block all robots in robots.txt Nolan Lawson 2017-04-08 15:50:00 -0700
  • e98f00de19
    Adds documentation for manual confirmation. Ash Furrow 2017-04-08 18:39:04 -0400
  • ef6af69d92
    Adds task to confirm user by email. Ash Furrow 2017-04-08 18:36:51 -0400
  • c0eb847abb Merge pull request #1 from tootsuite/master Carlos A. Escobar 2017-04-08 17:22:58 -0500
  • 8024c265c1 Added instructions for Centos/RHEL. Also added postgres init, and put a note about the PATH that can mess up the systemd files. LinuxFreeOrDie 2017-04-08 15:09:00 -0700
  • e3039cfe11 Add env variable to disable prepared statements Eugen Rochko 2017-04-08 23:50:05 +0200
  • 52c8551b33 fix bad translation Carlos Escobar 2017-04-08 16:39:38 -0500
  • b89f007862 Make public timelines API not require user context/app credentials (#1291) Eugen 2017-04-08 23:39:31 +0200
  • ed189f3f1f Added missing Spanish translations strings Carlos Escobar 2017-04-08 16:35:04 -0500
  • 3029ac4276 Merge branch 'master' into master Hugo Gameiro 2017-04-08 22:21:44 +0100
  • a3851afb2f Apply pagination fix to more APIs Eugen Rochko 2017-04-08 23:12:36 +0200
  • e753986bf2
    Allows setting log level in env variable. Ash Furrow 2017-04-08 17:06:45 -0400
  • 4e86e6be50 Make /api/v1/timelines/public and /api/v1/timelines/tag/:id public Fix #1156 - respect query params when generating pagination links in API Eugen Rochko 2017-04-08 23:03:03 +0200
  • 31f4f5070a Merge remote-tracking branch 'upstream/master' Alex McGivern 2017-04-08 21:54:10 +0100
  • d5973d702b Add Russian translation MastodonRussia 2017-04-08 23:39:41 +0300
  • cd09e87a25 Add Russian translation MastodonRussia 2017-04-08 23:30:40 +0300
  • 2a4499bb23 Merge branch 'master' into skylight Eugen Rochko 2017-04-08 22:27:03 +0200
  • 9acdb166e8 Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278) Eugen 2017-04-08 22:20:08 +0200
  • 5e04e32ad7 Clean up Eugen Rochko 2017-04-08 22:19:40 +0200
  • e594cebe09 Add Russian translation MastodonRussia 2017-04-08 22:51:19 +0300
  • c613ef76f4 Add Russian translation MastodonRussia 2017-04-08 22:46:38 +0300
  • b4f55c2f1d Add Russian translation MastodonRussia 2017-04-08 22:28:59 +0300
  • db1d0a73fb Add build-essential to dependencies list. A C compiler is required to compile Ruby. staticsafe 2017-04-08 19:35:55 +0000
  • 5c13e59e54 Put a useful message for new admins on /about/more Ryan Tucker 2017-04-08 15:21:48 -0400
  • 8f592e5378 Adding toot.BERLIN yeah 2017-04-08 21:03:12 +0200
  • 64659a0f4d Using puma and sidekiq pidfile in init scripts Florian Roméo 2017-04-08 20:45:31 +0200
  • 9fcb3f9d57 update portuguese translation Hugo Gameiro 2017-04-08 19:37:13 +0100
  • 91a8394b5a Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled TOTP secret is not shown again after 2FA is enabled Eugen Rochko 2017-04-08 20:22:51 +0200
  • b92d90972b Merge pull request #3 from tootsuite/master Hugo Gameiro 2017-04-08 18:38:55 +0100
  • ee88a73463 Add PAPERCLIP_ROOT_URL (and rename PAPERCLIP_ROOT to PAPERCLIP_ROOT_PATH). Valentin Lorentz 2017-04-08 19:35:35 +0200
  • 7e43daa356 Sort gem to comply with rubocop awea 2017-04-08 18:59:26 +0200
  • 2d584dc086 Apache2 configuration example FlorianFun 2017-04-08 18:54:44 +0200
  • b51338263c Reference docker-compose problem Edward Vielmetti 2017-04-08 12:36:50 -0400
  • c1a2956fbd Create Ubuntu-guide.md Edward Vielmetti 2017-04-08 12:32:06 -0400
  • 470eb0042e Improve responsiveness of registration form and closed banner (#1265) Pavel Djundik 2017-04-08 19:31:50 +0300
  • 90d8b8b1dc Update doorkeeper.fr.yml Olivier Humbert 2017-04-08 18:28:10 +0200
  • 518c859a3a update Node to 6.x LTS Alex Dunn 2017-04-07 22:05:27 -0700
  • 041bb7ac03 add empty notifications french translation Jonathan Klee 2017-04-07 00:05:44 +0200
  • fb05ae52cf Update fr.yml Olivier Humbert 2017-04-08 18:18:24 +0200
  • 88dd13c2ad Update Olivier Humbert 2017-04-08 18:15:09 +0200
  • 7c160e4325 Update confirmation_instructions.fr.html.erb Olivier Humbert 2017-04-08 18:12:42 +0200
  • bab8f4a46c NFS for shared folder requires a private_network happycoloredbanana 2017-04-08 16:11:54 +0300
  • 9e57c67ce2 don't use a block when #fetching with a default value Alex Dunn 2017-04-08 08:53:38 -0700
  • 22696a9171 Improve responsiveness of registration form and closed banner Pavel Djundik 2017-04-08 17:08:47 +0300
  • 2ab4cf4650 Add note about minimum docker-compose version Effy Elden 2017-04-09 00:07:43 +1000
  • ed0ff5bc34 Merge branch 'master' into master Valentin Ouvrard 2017-04-09 00:42:55 +1100
  • fc146a19cc Improve about page responsiveness (#1252) Pavel Djundik 2017-04-08 16:28:23 +0300
  • 14d2d7a89e Last Belgian touch! kadiix 2017-04-08 15:03:36 +0200
  • 0c500817ee enable GZIP on nginx.conf Valentin Ouvrard 2017-04-08 23:24:57 +1100
  • 2aadf735af enable AOF redis mechanism Wonderfall 2017-04-08 14:07:35 +0200
  • 23c546ecfa Merge branch 'master' into master Valentin Ouvrard 2017-04-08 23:01:42 +1100
  • 03fe20acf0 Merge branch 'master' into patch-1 Effy Elden 2017-04-08 21:58:35 +1000
  • cc67dbc6fa Merge pull request #2 from tootsuite/master Hugo Gameiro 2017-04-08 12:51:46 +0100
  • 941a593ea8 Add mst3k.interlinked.me to list of instances (#1235) Elizabeth Myers 2017-04-08 06:48:16 -0500
  • 883e5a1658 Add tailing | to new line Effy Elden 2017-04-08 21:47:42 +1000
  • cd36022e56 add my instance to the list Valentin Ouvrard 2017-04-08 22:41:43 +1100
  • 31df273bd8 Disable unworking Nginx root directory && Mitigating the HTTPoxy Vulnerability Valentin Ouvrard 2017-04-08 22:37:08 +1100
  • fa6cebbd74 Merge branch 'master' into detect-locale David Authier 2017-04-08 13:35:02 +0200