You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@whimsical.apache.org by se...@apache.org on 2019/01/13 23:54:45 UTC

[whimsy] 01/01: Merge branch 'master' into mod-gui

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch mod-gui
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit dbf07726f67cfaad74af601ce57beeafbc40cb06
Merge: e62045d 6f0a61b
Author: Sebb <se...@apache.org>
AuthorDate: Sun Jan 13 23:54:23 2019 +0000

    Merge branch 'master' into mod-gui

 lib/whimsy/asf/committee.rb                        |   3 +
 lib/whimsy/asf/mlist.rb                            |  14 +-
 www/roster/main.rb                                 |  24 +++
 www/roster/models.rb                               |   1 +
 www/roster/models/committee.rb                     |   1 +
 www/roster/models/{committee.rb => nonpmc.rb}      |  76 ++++----
 www/roster/views/app.js.rb                         |   6 +
 www/roster/views/committees.html.rb                |   2 +-
 www/roster/views/index.html.rb                     |  12 ++
 www/roster/views/nonpmc.html.rb                    |  26 +++
 www/roster/views/nonpmc/add.js.rb                  | 103 ++++++++++
 www/roster/views/nonpmc/committers.js.rb           |  90 +++++++++
 www/roster/views/nonpmc/main.js.rb                 | 208 +++++++++++++++++++++
 www/roster/views/nonpmc/mod.js.rb                  | 106 +++++++++++
 www/roster/views/nonpmc/nonpmc.js.rb               | 169 +++++++++++++++++
 .../views/{committees.html.rb => nonpmcs.html.rb}  |  18 +-
 www/status/monitors/system.rb                      |  25 +--
 17 files changed, 824 insertions(+), 60 deletions(-)