You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by cu...@apache.org on 2017/07/03 19:58:16 UTC

[whimsy] 01/02: Merge branch 'master' into roster-style

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

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

commit ae6b502518f48b32ba0a85184a2bff48f2aa27ff
Merge: aea32bd 0a29f8f
Author: Shane Curcuru <as...@shanecurcuru.org>
AuthorDate: Mon Jul 3 14:53:59 2017 -0400

    Merge branch 'master' into roster-style

 doap_Whimsy.rdf                                    |    2 +-
 lib/whimsy/asf/ldap.rb                             |   20 +-
 lib/whimsy/asf/mlist.rb                            |  158 +-
 lib/whimsy/asf/person.rb                           |    2 +-
 www/board/subscriptions.cgi                        |    9 +-
 www/committers/assets/bootstrap-select.css         |  300 ++++
 www/committers/assets/bootstrap-select.js          | 1895 ++++++++++++++++++++
 www/committers/subscribe.cgi                       |   17 +-
 www/incubator/moderators.cgi                       |    4 +-
 www/index.html                                     |    1 +
 www/members/subscriptions.cgi                      |   12 +-
 www/officers/mlreq.cgi                             |  520 ++++++
 www/roster/models/committer.rb                     |    7 +
 www/roster/views/actions/service.json.rb           |   56 +
 www/roster/views/group.js.rb                       |   22 +-
 www/roster/views/person.js.rb                      |    7 +
 www/secretary/public-names.cgi                     |    2 +
 www/test/icla/.gitignore                           |    1 -
 www/test/icla/Gemfile                              |   12 +-
 www/test/icla/config.ru                            |    1 +
 www/test/icla/main.rb                              |    2 +-
 www/test/icla/public/assets/bootstrap-min.css      |    5 -
 www/test/icla/public/assets/bootstrap-min.js       |    7 -
 .../icla/public/assets/bootstrap-theme.min.css     |    5 -
 www/test/icla/public/assets/jquery-min.js          |    4 -
 www/test/icla/public/assets/react-min.js           |   15 -
 www/test/icla/tmp/.gitignore                       |    1 +
 www/test/icla/views/app.html.rb                    |    2 +-
 28 files changed, 2964 insertions(+), 125 deletions(-)

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