Commit graph

  • ce524cbb49 Merge pull request #790 from chapeaumeinfreund/patch-1 Eugen 2017-04-05 03:05:31 +0200
  • 117b22e905 Merge pull request #852 from peterkeen/email-whitelist-817 Eugen 2017-04-05 03:04:58 +0200
  • d3dab68978 Merge pull request #891 from ashfurrow/patch-1 Eugen 2017-04-05 03:01:43 +0200
  • 57466d542b Merge pull request #805 from nevillepark/master Eugen 2017-04-05 03:00:57 +0200
  • 417273326a Merge pull request #894 from asm/mastodon_cc Eugen 2017-04-05 02:56:54 +0200
  • f0d7bdcfb4 Merge 0613ca3001 into 909d81923e #871 Christopher Miles 2017-04-05 00:55:05 +0000
  • 7d48391014 Merge pull request #837 from ssgodlol/patch-3 Eugen 2017-04-05 02:54:27 +0200
  • 909d81923e Merge pull request #898 from SirCmpwn/remote-follow-improvements Eugen 2017-04-05 02:54:03 +0200
  • 2edeb3fe1c Merge pull request #858 from krainboltgreene/patch-6 Eugen 2017-04-05 02:53:39 +0200
  • dd441606aa Updates instructions. #891 Ash Furrow 2017-04-04 20:53:31 -0400
  • feea517046 Merge pull request #872 from kwaio/patch-1 Eugen 2017-04-05 02:53:09 +0200
  • f7e35d90db Remote follow improvements #898 Drew DeVault 2017-04-04 20:16:14 -0400
  • e55fbdede3 Merge pull request #868 from Angristan/patch-4 Eugen 2017-04-05 02:52:00 +0200
  • a24d55eed8 Add sidekiq-skylight Eugen Rochko 2017-04-05 02:35:47 +0200
  • 7f7a67a7c1 Merge branch 'master' into skylight Eugen Rochko 2017-04-05 02:34:54 +0200
  • bda37489ac Remove PuSH subscriptions when delivery is answered with a 4xx error Eugen Rochko 2017-04-05 02:32:18 +0200
  • 50a88d6a6e Adding https://mastodon.cc #894 Jason Snell 2017-04-04 16:35:57 -0700
  • 5af0ecbcd9 alphebatically order test gem group as required by rubocop Samy KACIMI 2017-04-05 00:52:55 +0200
  • 79ef756f64 fix rubocop issues Samy KACIMI 2017-04-05 00:47:17 +0200
  • 04225ed72e Adds instructions for adding admin users. Ash Furrow 2017-04-04 18:45:24 -0400
  • 073f92fc76 Merge branch 'master' into add_more_tests_to_models Samy KACIMI 2017-04-05 00:43:10 +0200
  • 46c0e8b0e7 update account_spec Samy KACIMI 2017-04-05 00:37:23 +0200
  • 7762467b47 rollback database.yml update Samy KACIMI 2017-04-05 00:31:31 +0200
  • 81c76fe375 add more tests to models Samy KACIMI 2017-04-05 00:29:56 +0200
  • 4512fde181 add persistance to Postresql container Valentin_NC 2017-04-05 09:06:08 +1100
  • 1e5a1b9abd Update Production-guide.md #885 Udo Kramer 2017-04-04 23:45:29 +0200
  • ed22f65b3c Merge pull request #876 from krainboltgreene/patch-7 Eugen 2017-04-04 23:11:34 +0200
  • 300bc70123 Add Skylight Eugen Rochko 2017-04-04 22:32:22 +0200
  • 0613ca3001 Added an example configuration for Apache 2 #871 Christopher M. Miles 2017-04-04 15:20:26 -0400
  • 9ae9ecdebe Quick attempt to get pull requests passing #876 Kurtis Rainbolt-Greene 2017-04-04 12:14:44 -0700
  • 8736ef50ad Added Esperanto translation inside the javascripts folder axolotl 2017-04-04 20:54:42 +0200
  • dcda852b5f typo in admin doc #872 Nope Nope 2017-04-04 20:45:32 +0200
  • 22e480b1fa Added my instance to the list Christopher M. Miles 2017-04-04 14:32:17 -0400
  • 6091b9b1a9 Add file package #868 Angristan 2017-04-04 19:23:53 +0200
  • 6fd865c000 Spawn FeedInsertWorker to deliver status into personal feed Eugen Rochko 2017-04-04 19:21:37 +0200
  • 350958babf Fix typos on french translations #866 Clément D 2017-04-04 19:09:54 +0200
  • 9a5d6e9715 Add closed_registrations message on French language #863 Thibaut (Eychics) 2017-04-04 18:58:19 +0200
  • 41ba74b511 Update the list of instances Pierre Ozoux 2017-04-04 17:28:29 +0100
  • 22000ef7a9 Add oc.todon.fr to the list of instances. #848 Valentin Lorentz 2017-04-04 18:11:41 +0200
  • 7015578655 Add social.nasqueron.org instance Sébastien Santoro 2017-04-04 18:11:14 +0200
  • 731e650681 Use active record shorthand #858 Kurtis Rainbolt-Greene 2017-04-04 09:04:07 -0700
  • 2a1b395e4d Merge 2529201bf2 into 5f54981846 #855 Kurtis Rainbolt-Greene 2017-04-04 15:24:44 +0000
  • 2fcf8d79ad Fix crontab edit #854 Angristan 2017-04-04 17:23:56 +0200
  • 2529201bf2 We don't need the entire tag model for just the name #855 Kurtis Rainbolt-Greene 2017-04-04 08:23:21 -0700
  • e9a6da6bc7 [#817] Add email whitelist #852 Pete Keen 2017-04-04 11:04:44 -0400
  • d8855150a0 Update social.diskseven.com's IPv6 status #846 Jo Decker 2017-04-04 15:29:07 +0100
  • 192f079776 Add mastodon.club to running instances list #845 Adam Thurlow 2017-04-04 11:14:51 -0300
  • 58bdb9b42e Update List-of-Mastodon-instances.md Florian Maunier 2017-04-04 16:03:05 +0200
  • 665ec615e3 Missing quotes #842 Angristan 2017-04-04 15:57:37 +0200
  • 3cc978141d Update List-of-Mastodon-instances.md #840 Alec Spier 2017-04-04 08:40:12 -0500
  • 5f54981846 New admin setting: open/close registrations, with custom message, from the admin UI Eugen Rochko 2017-04-04 15:26:57 +0200
  • 10a8666e04 updated line 28 about GitHub #818 JantsoP 2017-04-04 15:07:15 +0200
  • 405c495c23 Merge pull request #804 from fhalna/development Eugen 2017-04-04 14:52:27 +0200
  • fee3312193 Merge pull request #803 from 0xa/patch-1 Eugen 2017-04-04 14:51:47 +0200
  • 48dfdad492 Merge branch 'master' into patch-1 #803 Eugen 2017-04-04 14:51:42 +0200
  • ed4a723a82 Merge pull request #800 from unascribed/patch-1 Eugen 2017-04-04 14:51:01 +0200
  • c359e60034 Merge pull request #799 from Wonderfall/master Eugen 2017-04-04 14:50:35 +0200
  • 4bb623a595 Merge pull request #832 from ndarville/patch-1 Eugen 2017-04-04 14:50:14 +0200
  • 7c075b5551 Merge pull request #788 from yiskah/patch-5 Eugen 2017-04-04 14:49:48 +0200
  • 904f9266ef Fix typo in ISSUE_TEMPLATE #832 Niclas Darville 2017-04-04 14:49:31 +0200
  • 1e81cad3f3 Merge pull request #815 from walfie/patch-1 Eugen 2017-04-04 14:49:06 +0200
  • 8e693b8e41 Merge pull request #816 from leowzukw/patch-1 Eugen 2017-04-04 14:48:51 +0200
  • 60d07c06c3 Merge pull request #831 from ndarville/patch-1 Eugen 2017-04-04 14:48:22 +0200
  • be2e7e1802 Create ISSUE_TEMPLATE.md #831 Niclas Darville 2017-04-04 14:46:08 +0200
  • 38b504b7a7 Remove sidekiq-merger Eugen Rochko 2017-04-04 14:28:57 +0200
  • 82aaedec46 Reduce number of items in feeds, optimize regeneration worker slightly, make regeneration worker unique, (only schedule/execute once at a time) Eugen Rochko 2017-04-04 13:58:34 +0200
  • a450484e15 minor fix Michał 'rysiek' Woźniak 2017-04-04 13:50:02 +0200
  • b1f3499c38 Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge Eugen Rochko 2017-04-04 13:43:36 +0200
  • b21f7c28f6 Move OStatus processing back into default queue Eugen Rochko 2017-04-04 13:02:49 +0200
  • ce9df2fa82 Optimize filter methods in FeedManager a bit, use redis pipelining on merge/unmerge feed methods, do not re-create a dynamic class on each feed push call, make sure redis-rb uses hiredis Eugen Rochko 2017-04-04 13:01:14 +0200
  • 7ec45e4fea another bugfix. yaml is evil Michał 'rysiek' Woźniak 2017-04-04 12:50:31 +0200
  • 9a1f43cd83 Merge branch 'master' of github.com:rysiekpl/mastodon Michał 'rysiek' Woźniak 2017-04-04 12:31:41 +0200
  • 218cfc64ce bugfix for new colon-containing texts Michał 'rysiek' Woźniak 2017-04-04 12:31:31 +0200
  • 3abb0f7bc7 Merge branch 'master' into development #804 halna_Tanaguru 2017-04-04 12:06:53 +0200
  • d984addfb4 Merge 4dac2cd251 into eb023beb49 #653 James 2017-04-04 09:33:28 +0000
  • db4a41cf58 Merge branch 'master' into master JantsoP 2017-04-04 08:41:46 +0200
  • dc89fc17cc updated translation JantsoP 2017-04-04 08:29:53 +0200
  • b8243c1b49 changed line 25 for better translation JantsoP 2017-04-04 08:26:59 +0200
  • e81ba26be9 More consistent typography #816 Leo Wzukw 2017-04-04 06:58:17 +0200
  • c22388fc79 Fix typo in Heroku guide #815 walfie 2017-04-04 00:00:56 -0400
  • bc70224400 Update simple_form.es.yml #837 ssgodlol 2017-04-04 05:05:03 +0200
  • 25772795f9 Update es.yml #836 ssgodlol 2017-04-04 05:00:38 +0200
  • b7b2ef3501 Hide scrollbars in Edge instead of showing white ones #814 François REMY 2017-04-03 19:48:55 -0700
  • dfd3ec1294 Update es.jsx #834 ssgodlol 2017-04-04 04:29:27 +0200
  • 847b8c0e54 Merge f291c89f6d into eb023beb49 #798 Thomas Citharel 2017-04-04 00:04:58 +0000
  • eb023beb49 Fix #808 - smaller elephant friend PNG for frontpage Eugen Rochko 2017-04-04 02:03:16 +0200
  • b510a56c0c Only call regeneration worker after first login after a 14 day break Eugen Rochko 2017-04-04 02:00:10 +0200
  • 94ca6d7dbc Merge branch 'master' into master rysiekpl 2017-04-04 01:40:32 +0200
  • 2836808a44 Polish translation bugfix Michał 'rysiek' Woźniak 2017-04-04 01:36:52 +0200
  • 4c53af64f0 Fix ActionController::Parameters in API issue Eugen Rochko 2017-04-04 01:33:34 +0200
  • f722bd2387 Separate background jobs into different queues. ATTENTION: new queue "pull" must be added to the Sidekiq invokation in your systemd file Eugen Rochko 2017-04-04 00:53:20 +0200
  • 3363553f7d Polish translation (needs more love though) Michał 'rysiek' Woźniak 2017-04-04 00:04:09 +0200
  • 0ef24c09a9 Update notification email wording #806 Alex Zillion 2017-04-03 16:45:49 -0500
  • ce1ca28594 Changed "reblogs" to "boosts" #805 Neville Park 2017-04-03 17:45:36 -0400
  • 5b6f4fdeb4 Add octodon.social Alice 2017-04-03 23:05:03 +0200
  • 8232f76c48 Add check for visibility.nil? even though it can't ever be, to check for race conditions Eugen Rochko 2017-04-03 22:54:46 +0200
  • 3f30ae1f97 accessibility fix halna_Tanaguru 2017-04-03 22:45:29 +0200
  • 1ed37fae9b Add fern.surgeplay.com to the instances list #800 Aesen 2017-04-03 15:52:33 -0400
  • cc451e1fcb update social.targaryen.house info #799 Wonderfall 2017-04-03 21:36:28 +0200
  • f291c89f6d Add social.tcit.fr #798 Thomas Citharel 2017-04-03 20:55:24 +0200