whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From curc...@apache.org
Subject [whimsy] 04/04: Merge branch 'master' into json-editor
Date Thu, 25 May 2017 00:40:45 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 b21c077c5407454a565bcf1d92945037302cc5a9
Merge: 4655427 293390f
Author: Shane Curcuru <asf@shanecurcuru.org>
AuthorDate: Wed May 24 20:40:25 2017 -0400

    Merge branch 'master' into json-editor

 DEVELOPMENT.md                                     |  21 +-
 lib/whimsy/asf/committee.rb                        |   4 +-
 lib/whimsy/asf/ldap.rb                             |   8 +-
 lib/whimsy/asf/themes.rb                           |   4 +-
 repository.yml                                     |   4 +
 tools/collate_minutes.rb                           | 211 +++++++++++----
 tools/comdevtalks.rb                               |  59 +++++
 tools/site-scan.rb                                 | 169 ++++++++++--
 www/assets/react-min.js                            |  13 +
 www/board/agenda/Gemfile                           |   4 +-
 www/board/agenda/config.ru                         |   2 +
 www/board/agenda/public/assets/bootstrap-min.css   |   6 -
 www/board/agenda/public/assets/bootstrap-min.js    |   7 -
 .../agenda/public/assets/bootstrap-theme.min.css   |   6 -
 www/board/agenda/public/assets/jquery-min.js       |   4 -
 www/board/agenda/public/assets/react-min.js        |  16 --
 www/board/agenda/public/stylesheets/app.css        |   9 +-
 www/board/agenda/routes.rb                         |  12 +-
 www/board/agenda/views/pages/comments.js.rb        |   4 +-
 www/board/agenda/views/pages/shepherd.js.rb        |   8 +-
 www/board/subscriptions.cgi                        |  12 +-
 www/committers/Gemfile                             |   7 +
 www/events/past.cgi                                |  10 +-
 www/events/talks.cgi                               | 128 +++++++++
 www/fonts/glyphicons-halflings-regular.eot         | Bin 0 -> 20127 bytes
 www/fonts/glyphicons-halflings-regular.svg         | 288 +++++++++++++++++++++
 www/fonts/glyphicons-halflings-regular.ttf         | Bin 0 -> 45404 bytes
 www/fonts/glyphicons-halflings-regular.woff        | Bin 0 -> 23424 bytes
 www/fonts/glyphicons-halflings-regular.woff2       | Bin 0 -> 18028 bytes
 www/incubator/moderators.cgi                       |  22 +-
 www/incubator/podlings/by-age.cgi                  |  24 +-
 www/index.html                                     |   7 +-
 www/members/subscriptions.cgi                      |  10 +-
 www/public/README.html                             |   3 +
 www/roster/Gemfile                                 |   4 +-
 www/roster/config.ru                               |   1 +
 www/roster/main.rb                                 |  38 ++-
 www/roster/models/committer.rb                     |   2 +
 www/roster/models/ppmc.rb                          |  18 +-
 www/roster/public/assets/bootstrap-min.css         |   6 -
 www/roster/public/assets/bootstrap-min.js          |   7 -
 www/roster/public/assets/bootstrap-theme.min.css   |   6 -
 www/roster/public/assets/jquery-min.js             |   4 -
 www/roster/public/assets/react-min.js              |  16 --
 www/roster/public/assets/stupidtable.min.js        |   1 -
 www/roster/public/assets/underscore-min.js         |   6 -
 www/roster/public/stylesheets/app.css              |  11 +-
 www/roster/public_committee_info.rb                |   2 +-
 www/roster/public_ldap_people.rb                   |   1 +
 www/roster/public_podlings.rb                      |   3 +
 www/roster/views/committee.html.rb                 |   2 +-
 www/roster/views/committees.html.rb                |   4 +-
 www/roster/views/person.js.rb                      | 253 +++++++++---------
 www/roster/views/person/email.js.rb                |   6 +-
 www/roster/views/person/forms.js.rb                |   6 +-
 www/roster/views/person/fullname.js.rb             |   6 +-
 www/roster/views/person/github.js.rb               |   6 +-
 www/roster/views/person/memstat.js.rb              |   8 +-
 www/roster/views/person/memtext.rb                 |   6 +-
 www/roster/views/person/pgpkeys.js.rb              |   7 +-
 www/roster/views/person/sascore.js.rb              |   6 +-
 www/roster/views/person/sshkeys.js.rb              |   6 +-
 www/roster/views/person/urls.js.rb                 |   6 +-
 www/roster/views/pmc/main.js.rb                    |   9 +
 www/roster/views/ppmc.html.rb                      |   2 +-
 www/roster/views/ppmc/members.js.rb                |   4 +-
 www/roster/views/ppmcs.html.rb                     |   5 +-
 www/secretary/workbench/Gemfile                    |   4 +-
 www/secretary/workbench/config.ru                  |   2 +
 .../workbench/public/assets/bootstrap-min.css      |   6 -
 .../workbench/public/assets/bootstrap-min.js       |   7 -
 .../workbench/public/assets/jquery-min.js          |   4 -
 www/secretary/workbench/public/assets/react-min.js |  16 --
 www/secretary/workbench/public/secmail.css         |  15 ++
 www/secretary/workbench/server.rb                  |  46 +++-
 .../workbench/views/actions/icla2.json.rb          | 155 +++++++++++
 www/secretary/workbench/views/app.js.rb            |   1 +
 www/secretary/workbench/views/asciize.js.rb        |  11 +-
 www/secretary/workbench/views/forms/icla2.js.rb    | 187 +++++++++++++
 www/secretary/workbench/views/parts.js.rb          |   6 +
 www/site.cgi                                       | 122 +++++++--
 www/status/index.cgi                               |  10 +-
 www/status/monitors/system.rb                      |  24 +-
 www/whimsy.rb                                      |  17 ++
 84 files changed, 1708 insertions(+), 475 deletions(-)

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

Mime
View raw message