Commit Graph

367 Commits

Author SHA1 Message Date
Samuel Cochran 2b53ab2735 Remove defunct TODOs 2016-01-18 14:49:03 +11:00
Samuel Cochran 4d7429c127 Revert "Relax thin and skinny restriction"
This reverts commit e6283f590b.

Thin 1.6 breaks mailcatcher exiting correctly.
2016-01-18 14:47:49 +11:00
Samuel Cochran e6283f590b Relax thin and skinny restriction
MailCatcher uses only public Thin API so should be okay, while Skinny
can take care of more intricate version dependencies.
2016-01-18 14:42:30 +11:00
Samuel Cochran 844c0a7d72 Bump 0.6.3 2016-01-18 14:04:04 +11:00
Samuel Cochran 420d24e914 Merge pull request #258 from grant-mccarriagher/fix/delete-queries
Fix delete message queries conflicting
2016-01-18 13:56:19 +11:00
Samuel Cochran 0c1a1e4148 Use new travis infrastructure 2016-01-15 17:22:04 +11:00
Samuel Cochran 79e023ef58 Bump to eventmachine 1.0.9.1 2016-01-15 17:12:53 +11:00
Samuel Cochran 433fad4e4d Remove Gemfile lock 2016-01-15 17:10:25 +11:00
Grant McCarriagher a6ef2147e0 Make the delete all messages variables not conflict with the delete single message variables. 2016-01-11 12:23:41 -05:00
Samuel Cochran efd7b4ff0e Missed Gemfile.lock update on 0.6.2 bump 2015-12-16 09:29:26 +11:00
Samuel Cochran c9c015b930 Merge pull request #219 from lichtamberg/master
Added mail count to document title
2015-12-14 16:06:07 +11:00
Samuel Cochran ca0166ded4 Bump version
Let's see if bumping eventmachine solves the memory leak issues.
2015-12-14 13:59:42 +11:00
Samuel Cochran 134a99c9c1 Make sure rubygem requires ruby > 1.9.3 2015-12-14 13:59:27 +11:00
Samuel Cochran d32b8465ba Make eventmachine requirement explicit 2015-12-14 13:57:20 +11:00
Samuel Cochran 885f0d95d8 Merge pull request #252 from CloCkWeRX/bump_event_machine
Fix #210 by upgrading eventmachine
2015-12-14 13:53:03 +11:00
Daniel O'Connor 9eabbd331b Fix #210 by upgrading eventmachine to a version with https://github.com/eventmachine/eventmachine/pull/586 applied 2015-12-14 12:49:36 +10:30
s 681ef78caa Added mail count to document title 2015-03-25 11:42:25 +01:00
Samuel Cochran d7a4737532 Fix view broken in 264e912
Thanks @vlada79, original commit 8e0fc5e, closes #211, #212.
2015-03-06 09:16:04 +11:00
Samuel Cochran 0179a924a0 Bump 0.6.1 2015-02-04 09:43:51 +11:00
Samuel Cochran 8e77cde268 Dammit eventmachine 2015-02-04 09:43:51 +11:00
Samuel Cochran 5e2e3d378b Bump 0.6.0 2015-01-29 21:51:59 +11:00
Samuel Cochran 80cbb52448 We now work on ruby 2.2 🎉 2015-01-29 21:50:06 +11:00
Samuel Cochran 5b3781b44c Un-exclude eventmachine 1.0.4 2015-01-29 21:44:56 +11:00
Samuel Cochran 757eafe337 Add monkey patch for eventmachine 1.0.4 2015-01-29 21:44:55 +11:00
Samuel Cochran d3336535ae Add instructions about ruby 2.2 and eventmachine 1.0.4 2015-01-29 20:50:31 +11:00
Samuel Cochran 23398d7042 Bump versions for prerelease eventmachine fix 2015-01-28 08:44:37 +11:00
Samuel Cochran 14a86ef8d4 Allow failure on 2.2.0 for now 2015-01-28 08:44:37 +11:00
Samuel Cochran 8e760d8a50 Why am I even using compass
I mean all of this stuff should just go away really. Might be time for
an interface overhaul. Or an everything overhaul.
2015-01-28 08:44:37 +11:00
Samuel Cochran 442a3f5404 bundle update 2015-01-28 08:28:40 +11:00
Samuel Cochran 7533eb4317 eventmachine 1.0.4 doesn't play nice 2015-01-28 08:01:30 +11:00
Samuel Cochran 3e1f362250 Update README instructions for PHP
Looks like sendmail_path is now restricted to PHP_INI_SYSTEM.

Thanks @albancrommer. Fixes #177.
2015-01-20 08:59:03 +11:00
Pavel de0edff86b Load active_support's core extensions 2015-01-17 17:28:02 +11:00
Samuel Cochran 1fee20497c Merge pull request #158 from boffbowsh/master
Add Dockerfile
2015-01-17 17:22:36 +11:00
Samuel Cochran e703dbcf13 Merge pull request #184 from captbaritone/patch-1
Ensure messages are shown in the order they were recieved
2015-01-17 17:18:02 +11:00
Samuel Cochran a4d9735b9a Update travis ruby versions 2015-01-17 17:07:57 +11:00
Samuel Cochran aa9b8c925a Set content types
Fixes #161
2015-01-17 16:54:07 +11:00
Samuel Cochran d3f083f8df Fix secure websocket protocol negotiation
Fixes #160
2015-01-17 16:41:57 +11:00
Samuel Cochran e76d367755 Bring `catchmail` closer to `sendmail`
Sendmail's conventional interface is `sendmail [options] [recipient ...]`

Fixes #188
2015-01-17 15:21:13 +11:00
Samuel Cochran 927b8a1aae Placate ambiguous argument warning 2015-01-17 15:08:42 +11:00
Samuel Cochran 021022c20f No need for namespaces 2015-01-17 15:08:26 +11:00
Samuel Cochran 841c3a2ef3 Simplify selenium setup 2015-01-17 15:08:13 +11:00
Samuel Cochran 640d3710ae Bundle update 2015-01-17 15:03:12 +11:00
Samuel Cochran 6ec409bfcb Remove haml 2015-01-17 15:03:00 +11:00
Paul Bowsher 18655f41f2 Clear apt cache too
Contribution from @thaJeztah
2015-01-15 16:30:49 +00:00
Paul Bowsher 9f2457aa4d Allow IP to be changed on the command line 2015-01-15 16:24:35 +00:00
Paul Bowsher 09e8349b6f Combined apt-get RUN commands 2015-01-15 16:22:47 +00:00
Jordan Eldredge de8a4735a7 Ensure messages are shown in the order they were recieved
If two messages were received within the same second, they may be sorted by the order they were received. Using `id` as a tie breaker should give a more consistent result.

I noticed this issue when writing tests for my Codeception testing framework Mailcatcher module: https://github.com/captbaritone/codeception-mailcatcher-module/issues/13 

**Note:** I have not tested this change, but I think it should be correct.
2014-12-31 08:34:58 -08:00
Paul Bowsher 1ab18c821d Add Dockerfile 2014-08-28 16:08:57 +01:00
Samuel Cochran eff638f920 bundle update 2014-06-05 21:32:24 +10:00
Samuel Cochran e3e7dec757 Load all of ActiveSupport
ActiveSupport has weird load order problems when loading only the
core extensions now.

For instance, active_support/core_ext/numeric/conversions.rb now
loads active_support/number_helper which needs
ActiveSupport::Autoload but doesn't require it, so causes a missing
constant error in MailCatcher.

Also tightening up the version constraint because I can't guarantee
backward compatibility now.
2014-06-05 21:27:47 +10:00