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 2018/03/24 11:24:57 UTC
[whimsy] branch master updated (d606efa -> 659e1a3)
This is an automated email from the ASF dual-hosted git repository.
curcuru pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git.
from d606efa add in a few more directors
new a75495f Add in some data back to 2010
new 659e1a3 Correct Brian McCallister initials
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
www/members/board-attend.cgi | 9 ++++++---
www/roster/views/group.js.rb | 2 +-
www/roster/views/pmc/pmc.js.rb | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
--
To stop receiving notification emails like this one, please contact
curcuru@apache.org.
[whimsy] 01/02: Add in some data back to 2010
Posted by cu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
curcuru pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit a75495f154ffb490925ad06e914001252b552987
Author: Shane Curcuru <as...@shanecurcuru.org>
AuthorDate: Fri Mar 23 22:01:10 2018 -0400
Add in some data back to 2010
---
www/members/board-attend.cgi | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/www/members/board-attend.cgi b/www/members/board-attend.cgi
index f4a2d3f..9b04230 100755
--- a/www/members/board-attend.cgi
+++ b/www/members/board-attend.cgi
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby
-PAGETITLE = "Board Meeting Attendance since 2013" # Wvisible:meeting
+PAGETITLE = "Board Meeting Attendance since 2010" # Wvisible:meeting
$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
require 'whimsy/asf'
@@ -14,23 +14,29 @@ IS_DIRECTOR = :director
APPROVED = 'approved'
# Map director ids->names and ids->initials
-# Only since 2013, once the preapp data in meetings is parseable
+# Only since 2010, once the preapp data in meetings is parseable
INITIALS = 0
FIRST_NAME = 1
DISPLAY_NAME = 2
DIRECTOR_MAP = {
'bdelacretaz' => ['bd', 'Bertrand', 'Bertrand Delacretaz'],
'brett' => ['bp', 'Brett', 'Brett Porter'],
+ 'brianm' => ['bmc', 'Brian', 'Brian McCallister'],
'curcuru' => ['sc', 'Shane', 'Shane Curcuru'],
'cutting' => ['dc', 'Doug', 'Doug Cutting'],
+ 'dkulp' => ['dk', 'Daniel', 'Daniel Kulp'],
'fielding' => ['rf', 'Roy', 'Roy T. Fielding'],
+ 'geirm' => ['gmj', 'Geir', 'Geir Magnusson Jr'],
'gstein' => ['gs', 'Greg', 'Greg Stein'],
'isabel' => ['idf', 'Isabel', 'Isabel Drost-Fromm'],
+ 'jerenkrantz' => ['je', 'Justin', 'Justin Erenkrantz'],
'jim' => ['jj', 'Jim', 'Jim Jagielski'],
'ke4qqq' => ['dn', 'David', 'David Nalley'],
+ 'lrosen' => ['lr', 'Lawrence', 'Lawrence Rosen'],
'markt' => ['mt', 'Mark', 'Mark Thomas'],
'marvin' => ['mh', 'Marvin', 'Marvin Humphrey'],
'mattmann' => ['cm', 'Chris', 'Chris Mattmann'],
+ 'noirin' => ['np', 'Noirin', 'Noirin Plunkett'],
'psteitz' => ['ps', 'Phil', 'Phil Steitz'],
'rbowen' => ['rb', 'Rich', 'Rich Bowen'],
'rgardler' => ['rg', 'Ross', 'Ross Gardler'],
--
To stop receiving notification emails like this one, please contact
curcuru@apache.org.
Re: [whimsy] 02/02: Correct Brian McCallister initials
Posted by Shane Curcuru <as...@shanecurcuru.org>.
sebb wrote on 3/24/18 9:07 AM:
> On 24 March 2018 at 11:24, <cu...@apache.org> wrote:
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> curcuru pushed a commit to branch master
>> in repository https://gitbox.apache.org/repos/asf/whimsy.git
>>
>> commit 659e1a3b930063f0c38774e9b09e6ff2d2914521
>> Merge: a75495f d606efa
>> Author: Shane Curcuru <as...@shanecurcuru.org>
>> AuthorDate: Sat Mar 24 07:24:51 2018 -0400
>>
>> Correct Brian McCallister initials
>
> Comment does not agree with changes below ...
Arg. I was using GH Desktop to resolve a conflict in the names between
Sam's d606efa35659dee975d3f1dca60b73adab84013d and my work. Not sure
why this comment got put on that change.
In any case, the names seem correct now (vis-a-vis what account details
show).
>
>> # Conflicts:
>> # www/members/board-attend.cgi
>>
>> www/members/board-attend.cgi | 7 ++++++-
>> 1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --cc www/members/board-attend.cgi
>> index 9b04230,2c3a9b4..379a407
>> --- a/www/members/board-attend.cgi
>> +++ b/www/members/board-attend.cgi
>> @@@ -31,8 -30,8 +31,9 @@@ DIRECTOR_MAP =
>> 'isabel' => ['idf', 'Isabel', 'Isabel Drost-Fromm'],
>> 'jerenkrantz' => ['je', 'Justin', 'Justin Erenkrantz'],
>> 'jim' => ['jj', 'Jim', 'Jim Jagielski'],
>> + 'lrosen' => ['lr', 'Larry', 'Larry Rosen'],
>> 'ke4qqq' => ['dn', 'David', 'David Nalley'],
>> + 'lrosen' => ['lr', 'Lawrence', 'Lawrence Rosen'],
>> 'markt' => ['mt', 'Mark', 'Mark Thomas'],
>> 'marvin' => ['mh', 'Marvin', 'Marvin Humphrey'],
>> 'mattmann' => ['cm', 'Chris', 'Chris Mattmann'],
>>
>> --
>> To stop receiving notification emails like this one, please contact
>> curcuru@apache.org.
--
- Shane
Director & Member
The Apache Software Foundation
Re: [whimsy] 02/02: Correct Brian McCallister initials
Posted by sebb <se...@gmail.com>.
On 24 March 2018 at 11:24, <cu...@apache.org> wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> curcuru pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/whimsy.git
>
> commit 659e1a3b930063f0c38774e9b09e6ff2d2914521
> Merge: a75495f d606efa
> Author: Shane Curcuru <as...@shanecurcuru.org>
> AuthorDate: Sat Mar 24 07:24:51 2018 -0400
>
> Correct Brian McCallister initials
Comment does not agree with changes below ...
> # Conflicts:
> # www/members/board-attend.cgi
>
> www/members/board-attend.cgi | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --cc www/members/board-attend.cgi
> index 9b04230,2c3a9b4..379a407
> --- a/www/members/board-attend.cgi
> +++ b/www/members/board-attend.cgi
> @@@ -31,8 -30,8 +31,9 @@@ DIRECTOR_MAP =
> 'isabel' => ['idf', 'Isabel', 'Isabel Drost-Fromm'],
> 'jerenkrantz' => ['je', 'Justin', 'Justin Erenkrantz'],
> 'jim' => ['jj', 'Jim', 'Jim Jagielski'],
> + 'lrosen' => ['lr', 'Larry', 'Larry Rosen'],
> 'ke4qqq' => ['dn', 'David', 'David Nalley'],
> + 'lrosen' => ['lr', 'Lawrence', 'Lawrence Rosen'],
> 'markt' => ['mt', 'Mark', 'Mark Thomas'],
> 'marvin' => ['mh', 'Marvin', 'Marvin Humphrey'],
> 'mattmann' => ['cm', 'Chris', 'Chris Mattmann'],
>
> --
> To stop receiving notification emails like this one, please contact
> curcuru@apache.org.
[whimsy] 02/02: Correct Brian McCallister initials
Posted by cu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
curcuru pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit 659e1a3b930063f0c38774e9b09e6ff2d2914521
Merge: a75495f d606efa
Author: Shane Curcuru <as...@shanecurcuru.org>
AuthorDate: Sat Mar 24 07:24:51 2018 -0400
Correct Brian McCallister initials
# Conflicts:
# www/members/board-attend.cgi
www/members/board-attend.cgi | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --cc www/members/board-attend.cgi
index 9b04230,2c3a9b4..379a407
--- a/www/members/board-attend.cgi
+++ b/www/members/board-attend.cgi
@@@ -31,8 -30,8 +31,9 @@@ DIRECTOR_MAP =
'isabel' => ['idf', 'Isabel', 'Isabel Drost-Fromm'],
'jerenkrantz' => ['je', 'Justin', 'Justin Erenkrantz'],
'jim' => ['jj', 'Jim', 'Jim Jagielski'],
+ 'lrosen' => ['lr', 'Larry', 'Larry Rosen'],
'ke4qqq' => ['dn', 'David', 'David Nalley'],
+ 'lrosen' => ['lr', 'Lawrence', 'Lawrence Rosen'],
'markt' => ['mt', 'Mark', 'Mark Thomas'],
'marvin' => ['mh', 'Marvin', 'Marvin Humphrey'],
'mattmann' => ['cm', 'Chris', 'Chris Mattmann'],
--
To stop receiving notification emails like this one, please contact
curcuru@apache.org.