whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From curc...@apache.org
Subject [whimsy] 03/04: Merge branch 'master' into json-editor
Date Thu, 25 May 2017 00:40:44 GMT
This is an automated email from the ASF dual-hosted git repository.

curcuru pushed a commit to branch json-editor
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit 465542754f6bef7734575a5d3b88546cd61f8265
Merge: 50f2abb c6ea38e
Author: Shane Curcuru <asf@shanecurcuru.org>
AuthorDate: Mon May 15 19:07:35 2017 -0400

    Merge branch 'master' into json-editor

 DEPLOYMENT.md                                      |  28 +--
 lib/whimsy/asf/rack.rb                             |  19 ++
 tools/ponypoop.rb                                  | 269 +++++++++++++++++++++
 tools/site-scan.rb                                 |  12 +-
 www/401.html                                       |   2 +-
 www/404.html                                       |   2 +-
 www/500.html                                       |   2 +-
 www/assets/bootstrap-min.css                       |   6 +
 www/assets/bootstrap-min.js                        |   7 +
 www/assets/bootstrap-theme.min.css                 |   6 +
 www/assets/jquery-min.js                           |   4 +
 www/assets/marked.min.js                           |   6 +
 www/assets/react-dom-server.min.js                 |  15 ++
 www/assets/react-dom.min.js                        |  16 ++
 www/assets/react-with-addons.min.js                |  13 +
 www/assets/stupidtable.min.js                      |   4 +
 www/assets/underscore-min.js                       |   6 +
 www/board/agenda/Gemfile                           |   2 +-
 www/index.html                                     |   3 +-
 www/roster/Gemfile                                 |   2 +-
 www/roster/public_json_common.rb                   |   5 +-
 www/secretary/workbench/config.rb                  |   2 +-
 www/secretary/workbench/models/message.rb          |   2 +-
 www/secretary/workbench/public/HOWTO.html          |   2 +-
 www/secretary/workbench/views/actions/icla.json.rb |   2 +-
 www/technology.html                                |   4 +-
 www/test.cgi                                       |  15 ++
 27 files changed, 417 insertions(+), 39 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <commits@whimsical.apache.org>.

Mime
View raw message