[Bps-public-commit] smokingit branch, master, updated. a52897a376a3a5853759ffac87c48b34980296d8

[Alex Vandiver]

The branch, master has been updated
       via  a52897a376a3a5853759ffac87c48b34980296d8 (commit)
       via  8acc32992252055145c060ee8fc19bf516fbc8fb (commit)
       via  ccff3eec9081df46b3380b3897b7c0ea80d42f80 (commit)
       via  0d535c2b3990fed4273ab5d66dc1866e05a07db2 (commit)
       via  bde0a2d9e85a0597ed04e072441898cdf82fae29 (commit)
       via  9c237d295c453d70d7034376560c3e0a63a99bcb (commit)
       via  a01916ee887fcc90bec5af5bebc2a8f29709f74c (commit)
       via  b910a45af1c8f560c141ebb5e86c5e901cc03ebd (commit)
       via  a793ddf127151c98a5bdc7e00419b6ed75d7ddef (commit)
       via  4a7b928a183faeb8130880e6ad694044d71d1ae2 (commit)
       via  63e489054aac8c7466bf6daa37b1671b1e5e029d (commit)
       via  abc0d0752a64ac3d3c9631c0104ace21d59744c6 (commit)
       via  4f30dc24b318300dfb77d5b7ea306aec6dc8e216 (commit)
       via  f06ac63499842276541c008f4a0727166d5a8c36 (commit)
       via  5eab33fb8094a9d3501eb2474f2be19d20308f16 (commit)
       via  a7d78bbc126f0bfd853abf20c6759afd5662c19f (commit)
       via  bceb36f4e9a797e97d21f3aec18bd6b5eceff051 (commit)
       via  bc133ecd7d533ec621b307e0cb5093124b97fbf8 (commit)
       via  701e540064c11d2ba86f74c14197a9b00af59f02 (commit)
       via  60bb6c2b1e80a9fc8cf2fd1eae164f02234cad88 (commit)
       via  df83b40a28c0509b30e4bc76cdc87cda226f607e (commit)
       via  03dcc9484440be62bac9e87d1f7c5040b35648d1 (commit)
       via  de1a679dfedc0475bd1b99c00166308c3790f003 (commit)
       via  cdda0a472f6d46af0c5c2e7bf05835af202699be (commit)
       via  d680989832f11dd34e7c904ee4b5f07364eb66d7 (commit)
       via  3fcb0ecfdbc12bf41c484e6188581cf2a50b639f (commit)
       via  3d652eb5c34f61a06a65d4cef42e471953da8df2 (commit)
       via  7fec656bfbc31576b80c7195d3ee0e9db5daa2f4 (commit)
       via  3ebb0fa18b5ca053e8107b7ba11cfba12299e96d (commit)
       via  81db510c53001345a8457bb0a2ba75f84dffed98 (commit)
      from  a9c77e4fa875e82c48e37223cfdfad0d11cc6db1 (commit)

Summary of changes:
 Makefile.PL                                  |   5 +
 app.psgi                                     |   2 +-
 bin/anna                                     |  22 +
 bin/miniircd                                 | 841 +++++++++++++++++++++++++++
 lib/Smokingit/Action/Test.pm                 |  57 +-
 lib/Smokingit/IRC.pm                         | 374 ++++++++++++
 lib/Smokingit/Model/Branch.pm                |  92 +--
 lib/Smokingit/Model/Commit.pm                |  17 +
 lib/Smokingit/Model/Project.pm               |  56 +-
 lib/Smokingit/Model/SmokeResultCollection.pm |  24 +
 lib/Smokingit/View.pm                        | 107 +++-
 lib/Smokingit/View/Branch.pm                 |   7 +-
 lib/Smokingit/View/Project.pm                |  50 +-
 share/web/static/css/app-late.css            |  15 +
 14 files changed, 1526 insertions(+), 143 deletions(-)
 create mode 100755 bin/anna
 create mode 100755 bin/miniircd
 create mode 100644 lib/Smokingit/IRC.pm

- Log -----------------------------------------------------------------
commit a52897a376a3a5853759ffac87c48b34980296d8
Merge: a9c77e4 8acc329
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Jul 19 01:16:04 2013 -0400

    Merge branch 'anna'
    
    Conflicts:
    	Makefile.PL

diff --cc Makefile.PL
index e770618,525b8db..6a33586
--- a/Makefile.PL
+++ b/Makefile.PL
@@@ -4,6 -4,10 +4,11 @@@ name        'Smokingit'
  version     '0.01';
  requires    'Jifty' => '1.01209';
  requires    'Git::PurePerl';
 +requires    'Plack::Middleware::CrossOrigin';
+ requires    'IM::Engine';
+ requires    'String::IRC';
+ 
+ # requires IM::Engine from git://github.com/sartak/IM-Engine.git
+ # requires Web::Hippie from git://github.com/alexmv/Web-Hippie.git
  
  WriteAll;

-----------------------------------------------------------------------