(whimsy) branch master updated: Update add comment label display (#210)

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new 6178be81 Update add comment label display (#210)
6178be81 is described below

commit 6178be8167524908a24d4407e96f79722669e59f
Author: Shane Curcuru 
AuthorDate: Fri Mar 15 17:46:53 2024 -0400

Update add comment label display (#210)
---
 www/board/agenda/views/buttons/add-comment.js.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/board/agenda/views/buttons/add-comment.js.rb 
b/www/board/agenda/views/buttons/add-comment.js.rb
index 004b5444..fe93ba27 100644
--- a/www/board/agenda/views/buttons/add-comment.js.rb
+++ b/www/board/agenda/views/buttons/add-comment.js.rb
@@ -35,7 +35,7 @@ class AddComment < Vue
   end
 
   #input field: initials
-  _input.comment_initials! label: 'Initials',
+  _input.comment_initials! label: 'Apache ID',
 placeholder: 'initials', disabled: @disabled,
 value: @@server.pending.initials || @@server.initials
 

(whimsy) branch master updated: docs: remove unneeded duplicate words (#203)

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new 8494c83b docs: remove unneeded duplicate words (#203)
8494c83b is described below

commit 8494c83b098d1c7a1138a463a685f51f5c99d021
Author: John Bampton 
AuthorDate: Thu Feb 22 12:57:26 2024 +1000

docs: remove unneeded duplicate words (#203)
---
 MACOS.md   | 4 ++--
 www/board/agenda/README.md | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MACOS.md b/MACOS.md
index 88e7dd43..f4ce64da 100644
--- a/MACOS.md
+++ b/MACOS.md
@@ -233,7 +233,7 @@ Configure whimsy.local, Complete Apache configuration, Make 
whimsy.local an
 alias for your machine, and Optional: forward whimsy.local traffic to port 8080
 steps.
 
-Running Whimsy tools locally depends on httpd.  Apple provides a copy of httpd 
that that you can configure and start.
+Running Whimsy tools locally depends on httpd.  Apple provides a copy of httpd 
that you can configure and start.
 
 Install:
 
@@ -338,7 +338,7 @@ $ brew info passenger
 
 For the second step (`brew info passenger`), you will need to
 follow the instructions -- which essentially is to copy a few lines to
-to a specified location, typically `/etc/apache2/other/passenger.conf`.
+a specified location, typically `/etc/apache2/other/passenger.conf`.
 
 If your ruby is installed in `/usr/local/bin`, change the last line to
 
diff --git a/www/board/agenda/README.md b/www/board/agenda/README.md
index c40fb646..bf0aabed 100644
--- a/www/board/agenda/README.md
+++ b/www/board/agenda/README.md
@@ -240,7 +240,7 @@ Viewing Source (this time, Actual Code)
[views/app.js.rb](views/app.js.rb) lists all of the files that make up the
client side of the application.
 
- * This brings us back to to the `app.js` script mentioned much earlier.
+ * This brings us back to the `app.js` script mentioned much earlier.
If you visit [http://localhost:9292/app.js](http://localhost:9292/app.js)
you will see the full script.  Every bit of this JavaScript was generated
from the js.rb files mentioned above.  Undoubtedly you have seen small
@@ -351,7 +351,7 @@ in your home directory.  The file format is YAML, and here 
is mine:
 
 
 Adapt as necessary.  You don't need to have all those entries in the `svn`
-value to run the board agenda tool.  The `lib` value is is an array of
+value to run the board agenda tool.  The `lib` value is an array of
 libraries that are to be used instead of gems you may have installed.  This is
 useful if you are making changes to the agenda parsing logic, ruby2js or
 wunderbar.  You can remove this too.  If you drop the `ldap` entry, one will

(whimsy) branch clr-apache-postal-address created (now ace0f633)

[clr]

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

clr pushed a change to branch clr-apache-postal-address
in repository https://gitbox.apache.org/repos/asf/whimsy.git


  at ace0f633 Update incomplete.json.rb

This branch includes the following new commits:

 new ace0f633 Update incomplete.json.rb

The 1 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.

(whimsy) 01/01: Update incomplete.json.rb

[clr]

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

clr pushed a commit to branch clr-apache-postal-address
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit ace0f63387ff602bb4f0289ce582b1971d5813fa
Author: Craig L Russell 
AuthorDate: Sat Nov 11 15:30:39 2023 -0800

Update incomplete.json.rb

Clarify incomplete postal address (detailed personal residence address)
---
 www/secretary/workbench/views/actions/incomplete.json.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/secretary/workbench/views/actions/incomplete.json.rb 
b/www/secretary/workbench/views/actions/incomplete.json.rb
index ee4252e3..70c45b66 100644
--- a/www/secretary/workbench/views/actions/incomplete.json.rb
+++ b/www/secretary/workbench/views/actions/incomplete.json.rb
@@ -13,9 +13,9 @@ _extract_project
 
 # The keys below must agree with the checkbox names in parts.js.rb
 REASONS = {
-  '@missing_address' => 'missing or incomplete postal address',
+  '@missing_address' => 'missing or incomplete postal address (include street, 
building, unit/apartment)',
   '@missing_email' => 'missing email address',
-  '@corporate_postal' => 'the postal address does not appear to be a personal 
postal address',
+  '@corporate_postal' => 'the postal address does not appear to be a personal 
residence address',
   '@invalid_public' => 'the public name should be a real name or pen name and 
not a user id',
   '@separate_signature' => 'the document and signature must be sent attached 
to the same email',
   '@unauthorized_signature' => 'the signature must be from an authorized 
person, usually a company executive',

[whimsy] branch clr-apache-update-new-pmc-member updated: Update mod.js.rb

[clr]

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

clr pushed a commit to branch clr-apache-update-new-pmc-member
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to 
refs/heads/clr-apache-update-new-pmc-member by this push:
 new 27d16402 Update mod.js.rb
27d16402 is described below

commit 27d1640244eeed671092389244d1d0b8e4b4515f
Author: Craig L Russell 
AuthorDate: Mon Apr 24 14:49:29 2023 -0700

Update mod.js.rb

Initialize @votelink variable
Fix link to private list query
---
 www/roster/views/pmc/mod.js.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/roster/views/pmc/mod.js.rb b/www/roster/views/pmc/mod.js.rb
index 6b31b470..690ca2f3 100644
--- a/www/roster/views/pmc/mod.js.rb
+++ b/www/roster/views/pmc/mod.js.rb
@@ -8,6 +8,7 @@ class PMCMod < Vue
 
   def initialize
 @people = []
+@votelink = ''
   end
 
   def render
@@ -51,7 +52,7 @@ class PMCMod < Vue
 href: 'https://www.apache.org/dev/pmc.html#newpmc'
   _a 'You can use the following link to find the thread on the 
private list'
   _a 'and copy it into the text field below.'
-href: 'https://lists.apache.org/list?private@' + 
@@project.display.name + '.apache.org:lte=6M:'
+href: 
'https://lists.apache.org/list?private@#{@project}.apache.org:lte=6M:'
   _ ' (the PMC private@ mailing list).'  
 end
 _label do

[whimsy] branch clr-apache-update-new-pmc-member updated: Update mod.js.rb

[clr]

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

clr pushed a commit to branch clr-apache-update-new-pmc-member
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to 
refs/heads/clr-apache-update-new-pmc-member by this push:
 new c96a2087 Update mod.js.rb
c96a2087 is described below

commit c96a2087fe564de6b6df6f94258637fe86f7393e
Author: Craig L Russell 
AuthorDate: Sun Apr 23 16:19:23 2023 -0700

Update mod.js.rb

update modify role to include link to VOTE or consensus thread
---
 www/roster/views/pmc/mod.js.rb | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/www/roster/views/pmc/mod.js.rb b/www/roster/views/pmc/mod.js.rb
index feae2411..6b31b470 100644
--- a/www/roster/views/pmc/mod.js.rb
+++ b/www/roster/views/pmc/mod.js.rb
@@ -46,13 +46,17 @@ class PMCMod < Vue
 _br
 _b do
   _ 'Before adding a new PMC member, '
-  _a 'email notification must have been received by the Board 
mailing list',
-href: 
'https://www.apache.org/dev/pmc.html#send-the-board-a-notice-of-the-vote-to-add-someone'
-  _ ' (cc: the PMC private@ mailing list).'
+  _a 'the PMC must approve the new member by VOTE or 
consensus.',
+  _a 'a VOTE thread or consensus decistion must be made on the 
private mail list',
+href: 'https://www.apache.org/dev/pmc.html#newpmc'
+  _a 'You can use the following link to find the thread on the 
private list'
+  _a 'and copy it into the text field below.'
+href: 'https://lists.apache.org/list?private@' + 
@@project.display.name + '.apache.org:lte=6M:'
+  _ ' (the PMC private@ mailing list).'  
 end
 _label do
-  _span 'Has the NOTICE email been received by the board list?'
-  _input type: 'checkbox', checked: @notice_elapsed
+  _span 'Enter the link to the approval VOTE or consensus 
thread:'
+  _input type: 'text', value:@votelink
 end
   end
 end

[whimsy] branch clr-apache-update-new-pmc-member created (now 82b78e95)

[clr]

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

clr pushed a change to branch clr-apache-update-new-pmc-member
in repository https://gitbox.apache.org/repos/asf/whimsy.git


  at 82b78e95 Update add.js.rb

This branch includes the following new commits:

 new 82b78e95 Update add.js.rb

The 1 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.

[whimsy] 01/01: Update add.js.rb

[clr]

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

clr pushed a commit to branch clr-apache-update-new-pmc-member
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit 82b78e95b3f787a38fce7d6f9c6e0e3846db3941
Author: Craig L Russell 
AuthorDate: Sun Apr 23 15:53:37 2023 -0700

Update add.js.rb

Remove check box
Add link to lists.apache.org private list
Add input field for VOTE or approval thread
---
 www/roster/views/pmc/add.js.rb | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/www/roster/views/pmc/add.js.rb b/www/roster/views/pmc/add.js.rb
index 48ecbcef..2672b836 100644
--- a/www/roster/views/pmc/add.js.rb
+++ b/www/roster/views/pmc/add.js.rb
@@ -58,13 +58,15 @@ class PMCAdd < Vue
 _br
 _b do
   _ 'Before adding a new PMC member, '
-  _a 'email notification must be sent to the Board mailing 
list',
-href: 
'https://www.apache.org/dev/pmc.html#send-the-board-a-notice-of-the-vote-to-add-someone'
-  _ ' (cc: the PMC private@ mailing list).'
+  _a 'the PMC must approve the new member by VOTE or 
consensus.',
+  _a 'You can use the following link to find the thread on the 
private list'
+  _a 'and copy it into the text field below.'
+href: 'https://lists.apache.org/list?private@' + 
@@project.display.name + '.apache.org:lte=6M:'
+  _ ' (the PMC private@ mailing list).'
 end
 _label do
-  _span 'Has the NOTICE email been received by the board list?'
-  _input type: 'checkbox', checked: @notice_elapsed
+  _span 'Enter the link to the approval VOTE or consensus 
thread:'
+  _input type: 'text', value:@votelink
 end
   end
 end

[whimsy] branch clr-apache-resubmit created (now 4ed30be0)

[clr]

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

clr pushed a change to branch clr-apache-resubmit
in repository https://gitbox.apache.org/repos/asf/whimsy.git


  at 4ed30be0 Update resubmit.erb

This branch includes the following new commits:

 new 4ed30be0 Update resubmit.erb

The 1 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.

[whimsy] 01/01: Update resubmit.erb

[clr]

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

clr pushed a commit to branch clr-apache-resubmit
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit 4ed30be085aa42fc5333e6c52cfcce2d41ae6d18
Author: Craig L Russell 
AuthorDate: Sat Dec 31 16:04:02 2022 -0800

Update resubmit.erb

Include instructions for an existing committer who erroneously submits 
another ICLA
---
 www/secretary/workbench/templates/resubmit.erb | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/www/secretary/workbench/templates/resubmit.erb 
b/www/secretary/workbench/templates/resubmit.erb
index 7ca829a9..2e3fc36d 100644
--- a/www/secretary/workbench/templates/resubmit.erb
+++ b/www/secretary/workbench/templates/resubmit.erb
@@ -1,10 +1,14 @@
 Dear <%= @email.display_names.join(', ') %>,
 
 Thanks for the ICLA, however we already have a copy.
-The <%= @cttee %> can use the existing ICLA to request your account by using 
Whimsy:
+If you are not already a committer, the <%= @cttee %> can use the existing 
ICLA to request your account by using Whimsy:
 
 https://whimsy.apache.org/officers/acreq.cgi (PMC chair and ASF members only)
 
+If you are already a committer on another project, the <%= @cttee %> can use 
Whimsy to give you permissions to the repository:
+
+https://whimsy.apache.org/roster/committee
+
 Please take up any further queries with the <%= @cttee %>.
 
 Warm Regards,

[whimsy] branch master updated: Update icla-invalid-id.erb (#167)

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new 1c187376 Update icla-invalid-id.erb (#167)
1c187376 is described below

commit 1c1873767fa841e1cd4a597852d539f0ef77d672
Author: Craig L Russell 
AuthorDate: Mon Jul 11 07:01:47 2022 -0700

Update icla-invalid-id.erb (#167)

* Update icla-invalid-id.erb

Add text to submitter acknowledgement email for invalid requested id. The 
id might be unavailable even though it does not contain any special characters 
and is not listed in the public committer-index web page.

* Update icla-invalid-id.erb

Update per comment from Sebb.
---
 www/secretary/workbench/templates/icla-invalid-id.erb | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/www/secretary/workbench/templates/icla-invalid-id.erb 
b/www/secretary/workbench/templates/icla-invalid-id.erb
index ada922ed..59381c72 100644
--- a/www/secretary/workbench/templates/icla-invalid-id.erb
+++ b/www/secretary/workbench/templates/icla-invalid-id.erb
@@ -6,14 +6,18 @@ With this message, <%= @notify %> been notified that your 
ICLA has been filed.
 
 ** Please contact the <%= @cttee %> with any further questions, not the 
Secretary. Thanks. **
 
-Please provide the <%= @cttee %> (copied) with a valid Apache id. 
+The id you requested (<%= @user %>) is not available. 
 
-The id must not already be in use. See 
https://people.apache.org/committer-index.html
-Note that some existing ids include '-' and '_'. These characters are no 
longer permitted in ids.
+Please provide the <%= @cttee %> (copied) with a valid Apache id. They can 
then request your account using Whimsy.
+You can provide more than one id in case your next choice is also unavailable.
 
 The id must consist of lowercase alphanumeric characters only, starting with 
an alphabetic character.
 Minimum length 3 characters. No special characters.
 
+The id must not already be in use. See 
https://people.apache.org/committer-index.html
+Note that some existing ids include '-' and '_'. These characters are no 
longer permitted in ids.
+Some ids are not available because they are reserved for administrative use or 
are assigned to inactive accounts.
+
 Warm Regards,
 
 <%= @sig %>

[whimsy] branch unavailable-userid updated (9e7c196d -> 8ae03a40)

[clr]

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

clr pushed a change to branch unavailable-userid
in repository https://gitbox.apache.org/repos/asf/whimsy.git


from 9e7c196d Update icla-invalid-id.erb
 add 8ae03a40 Update icla-invalid-id.erb

No new revisions were added by this update.

Summary of changes:
 www/secretary/workbench/templates/icla-invalid-id.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[whimsy] branch unavailable-userid created (now 9e7c196d)

[clr]

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

clr pushed a change to branch unavailable-userid
in repository https://gitbox.apache.org/repos/asf/whimsy.git


  at 9e7c196d Update icla-invalid-id.erb

This branch includes the following new commits:

 new 9e7c196d Update icla-invalid-id.erb

The 1 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.

[whimsy] 01/01: Update icla-invalid-id.erb

[clr]

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

clr pushed a commit to branch unavailable-userid
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit 9e7c196ddc15c01ffd6fa637575d0679ad7b22e9
Author: Craig L Russell 
AuthorDate: Sun Jul 10 15:39:49 2022 -0700

Update icla-invalid-id.erb

Add text to submitter acknowledgement email for invalid requested id. The 
id might be unavailable even though it does not contain any special characters 
and is not listed in the public committer-index web page.
---
 www/secretary/workbench/templates/icla-invalid-id.erb | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/www/secretary/workbench/templates/icla-invalid-id.erb 
b/www/secretary/workbench/templates/icla-invalid-id.erb
index ada922ed..38601ce3 100644
--- a/www/secretary/workbench/templates/icla-invalid-id.erb
+++ b/www/secretary/workbench/templates/icla-invalid-id.erb
@@ -6,14 +6,18 @@ With this message, <%= @notify %> been notified that your 
ICLA has been filed.
 
 ** Please contact the <%= @cttee %> with any further questions, not the 
Secretary. Thanks. **
 
-Please provide the <%= @cttee %> (copied) with a valid Apache id. 
+The id you requested (<%= @user %>) is not available. 
 
-The id must not already be in use. See 
https://people.apache.org/committer-index.html
-Note that some existing ids include '-' and '_'. These characters are no 
longer permitted in ids.
+Please provide the <%= @cttee %> (copied) with a valid Apache id. They can 
then request your account using whimsy.
+You can provide more than one id in case your next choice is also unavailable.
 
 The id must consist of lowercase alphanumeric characters only, starting with 
an alphabetic character.
 Minimum length 3 characters. No special characters.
 
+The id must not already be in use. See 
https://people.apache.org/committer-index.html
+Note that some existing ids include '-' and '_'. These characters are no 
longer permitted in ids.
+Some ids are not available because they are reserved for administrative use or 
are assigned to inactive accounts.
+
 Warm Regards,
 
 <%= @sig %>

[whimsy] branch master updated: Add script font to message (#166)

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new 6ada750b Add script font to message (#166)
6ada750b is described below

commit 6ada750b433cda0a477ea00207c9bf6af96c1dda
Author: Craig L Russell 
AuthorDate: Fri Jun 10 14:07:19 2022 -0700

Add script font to message (#166)

* Add script font to message

Remove unsigned form from special action

* Update incomplete.json.rb

Add descriptions for script font and unsigned
---
 www/secretary/workbench/views/actions/incomplete.json.rb |  2 ++
 www/secretary/workbench/views/parts.js.rb| 10 ++
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/www/secretary/workbench/views/actions/incomplete.json.rb 
b/www/secretary/workbench/views/actions/incomplete.json.rb
index 31a3fc72..f7b979d8 100644
--- a/www/secretary/workbench/views/actions/incomplete.json.rb
+++ b/www/secretary/workbench/views/actions/incomplete.json.rb
@@ -24,6 +24,8 @@ REASONS = {
   '@wrong_identity' => 'the public key does not match the name/email on the 
form',
   '@validation_failed' => 'gpg validation failed',
   '@signature_not_armored' => 'gpg signature must be detached and 
ascii-armored',
+  '@unsigned' => 'the document appears to be unsigned',
+  '@script_font' => 'a name typed in a script font is not a signature',
 }
 
 # send rejection email
diff --git a/www/secretary/workbench/views/parts.js.rb 
b/www/secretary/workbench/views/parts.js.rb
index 4de0a741..54bda061 100644
--- a/www/secretary/workbench/views/parts.js.rb
+++ b/www/secretary/workbench/views/parts.js.rb
@@ -312,24 +312,18 @@ class Parts < Vue
 _label do
   _input type: 'checkbox', checked: @unsigned,
   onClick: -> {@unsigned = !@unsigned}
-  _span ' the document appears to be unsigned'
+  _span ' unsigned'
 end
   end
   _li do
 _label do
   _input type: 'checkbox', checked: @script_font,
   onClick: -> {@script_font = !@script_font}
-  _span ' a name typed in a script font is not a signature'
+  _span ' script font'
 end
   end
 end
 
-_label do
-  _input type: 'radio', name: 'doctype', value: 'unsigned',
-onClick: self.reject
-  _span 'unsigned form'
-end
-
 _label do
   _input type: 'radio', name: 'doctype', value: 'resubmit',
 onClick: self.reject

[whimsy] branch script-font updated: Update incomplete.json.rb

[clr]

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

clr pushed a commit to branch script-font
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/script-font by this push:
 new d68b0ed1 Update incomplete.json.rb
d68b0ed1 is described below

commit d68b0ed1fe9196adac45d1f51217f453d9d249aa
Author: Craig L Russell 
AuthorDate: Fri Jun 10 14:05:28 2022 -0700

Update incomplete.json.rb

Add descriptions for script font and unsigned
---
 www/secretary/workbench/views/actions/incomplete.json.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/www/secretary/workbench/views/actions/incomplete.json.rb 
b/www/secretary/workbench/views/actions/incomplete.json.rb
index 31a3fc72..f7b979d8 100644
--- a/www/secretary/workbench/views/actions/incomplete.json.rb
+++ b/www/secretary/workbench/views/actions/incomplete.json.rb
@@ -24,6 +24,8 @@ REASONS = {
   '@wrong_identity' => 'the public key does not match the name/email on the 
form',
   '@validation_failed' => 'gpg validation failed',
   '@signature_not_armored' => 'gpg signature must be detached and 
ascii-armored',
+  '@unsigned' => 'the document appears to be unsigned',
+  '@script_font' => 'a name typed in a script font is not a signature',
 }
 
 # send rejection email

[whimsy] branch script-font created (now 01f7011d)

[clr]

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

clr pushed a change to branch script-font
in repository https://gitbox.apache.org/repos/asf/whimsy.git


  at 01f7011d Add script font to message

This branch includes the following new commits:

 new 01f7011d Add script font to message

The 1 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.

[whimsy] 01/01: Add script font to message

[clr]

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

clr pushed a commit to branch script-font
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit 01f7011d3e455025225e100662cd92adfd9c7193
Author: Craig L Russell 
AuthorDate: Fri Jun 10 13:59:22 2022 -0700

Add script font to message

Remove unsigned form from special action
---
 www/secretary/workbench/views/parts.js.rb | 10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/www/secretary/workbench/views/parts.js.rb 
b/www/secretary/workbench/views/parts.js.rb
index 4de0a741..54bda061 100644
--- a/www/secretary/workbench/views/parts.js.rb
+++ b/www/secretary/workbench/views/parts.js.rb
@@ -312,24 +312,18 @@ class Parts < Vue
 _label do
   _input type: 'checkbox', checked: @unsigned,
   onClick: -> {@unsigned = !@unsigned}
-  _span ' the document appears to be unsigned'
+  _span ' unsigned'
 end
   end
   _li do
 _label do
   _input type: 'checkbox', checked: @script_font,
   onClick: -> {@script_font = !@script_font}
-  _span ' a name typed in a script font is not a signature'
+  _span ' script font'
 end
   end
 end
 
-_label do
-  _input type: 'radio', name: 'doctype', value: 'unsigned',
-onClick: self.reject
-  _span 'unsigned form'
-end
-
 _label do
   _input type: 'radio', name: 'doctype', value: 'resubmit',
 onClick: self.reject

[whimsy] branch master updated: Update parts.js.rb (#165)

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new e13fe85b Update parts.js.rb (#165)
e13fe85b is described below

commit e13fe85b3eb67f76bce912dab70e949b370710d7
Author: Craig L Russell 
AuthorDate: Fri Jun 10 10:18:53 2022 -0700

Update parts.js.rb (#165)

* Update parts.js.rb

Add unsigned document and script font to document reject menu

* Update parts.js.rb

Fix typo; change key validation failed to signature validation failed
---
 www/secretary/workbench/views/parts.js.rb | 20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/www/secretary/workbench/views/parts.js.rb 
b/www/secretary/workbench/views/parts.js.rb
index 42efe0f3..4de0a741 100644
--- a/www/secretary/workbench/views/parts.js.rb
+++ b/www/secretary/workbench/views/parts.js.rb
@@ -23,6 +23,8 @@ class Parts < Vue
 @wrong_identity = false
 @validation_failed = false
 @signature_not_armored = false
+@unsigned = false
+@script_font = false
   end
 
   
@@ -196,6 +198,8 @@ class Parts < Vue
 _input type: 'hidden', name: 'wrong_identity', value: 
@wrong_identity
 _input type: 'hidden', name: 'validation_failed', value: 
@validation_failed
 _input type: 'hidden', name: 'signature_not_armored', value: 
@signature_not_armored
+_input type: 'hidden', name: 'unsigned', value: @unsigned
+_input type: 'hidden', name: 'script_font', value: @script_font
 
 # Defer processing (must be part of POST block)
 
@@ -294,7 +298,7 @@ class Parts < Vue
 _label do
   _input type: 'checkbox', checked: @validation_failed,
   onClick: -> {@validation_failed = !@validation_failed}
-  _span ' gpg key validation failed'
+  _span ' gpg signature validation failed'
 end
   end
   _li do
@@ -304,6 +308,20 @@ class Parts < Vue
   _span ' gpg signature not armored'
 end
   end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @unsigned,
+  onClick: -> {@unsigned = !@unsigned}
+  _span ' the document appears to be unsigned'
+end
+  end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @script_font,
+  onClick: -> {@script_font = !@script_font}
+  _span ' a name typed in a script font is not a signature'
+end
+  end
 end
 
 _label do

[whimsy] branch unsigned-document updated (939729c7 -> 3ca98322)

[clr]

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

clr pushed a change to branch unsigned-document
in repository https://gitbox.apache.org/repos/asf/whimsy.git


from 939729c7 Update parts.js.rb
 add 3ca98322 Update parts.js.rb

No new revisions were added by this update.

Summary of changes:
 www/secretary/workbench/views/parts.js.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[whimsy] branch unsigned-document created (now 939729c7)

[clr]

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

clr pushed a change to branch unsigned-document
in repository https://gitbox.apache.org/repos/asf/whimsy.git


  at 939729c7 Update parts.js.rb

This branch includes the following new commits:

 new 939729c7 Update parts.js.rb

The 1 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.

[whimsy] 01/01: Update parts.js.rb

[clr]

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

clr pushed a commit to branch unsigned-document
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit 939729c7deab04a483c47ef488796a1bdd997c05
Author: Craig L Russell 
AuthorDate: Thu Jun 9 16:45:24 2022 -0700

Update parts.js.rb

Add unsigned document and script font to document reject menu
---
 www/secretary/workbench/views/parts.js.rb | 18 ++
 1 file changed, 18 insertions(+)

diff --git a/www/secretary/workbench/views/parts.js.rb 
b/www/secretary/workbench/views/parts.js.rb
index 42efe0f3..ff4c9122 100644
--- a/www/secretary/workbench/views/parts.js.rb
+++ b/www/secretary/workbench/views/parts.js.rb
@@ -23,6 +23,8 @@ class Parts < Vue
 @wrong_identity = false
 @validation_failed = false
 @signature_not_armored = false
+@unsigned = false
+@script_font = false
   end
 
   
@@ -196,6 +198,8 @@ class Parts < Vue
 _input type: 'hidden', name: 'wrong_identity', value: 
@wrong_identity
 _input type: 'hidden', name: 'validation_failed', value: 
@validation_failed
 _input type: 'hidden', name: 'signature_not_armored', value: 
@signature_not_armored
+_input type: 'hidden', name: 'unsigned', value: @unsigned
+_input type: 'hidden', name: 'script_font', value: @script_font
 
 # Defer processing (must be part of POST block)
 
@@ -304,6 +308,20 @@ class Parts < Vue
   _span ' gpg signature not armored'
 end
   end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @unsigned,
+  onClick: -> {@unsigned = !@unsigned}
+  _span ' the document appears to be unsigned'
+end
+  end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @script_font,
+  onClick: -> {@cript_font = !@cript_font}
+  _span ' a name typed in a script font is not a signature'
+end
+  end
 end
 
 _label do

[whimsy] branch master updated: Fix spelling (#151)

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new 8438fac0 Fix spelling (#151)
8438fac0 is described below

commit 8438fac053d1b74c3ffe5cb510283818e177492b
Author: John Bampton 
AuthorDate: Sun May 15 00:01:12 2022 +1000

Fix spelling (#151)

Thanks for the fix.
---
 www/secretary/ldap-check.cgi| 2 +-
 www/secretary/workbench/Gemfile | 2 +-
 www/secretary/workbench/models/mailbox.rb   | 2 +-
 www/secretary/workbench/views/actions/icla2.json.rb | 2 +-
 www/test/example.cgi| 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/www/secretary/ldap-check.cgi b/www/secretary/ldap-check.cgi
index 99c483d2..c451cc54 100755
--- a/www/secretary/ldap-check.cgi
+++ b/www/secretary/ldap-check.cgi
@@ -13,7 +13,7 @@ The two committers groups should have the same members:
 - cn=committers,ou=groups,dc=apache,dc=org (old unix group)
 
 All committers should be in LDAP people
-LDAP people whould be committers (unles login is disabled)
+LDAP people would be committers (unless login is disabled)
 
 =end
 
diff --git a/www/secretary/workbench/Gemfile b/www/secretary/workbench/Gemfile
index d9b68d77..1ef327ad 100644
--- a/www/secretary/workbench/Gemfile
+++ b/www/secretary/workbench/Gemfile
@@ -7,7 +7,7 @@ if File.exist? version_file
   asf_version = File.read(version_file).chomp
   gem 'whimsy-asf', asf_version, path: File.expand_path(root, __FILE__)
 else
-  # for docker purposes (atleast for now)
+  # for docker purposes (at least for now)
   gem 'whimsy-asf'
 end
 
diff --git a/www/secretary/workbench/models/mailbox.rb 
b/www/secretary/workbench/models/mailbox.rb
index 8c5a43d8..fe6af900 100644
--- a/www/secretary/workbench/models/mailbox.rb
+++ b/www/secretary/workbench/models/mailbox.rb
@@ -167,7 +167,7 @@ class Mailbox
   # return headers (client view)
   #
   def client_headers
-# fetch a list of headers for all messages in the maibox with attachments
+# fetch a list of headers for all messages in the mailbox with attachments
 headers = self.headers.to_a.select do |id, message|
   not Message.attachments(message).empty?
 end
diff --git a/www/secretary/workbench/views/actions/icla2.json.rb 
b/www/secretary/workbench/views/actions/icla2.json.rb
index af690baf..6ba8b0e0 100644
--- a/www/secretary/workbench/views/actions/icla2.json.rb
+++ b/www/secretary/workbench/views/actions/icla2.json.rb
@@ -1,7 +1,7 @@
 #
 # File an additional ICLA:
 #  - [optional] move existing ICLA into a directory
-#  - add files to (new) documents/iclas dirctory
+#  - add files to (new) documents/iclas directory
 #  - modify officers/iclas.txt entry
 #  - respond to original email
 #
diff --git a/www/test/example.cgi b/www/test/example.cgi
index 8497de61..599cbcf2 100755
--- a/www/test/example.cgi
+++ b/www/test/example.cgi
@@ -202,7 +202,7 @@ _html do
 if process_form(formdata: submission)
   _p.lead "Thanks for Submitting This Form!"
   _p do
-_ "The process_form method would have done any procesing 
needed with the data, after calling validate_data."
+_ "The process_form method would have done any processing 
needed with the data, after calling validate_data."
   end
 else
   _div.alert.alert_warning role: 'alert' do

[whimsy] branch master updated: Update memstat.json.rb (#145)

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new fa6aa762 Update memstat.json.rb (#145)
fa6aa762 is described below

commit fa6aa7627b26f4b9412522c0b667748ce6dc6ecf
Author: Craig L Russell 
AuthorDate: Sat Apr 23 10:42:55 2022 -0700

Update memstat.json.rb (#145)

Add server time zone to timestamp for submitted document
---
 www/roster/views/actions/memstat.json.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/roster/views/actions/memstat.json.rb 
b/www/roster/views/actions/memstat.json.rb
index 39e72989..78399c89 100644
--- a/www/roster/views/actions/memstat.json.rb
+++ b/www/roster/views/actions/memstat.json.rb
@@ -6,7 +6,7 @@ raise Exception.new("Unable to find member entry for 
#{@userid}") unless entry
 USERID = user.id
 USERMAIL = "#{USERID}@apache.org"
 USERNAME = user.cn
-TIMESTAMP = (DateTime.now.strftime "%Y-%m-%d %H:%M:%S")
+TIMESTAMP = (DateTime.now.strftime "%Y-%m-%d %H:%M:%S %:z")
 
 # identify file to be updated
 members_txt = ASF::SVN.svnpath!('foundation', 'members.txt')

[whimsy] branch master updated (c5a891dd -> 007b3331)

[clr]

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

clr pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


from c5a891dd Show more detail
 add 007b3331 Update coi.cgi (#146)

No new revisions were added by this update.

Summary of changes:
 www/officers/coi.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[whimsy] 01/01: Update coi.cgi

[clr]

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

clr pushed a commit to branch coi-timestamp-timezone
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit eaea19e81414e708ac88f0a75b47b6967279c0b8
Author: Craig L Russell 
AuthorDate: Fri Apr 22 17:44:23 2022 -0700

Update coi.cgi

Add time zone to date field in submitted document
---
 www/officers/coi.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/officers/coi.cgi b/www/officers/coi.cgi
index 3991e0e1..847c99a7 100755
--- a/www/officers/coi.cgi
+++ b/www/officers/coi.cgi
@@ -58,7 +58,7 @@ not_required_message = user_is_required ?' required':' not 
required'
 user_affirmation = SIGNERS.include? USERID
 have_affirmed_message = user_affirmation ? ' have affirmed' : ' have not 
affirmed'
 USER_IS_REQUIRED_BUT_NOT_AFFIRMED = (user_is_required and not user_affirmation)
-current_timestamp = DateTime.now.strftime "%Y-%m-%d %H:%M:%S"
+current_timestamp = DateTime.now.strftime "%Y-%m-%d %H:%M:%S %:z"
 PANEL_MESSAGE = USER_IS_REQUIRED_BUT_NOT_AFFIRMED ?
   'Sign Your Conflict of Interest Affirmation':
   'Thank you for signing the Conflict of Interest Affirmation'

[whimsy] branch coi-timestamp-timezone created (now eaea19e8)

[clr]

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

clr pushed a change to branch coi-timestamp-timezone
in repository https://gitbox.apache.org/repos/asf/whimsy.git


  at eaea19e8 Update coi.cgi

This branch includes the following new commits:

 new eaea19e8 Update coi.cgi

The 1 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.

[whimsy] branch emeritus-timestamp-timezone created (now a5cee4fc)

[clr]

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

clr pushed a change to branch emeritus-timestamp-timezone
in repository https://gitbox.apache.org/repos/asf/whimsy.git


  at a5cee4fc Update memstat.json.rb

This branch includes the following new commits:

 new a5cee4fc Update memstat.json.rb

The 1 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.

[whimsy] 01/01: Update memstat.json.rb

[clr]

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

clr pushed a commit to branch emeritus-timestamp-timezone
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit a5cee4fc7e84386d71b92617771909e176c49a22
Author: Craig L Russell 
AuthorDate: Fri Apr 22 17:36:25 2022 -0700

Update memstat.json.rb

Add time zone to timestamp for submitted document
---
 www/roster/views/actions/memstat.json.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/roster/views/actions/memstat.json.rb 
b/www/roster/views/actions/memstat.json.rb
index 39e72989..78399c89 100644
--- a/www/roster/views/actions/memstat.json.rb
+++ b/www/roster/views/actions/memstat.json.rb
@@ -6,7 +6,7 @@ raise Exception.new("Unable to find member entry for 
#{@userid}") unless entry
 USERID = user.id
 USERMAIL = "#{USERID}@apache.org"
 USERNAME = user.cn
-TIMESTAMP = (DateTime.now.strftime "%Y-%m-%d %H:%M:%S")
+TIMESTAMP = (DateTime.now.strftime "%Y-%m-%d %H:%M:%S %:z")
 
 # identify file to be updated
 members_txt = ASF::SVN.svnpath!('foundation', 'members.txt')

[whimsy] branch master updated: Signature not armored (#142)

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new 5802dab  Signature not armored (#142)
5802dab is described below

commit 5802dab2e82bed39e6518e0bea4bc7fcb410bd9b
Author: Craig L Russell 
AuthorDate: Wed Mar 30 08:33:46 2022 -0700

Signature not armored (#142)

* Update parts.js.rb

Add "gpg signature not armored"

* Update incomplete.json.rb

* Update incomplete.json.rb

Update description for signature not armored
---
 www/secretary/workbench/views/actions/incomplete.json.rb | 1 +
 www/secretary/workbench/views/parts.js.rb| 9 +
 2 files changed, 10 insertions(+)

diff --git a/www/secretary/workbench/views/actions/incomplete.json.rb 
b/www/secretary/workbench/views/actions/incomplete.json.rb
index 4198543..31a3fc7 100644
--- a/www/secretary/workbench/views/actions/incomplete.json.rb
+++ b/www/secretary/workbench/views/actions/incomplete.json.rb
@@ -23,6 +23,7 @@ REASONS = {
   '@unreadable_scan' => 'the scan is not readable or not complete',
   '@wrong_identity' => 'the public key does not match the name/email on the 
form',
   '@validation_failed' => 'gpg validation failed',
+  '@signature_not_armored' => 'gpg signature must be detached and 
ascii-armored',
 }
 
 # send rejection email
diff --git a/www/secretary/workbench/views/parts.js.rb 
b/www/secretary/workbench/views/parts.js.rb
index bcca669..42efe0f 100644
--- a/www/secretary/workbench/views/parts.js.rb
+++ b/www/secretary/workbench/views/parts.js.rb
@@ -22,6 +22,7 @@ class Parts < Vue
 @unreadable_scan = false
 @wrong_identity = false
 @validation_failed = false
+@signature_not_armored = false
   end
 
   
@@ -194,6 +195,7 @@ class Parts < Vue
 _input type: 'hidden', name: 'unreadable_scan', value: 
@unreadable_scan
 _input type: 'hidden', name: 'wrong_identity', value: 
@wrong_identity
 _input type: 'hidden', name: 'validation_failed', value: 
@validation_failed
+_input type: 'hidden', name: 'signature_not_armored', value: 
@signature_not_armored
 
 # Defer processing (must be part of POST block)
 
@@ -295,6 +297,13 @@ class Parts < Vue
   _span ' gpg key validation failed'
 end
   end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @signature_not_armored,
+  onClick: -> {@signature_not_armored = 
!@signature_not_armored}
+  _span ' gpg signature not armored'
+end
+  end
 end
 
 _label do

[whimsy] branch signature_not_armored updated (5356c1b -> 00a2825)

[clr]

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

clr pushed a change to branch signature_not_armored
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from 5356c1b  Update incomplete.json.rb
 add 00a2825  Update incomplete.json.rb

No new revisions were added by this update.

Summary of changes:
 www/secretary/workbench/views/actions/incomplete.json.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[whimsy] branch signature_not_armored updated: Update incomplete.json.rb

[clr]

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

clr pushed a commit to branch signature_not_armored
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/signature_not_armored by this 
push:
 new 5356c1b  Update incomplete.json.rb
5356c1b is described below

commit 5356c1b430305e0021707fff3d3d18262f13cb3b
Author: Craig L Russell 
AuthorDate: Tue Mar 29 17:26:30 2022 -0700

Update incomplete.json.rb
---
 www/secretary/workbench/views/actions/incomplete.json.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/secretary/workbench/views/actions/incomplete.json.rb 
b/www/secretary/workbench/views/actions/incomplete.json.rb
index 4198543..8246ecd 100644
--- a/www/secretary/workbench/views/actions/incomplete.json.rb
+++ b/www/secretary/workbench/views/actions/incomplete.json.rb
@@ -23,6 +23,7 @@ REASONS = {
   '@unreadable_scan' => 'the scan is not readable or not complete',
   '@wrong_identity' => 'the public key does not match the name/email on the 
form',
   '@validation_failed' => 'gpg validation failed',
+  '@signature_not_armored' => 'gpg signature_not_armored',
 }
 
 # send rejection email

[whimsy] 01/01: Update parts.js.rb

[clr]

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

clr pushed a commit to branch signature_not_armored
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit 727d6b13bb29105af29065a96444a61df601409a
Author: Craig L Russell 
AuthorDate: Tue Mar 29 17:23:14 2022 -0700

Update parts.js.rb

Add "gpg signature not armored"
---
 www/secretary/workbench/views/parts.js.rb | 9 +
 1 file changed, 9 insertions(+)

diff --git a/www/secretary/workbench/views/parts.js.rb 
b/www/secretary/workbench/views/parts.js.rb
index bcca669..42efe0f 100644
--- a/www/secretary/workbench/views/parts.js.rb
+++ b/www/secretary/workbench/views/parts.js.rb
@@ -22,6 +22,7 @@ class Parts < Vue
 @unreadable_scan = false
 @wrong_identity = false
 @validation_failed = false
+@signature_not_armored = false
   end
 
   
@@ -194,6 +195,7 @@ class Parts < Vue
 _input type: 'hidden', name: 'unreadable_scan', value: 
@unreadable_scan
 _input type: 'hidden', name: 'wrong_identity', value: 
@wrong_identity
 _input type: 'hidden', name: 'validation_failed', value: 
@validation_failed
+_input type: 'hidden', name: 'signature_not_armored', value: 
@signature_not_armored
 
 # Defer processing (must be part of POST block)
 
@@ -295,6 +297,13 @@ class Parts < Vue
   _span ' gpg key validation failed'
 end
   end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @signature_not_armored,
+  onClick: -> {@signature_not_armored = 
!@signature_not_armored}
+  _span ' gpg signature not armored'
+end
+  end
 end
 
 _label do

[whimsy] branch signature_not_armored created (now 727d6b1)

[clr]

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

clr pushed a change to branch signature_not_armored
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


  at 727d6b1  Update parts.js.rb

This branch includes the following new commits:

 new 727d6b1  Update parts.js.rb

The 1 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.

[whimsy] branch master updated: Update mem.erb

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new 1e9d828  Update mem.erb
1e9d828 is described below

commit 1e9d828f5dfe8d6dda0fa622a121025a0368db3f
Author: Craig L Russell 
AuthorDate: Tue Mar 15 16:27:52 2022 -0700

Update mem.erb

Fix typo, update for clarity and formatting.
---
 www/secretary/workbench/templates/mem.erb | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/www/secretary/workbench/templates/mem.erb 
b/www/secretary/workbench/templates/mem.erb
index 0f9d578..a69e773 100644
--- a/www/secretary/workbench/templates/mem.erb
+++ b/www/secretary/workbench/templates/mem.erb
@@ -7,7 +7,7 @@ This message acknowledges receipt of your membership 
application, which has been
 You will shortly be subscribed to the memb...@apache.org mailing list using 
your <%= @email %> address.
 
 You will also be subscribed to the members-not...@apache.org mailing list.
-This is a very low traffic list which is used for essential notices to members.
+This is a very low traffic list which is used for essential (legally required) 
notices to members.
 
 If you need to change your email subscriptions, please visit 
https://whimsy.apache.org/committers/subscribe 
 
@@ -16,13 +16,16 @@ https://svn.apache.org/repos/private/foundation/members.txt
 
 You can use Whimsy to check your settings:
 https://whimsy.apache.org/roster/committer/__self__
+
 Under 'Groups' you should see 'member'; this gives you access to member-only 
resources.
 Note that it may take a while for all systems to pick up the new setting.
 
-You can also use your Whimsy profile page to complete your personal profile, 
by updatimg the section of your profile under "Members.txt".
-All Members have access to all of this information, including your postal 
address, phone number, projects, and personal web page.
+You can also use your Whimsy profile page to complete your personal profile, 
by updating the section of your profile under "Members.txt".
+
+All Members have read access to all "Members.txt" information, including your 
postal address, phone number, projects, personal web page, etc.
 
 Note that some of the information is considered Personally Identifiable 
Information, and you do not have to share any information you are not 
comfortable with. 
+
 Thus, you can update the section of your profile under "Members.txt" to remove 
information, as long as you leave Name, Forms on File, and Avail ID fields.
 
 If you have any questions or concerns, please feel free to reach out at 
memb...@apache.org

[whimsy] branch master updated: Update mem.erb

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new 6acb3a9  Update mem.erb
6acb3a9 is described below

commit 6acb3a963d340813c2f32f78779e57a14b1b457e
Author: Craig L Russell 
AuthorDate: Mon Mar 14 11:57:19 2022 -0700

Update mem.erb

Update email to new member for PII
---
 www/secretary/workbench/templates/mem.erb | 17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/www/secretary/workbench/templates/mem.erb 
b/www/secretary/workbench/templates/mem.erb
index e10161b..0f9d578 100644
--- a/www/secretary/workbench/templates/mem.erb
+++ b/www/secretary/workbench/templates/mem.erb
@@ -4,20 +4,27 @@ Welcome to membership in The Apache Software Foundation.
 
 This message acknowledges receipt of your membership application, which has 
been filed in the Apache Software Foundation records.
 
-You will shortly be subscribed to the memb...@apache.org mailing list.
+You will shortly be subscribed to the memb...@apache.org mailing list using 
your <%= @email %> address.
 
 You will also be subscribed to the members-not...@apache.org mailing list.
 This is a very low traffic list which is used for essential notices to members.
 
-To verify that you have the proper rights to the foundation repository, please 
check that your personal information has been properly entered:
+If you need to change your email subscriptions, please visit 
https://whimsy.apache.org/committers/subscribe 
+
+To verify that you have the proper rights to the foundation repository, please 
check that you have been added to the members roster:
 https://svn.apache.org/repos/private/foundation/members.txt
-You can add any other information such as your personal web page and the 
projects that you are working on.
 
-If you cannot get access, you can use Whimsy to check your settings:
+You can use Whimsy to check your settings:
 https://whimsy.apache.org/roster/committer/__self__
-Under 'Groups' you should see 'member'; this gives access to member-only 
resources.
+Under 'Groups' you should see 'member'; this gives you access to member-only 
resources.
 Note that it may take a while for all systems to pick up the new setting.
 
+You can also use your Whimsy profile page to complete your personal profile, 
by updatimg the section of your profile under "Members.txt".
+All Members have access to all of this information, including your postal 
address, phone number, projects, and personal web page.
+
+Note that some of the information is considered Personally Identifiable 
Information, and you do not have to share any information you are not 
comfortable with. 
+Thus, you can update the section of your profile under "Members.txt" to remove 
information, as long as you leave Name, Forms on File, and Avail ID fields.
+
 If you have any questions or concerns, please feel free to reach out at 
memb...@apache.org
 
 Warm Regards,

[whimsy] branch member_data updated: Update mem.erb

[clr]

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

clr pushed a commit to branch member_data
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/member_data by this push:
 new d8cf3ae  Update mem.erb
d8cf3ae is described below

commit d8cf3aebb4bfd69a624d5cb215b67f1c37adcc9f
Author: Craig L Russell 
AuthorDate: Sun Mar 13 17:43:24 2022 -0700

Update mem.erb

Update advice with information on sharing options for PII.
---
 www/secretary/workbench/templates/mem.erb | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/www/secretary/workbench/templates/mem.erb 
b/www/secretary/workbench/templates/mem.erb
index 9b9a8e2..0f9d578 100644
--- a/www/secretary/workbench/templates/mem.erb
+++ b/www/secretary/workbench/templates/mem.erb
@@ -4,21 +4,26 @@ Welcome to membership in The Apache Software Foundation.
 
 This message acknowledges receipt of your membership application, which has 
been filed in the Apache Software Foundation records.
 
-You will shortly be subscribed to the memb...@apache.org mailing list using 
your avai...@apache.org address.
-If you need to change your subscriptions, please visit https://id.apache.org 
where you can also add other email addresses.
+You will shortly be subscribed to the memb...@apache.org mailing list using 
your <%= @email %> address.
 
 You will also be subscribed to the members-not...@apache.org mailing list.
 This is a very low traffic list which is used for essential notices to members.
 
+If you need to change your email subscriptions, please visit 
https://whimsy.apache.org/committers/subscribe 
+
 To verify that you have the proper rights to the foundation repository, please 
check that you have been added to the members roster:
 https://svn.apache.org/repos/private/foundation/members.txt
 
 You can use Whimsy to check your settings:
 https://whimsy.apache.org/roster/committer/__self__
-Under 'Groups' you should see 'member'; this gives access to member-only 
resources.
+Under 'Groups' you should see 'member'; this gives you access to member-only 
resources.
 Note that it may take a while for all systems to pick up the new setting.
 
-You can also use your Whimsy profile page to complete your personal profile, 
including postal address, phone number, projects, and personal web page.
+You can also use your Whimsy profile page to complete your personal profile, 
by updatimg the section of your profile under "Members.txt".
+All Members have access to all of this information, including your postal 
address, phone number, projects, and personal web page.
+
+Note that some of the information is considered Personally Identifiable 
Information, and you do not have to share any information you are not 
comfortable with. 
+Thus, you can update the section of your profile under "Members.txt" to remove 
information, as long as you leave Name, Forms on File, and Avail ID fields.
 
 If you have any questions or concerns, please feel free to reach out at 
memb...@apache.org
 

[whimsy] branch member_data updated: Update mem.erb

[clr]

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

clr pushed a commit to branch member_data
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/member_data by this push:
 new 126d171  Update mem.erb
126d171 is described below

commit 126d1715e6ded5b8c5b7bd99e542d0191022d572
Author: Craig L Russell 
AuthorDate: Fri Mar 11 16:56:49 2022 -0800

Update mem.erb

Update mail to new member with details on updating members.txt.
---
 www/secretary/workbench/templates/mem.erb | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/www/secretary/workbench/templates/mem.erb 
b/www/secretary/workbench/templates/mem.erb
index e10161b..9b9a8e2 100644
--- a/www/secretary/workbench/templates/mem.erb
+++ b/www/secretary/workbench/templates/mem.erb
@@ -4,20 +4,22 @@ Welcome to membership in The Apache Software Foundation.
 
 This message acknowledges receipt of your membership application, which has 
been filed in the Apache Software Foundation records.
 
-You will shortly be subscribed to the memb...@apache.org mailing list.
+You will shortly be subscribed to the memb...@apache.org mailing list using 
your avai...@apache.org address.
+If you need to change your subscriptions, please visit https://id.apache.org 
where you can also add other email addresses.
 
 You will also be subscribed to the members-not...@apache.org mailing list.
 This is a very low traffic list which is used for essential notices to members.
 
-To verify that you have the proper rights to the foundation repository, please 
check that your personal information has been properly entered:
+To verify that you have the proper rights to the foundation repository, please 
check that you have been added to the members roster:
 https://svn.apache.org/repos/private/foundation/members.txt
-You can add any other information such as your personal web page and the 
projects that you are working on.
 
-If you cannot get access, you can use Whimsy to check your settings:
+You can use Whimsy to check your settings:
 https://whimsy.apache.org/roster/committer/__self__
 Under 'Groups' you should see 'member'; this gives access to member-only 
resources.
 Note that it may take a while for all systems to pick up the new setting.
 
+You can also use your Whimsy profile page to complete your personal profile, 
including postal address, phone number, projects, and personal web page.
+
 If you have any questions or concerns, please feel free to reach out at 
memb...@apache.org
 
 Warm Regards,

[whimsy] branch master updated: Update incomplete.json.rb

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new 21fdf90  Update incomplete.json.rb
21fdf90 is described below

commit 21fdf9095235bdee7620d54921c29145973293ad
Author: Craig L Russell 
AuthorDate: Sun Feb 20 12:01:49 2022 -0800

Update incomplete.json.rb

Fix awkward wording in unauthorized_signature
---
 www/secretary/workbench/views/actions/incomplete.json.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/secretary/workbench/views/actions/incomplete.json.rb 
b/www/secretary/workbench/views/actions/incomplete.json.rb
index cfdb430..4198543 100644
--- a/www/secretary/workbench/views/actions/incomplete.json.rb
+++ b/www/secretary/workbench/views/actions/incomplete.json.rb
@@ -18,7 +18,7 @@ REASONS = {
   '@corporate_postal' => 'the postal address does not appear to be a personal 
postal address',
   '@invalid_public' => 'the public name should be a real name and not a user 
id',
   '@separate_signature' => 'the document and signature must be sent attached 
to the same email',
-  '@unauthorized_signature' => 'the signature must be authorized, usually a 
company executive',
+  '@unauthorized_signature' => 'the signature must be from an authorized 
person, usually a company executive',
   '@empty_form' => 'the form appears to be completely empty',
   '@unreadable_scan' => 'the scan is not readable or not complete',
   '@wrong_identity' => 'the public key does not match the name/email on the 
form',

[whimsy] branch document-reject updated: Update incomplete.json.rb

[clr]

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

clr pushed a commit to branch document-reject
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/document-reject by this push:
 new b4956fa  Update incomplete.json.rb
b4956fa is described below

commit b4956fa0c8c623f92e6bcb58ac15ac53fd87894e
Author: Craig L Russell 
AuthorDate: Sun Feb 20 12:00:21 2022 -0800

Update incomplete.json.rb

Fix awkward wording on unauthorized_signature
---
 www/secretary/workbench/views/actions/incomplete.json.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/secretary/workbench/views/actions/incomplete.json.rb 
b/www/secretary/workbench/views/actions/incomplete.json.rb
index cfdb430..4198543 100644
--- a/www/secretary/workbench/views/actions/incomplete.json.rb
+++ b/www/secretary/workbench/views/actions/incomplete.json.rb
@@ -18,7 +18,7 @@ REASONS = {
   '@corporate_postal' => 'the postal address does not appear to be a personal 
postal address',
   '@invalid_public' => 'the public name should be a real name and not a user 
id',
   '@separate_signature' => 'the document and signature must be sent attached 
to the same email',
-  '@unauthorized_signature' => 'the signature must be authorized, usually a 
company executive',
+  '@unauthorized_signature' => 'the signature must be from an authorized 
person, usually a company executive',
   '@empty_form' => 'the form appears to be completely empty',
   '@unreadable_scan' => 'the scan is not readable or not complete',
   '@wrong_identity' => 'the public key does not match the name/email on the 
form',

[whimsy] branch document-reject updated (68191b5 -> 2d990ab)

[clr]

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

clr pushed a change to branch document-reject
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from 68191b5  Update incomplete.json.rb
 add 2d990ab  Update incomplete.json.rb

No new revisions were added by this update.

Summary of changes:
 www/secretary/workbench/views/actions/incomplete.json.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[whimsy] branch document-reject-2-1 created (now b5d8ab2)

[clr]

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

clr pushed a change to branch document-reject-2-1
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


  at b5d8ab2  Update parts.js.rb

This branch includes the following new commits:

 new b5d8ab2  Update parts.js.rb

The 1 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.

[whimsy] 01/01: Update parts.js.rb

[clr]

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

clr pushed a commit to branch document-reject-2-1
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit b5d8ab29de5fcf9c3cda0f2d77a8cf9de7acf5b2
Author: Craig L Russell 
AuthorDate: Sat Feb 19 16:50:08 2022 -0800

Update parts.js.rb

Change "incomplete" to "reject document"
---
 www/secretary/workbench/views/parts.js.rb | 82 ++-
 1 file changed, 81 insertions(+), 1 deletion(-)

diff --git a/www/secretary/workbench/views/parts.js.rb 
b/www/secretary/workbench/views/parts.js.rb
index e78cc88..8540d7a 100644
--- a/www/secretary/workbench/views/parts.js.rb
+++ b/www/secretary/workbench/views/parts.js.rb
@@ -14,6 +14,14 @@ class Parts < Vue
 @project = nil
 @missing_address = false
 @missing_email = false
+@corporate_postal = false
+@invalid_public = false
+@separate_signature = false
+@unauthorized_signature = false
+@empty_form = false
+@unreadable_scan = false
+@wrong_identity = false
+@validation_failed = false
   end
 
   
@@ -178,6 +186,14 @@ class Parts < Vue
 _input type: 'hidden', name: 'signature', value: @@signature
 _input type: 'hidden', name: 'missing_address', value: 
@missing_address
 _input type: 'hidden', name: 'missing_email', value: @missing_email
+_input type: 'hidden', name: 'corporate_postal', value: 
@corporate_postal
+_input type: 'hidden', name: 'invalid_public', value: 
@invalid_public
+_input type: 'hidden', name: 'separate_signature', value: 
@separate_signature
+_input type: 'hidden', name: 'unauthorized_signature', value: 
@unauthorized_signature
+_input type: 'hidden', name: 'empty_form', value: @empty_form
+_input type: 'hidden', name: 'unreadable_scan', value: 
@unreadable_scan
+_input type: 'hidden', name: 'wrong_identity', value: 
@wrong_identity
+_input type: 'hidden', name: 'validation_failed', value: 
@validation_failed
 
 # Defer processing (must be part of POST block)
 
@@ -204,7 +220,7 @@ class Parts < Vue
 _label do
   _input type: 'radio', name: 'doctype', value: 'incomplete',
 onClick: self.reject
-  _span 'incomplete form (select missing items below first)'
+  _span 'reject document (select reasons below)'
 end
 
 # The checked: variable names must be reflected in the file 
incomplete.json.jb
@@ -224,6 +240,70 @@ class Parts < Vue
 end
   end
 end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @corporate_postal,
+  onClick: -> {@corporate_postal = !@corporate_postal}
+  _span ' corporate postal address'
+end
+  end
+end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @invalid_public,
+  onClick: -> {@invalid_public = !@invalid_public}
+  _span ' invalid public name'
+end
+  end
+end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @separate_signature,
+  onClick: -> {@separate_signature = !@separate_signature}
+  _span ' separate document and signature'
+end
+  end
+end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @unauthorized_signature,
+  onClick: -> {@unauthorized_signature = 
!@unauthorized_signature}
+  _span ' unauthorized signature'
+end
+  end
+end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @empty_form,
+  onClick: -> {@empty_form = !@empty_form}
+  _span ' empty form'
+end
+  end
+end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @unreadable_scan,
+  onClick: -> {@unreadable_scan = !@unreadable_scan}
+  _span ' unreadable or partial scan'
+end
+  end
+end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @wrong_identity,
+  onClick: -> {@wrong_identity = !@wrong_identity}
+  _span ' key data does not match email'
+end
+  end
+end
+  _li do
+_label do
+  _input type: 'checkbox', ch

[whimsy] 01/01: Update parts.js.rb

[clr]

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

clr pushed a commit to branch document-reject-2
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit 980c0d2c8090d89e3a2c776d1a57055fec9b496c
Author: Craig L Russell 
AuthorDate: Sat Feb 19 16:49:14 2022 -0800

Update parts.js.rb

Change "incomplete" to "reject document"
---
 www/secretary/workbench/views/parts.js.rb | 82 ++-
 1 file changed, 81 insertions(+), 1 deletion(-)

diff --git a/www/secretary/workbench/views/parts.js.rb 
b/www/secretary/workbench/views/parts.js.rb
index e78cc88..8540d7a 100644
--- a/www/secretary/workbench/views/parts.js.rb
+++ b/www/secretary/workbench/views/parts.js.rb
@@ -14,6 +14,14 @@ class Parts < Vue
 @project = nil
 @missing_address = false
 @missing_email = false
+@corporate_postal = false
+@invalid_public = false
+@separate_signature = false
+@unauthorized_signature = false
+@empty_form = false
+@unreadable_scan = false
+@wrong_identity = false
+@validation_failed = false
   end
 
   
@@ -178,6 +186,14 @@ class Parts < Vue
 _input type: 'hidden', name: 'signature', value: @@signature
 _input type: 'hidden', name: 'missing_address', value: 
@missing_address
 _input type: 'hidden', name: 'missing_email', value: @missing_email
+_input type: 'hidden', name: 'corporate_postal', value: 
@corporate_postal
+_input type: 'hidden', name: 'invalid_public', value: 
@invalid_public
+_input type: 'hidden', name: 'separate_signature', value: 
@separate_signature
+_input type: 'hidden', name: 'unauthorized_signature', value: 
@unauthorized_signature
+_input type: 'hidden', name: 'empty_form', value: @empty_form
+_input type: 'hidden', name: 'unreadable_scan', value: 
@unreadable_scan
+_input type: 'hidden', name: 'wrong_identity', value: 
@wrong_identity
+_input type: 'hidden', name: 'validation_failed', value: 
@validation_failed
 
 # Defer processing (must be part of POST block)
 
@@ -204,7 +220,7 @@ class Parts < Vue
 _label do
   _input type: 'radio', name: 'doctype', value: 'incomplete',
 onClick: self.reject
-  _span 'incomplete form (select missing items below first)'
+  _span 'reject document (select reasons below)'
 end
 
 # The checked: variable names must be reflected in the file 
incomplete.json.jb
@@ -224,6 +240,70 @@ class Parts < Vue
 end
   end
 end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @corporate_postal,
+  onClick: -> {@corporate_postal = !@corporate_postal}
+  _span ' corporate postal address'
+end
+  end
+end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @invalid_public,
+  onClick: -> {@invalid_public = !@invalid_public}
+  _span ' invalid public name'
+end
+  end
+end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @separate_signature,
+  onClick: -> {@separate_signature = !@separate_signature}
+  _span ' separate document and signature'
+end
+  end
+end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @unauthorized_signature,
+  onClick: -> {@unauthorized_signature = 
!@unauthorized_signature}
+  _span ' unauthorized signature'
+end
+  end
+end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @empty_form,
+  onClick: -> {@empty_form = !@empty_form}
+  _span ' empty form'
+end
+  end
+end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @unreadable_scan,
+  onClick: -> {@unreadable_scan = !@unreadable_scan}
+  _span ' unreadable or partial scan'
+end
+  end
+end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @wrong_identity,
+  onClick: -> {@wrong_identity = !@wrong_identity}
+  _span ' key data does not match email'
+end
+  end
+end
+  _li do
+_label do
+  _input type: 'checkbox', ch

[whimsy] branch document-reject-2 created (now 980c0d2)

[clr]

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

clr pushed a change to branch document-reject-2
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


  at 980c0d2  Update parts.js.rb

This branch includes the following new commits:

 new 980c0d2  Update parts.js.rb

The 1 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.

[whimsy] branch document-reject updated (5de997e -> 68191b5)

[clr]

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

clr pushed a change to branch document-reject
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from 5de997e  Update parts.js.rb
 add 68191b5  Update incomplete.json.rb

No new revisions were added by this update.

Summary of changes:
 www/secretary/workbench/views/actions/incomplete.json.rb | 8 
 1 file changed, 8 insertions(+)

[whimsy] branch document-reject created (now 5de997e)

[clr]

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

clr pushed a change to branch document-reject
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


  at 5de997e  Update parts.js.rb

This branch includes the following new commits:

 new 5de997e  Update parts.js.rb

The 1 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.

[whimsy] 01/01: Update parts.js.rb

[clr]

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

clr pushed a commit to branch document-reject
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit 5de997e5b8100128c1e9f4087e715da1ffaaab28
Author: Craig L Russell 
AuthorDate: Sat Feb 19 15:48:58 2022 -0800

Update parts.js.rb

Not ready to merge
---
 www/secretary/workbench/views/parts.js.rb | 82 ++-
 1 file changed, 81 insertions(+), 1 deletion(-)

diff --git a/www/secretary/workbench/views/parts.js.rb 
b/www/secretary/workbench/views/parts.js.rb
index e78cc88..0e78c55 100644
--- a/www/secretary/workbench/views/parts.js.rb
+++ b/www/secretary/workbench/views/parts.js.rb
@@ -14,6 +14,14 @@ class Parts < Vue
 @project = nil
 @missing_address = false
 @missing_email = false
+@corporate_postal = false
+@invalid_public = false
+@separate_signature = false
+@unauthorized_signature = false
+@empty_form = false
+@unreadable_scan = false
+@wrong_identity = false
+@validation_failed = false
   end
 
   
@@ -178,6 +186,14 @@ class Parts < Vue
 _input type: 'hidden', name: 'signature', value: @@signature
 _input type: 'hidden', name: 'missing_address', value: 
@missing_address
 _input type: 'hidden', name: 'missing_email', value: @missing_email
+_input type: 'hidden', name: 'corporate_postal', value: 
@corporate_postal
+_input type: 'hidden', name: 'invalid_public', value: 
@invalid_public
+_input type: 'hidden', name: 'separate_signature', value: 
@separate_signature
+_input type: 'hidden', name: 'unauthorized_signature', value: 
@unauthorized_signature
+_input type: 'hidden', name: 'empty_form', value: @empty_form
+_input type: 'hidden', name: 'unreadable_scan', value: 
@unreadable_scan
+_input type: 'hidden', name: 'wrong_identity', value: 
@wrong_identity
+_input type: 'hidden', name: 'validation_failed', value: 
@validation_failed
 
 # Defer processing (must be part of POST block)
 
@@ -204,7 +220,7 @@ class Parts < Vue
 _label do
   _input type: 'radio', name: 'doctype', value: 'incomplete',
 onClick: self.reject
-  _span 'incomplete form (select missing items below first)'
+  _span 'incomplete form (problematic items below)'
 end
 
 # The checked: variable names must be reflected in the file 
incomplete.json.jb
@@ -224,6 +240,70 @@ class Parts < Vue
 end
   end
 end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @corporate_postal,
+  onClick: -> {@corporate_postal = !@corporate_postal}
+  _span ' corporate postal address'
+end
+  end
+end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @invalid_public,
+  onClick: -> {@invalid_public = !@invalid_public}
+  _span ' invalid public name'
+end
+  end
+end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @separate_signature,
+  onClick: -> {@separate_signature = !@separate_signature}
+  _span ' separate document and signature'
+end
+  end
+end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @unauthorized_signature,
+  onClick: -> {@unauthorized_signature = 
!@unauthorized_signature}
+  _span ' unauthorized signature'
+end
+  end
+end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @empty_form,
+  onClick: -> {@empty_form = !@empty_form}
+  _span ' empty form'
+end
+  end
+end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @unreadable_scan,
+  onClick: -> {@unreadable_scan = !@unreadable_scan}
+  _span ' unreadable or partial scan'
+end
+  end
+end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @wrong_identity,
+  onClick: -> {@wrong_identity = !@wrong_identity}
+  _span ' key data does not match email'
+end
+  end
+end
+  _li do
+_label do
+  _input type: 'checkbox', checked: @validation_failed,
+

[whimsy] 01/01: Update incomplete.erb

[clr]

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

clr pushed a commit to branch document-reject
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit d62485abfce4c5e284837a6451cb98fa50504564
Author: Craig L Russell 
AuthorDate: Sat Feb 19 14:15:45 2022 -0800

Update incomplete.erb

Add reasons to reject a document.
---
 www/secretary/workbench/templates/incomplete.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/secretary/workbench/templates/incomplete.erb 
b/www/secretary/workbench/templates/incomplete.erb
index 3b71b5b..49e5649 100644
--- a/www/secretary/workbench/templates/incomplete.erb
+++ b/www/secretary/workbench/templates/incomplete.erb
@@ -1,6 +1,6 @@
 Dear <%= @email.display_names.join(', ') %>,
 
-We received this document but it appears to be incomplete.
+We received this document but we cannot file it as is.
 <%= @missing_items %>
 Please fill all required fields and resubmit all pages
 to secret...@apache.org

[whimsy] branch document-reject created (now d62485a)

[clr]

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

clr pushed a change to branch document-reject
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


  at d62485a  Update incomplete.erb

This branch includes the following new commits:

 new d62485a  Update incomplete.erb

The 1 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.

[whimsy] branch workbench-remove-missing-phone updated (8b323cc -> 0298d5f)

[clr]

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

clr pushed a change to branch workbench-remove-missing-phone
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from 8b323cc  Update parts.js.rb
 add 0298d5f  Update incomplete.json.rb

No new revisions were added by this update.

Summary of changes:
 www/secretary/workbench/views/actions/incomplete.json.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

[whimsy] branch workbench-remove-missing-phone updated (b3b6e53 -> 8b323cc)

[clr]

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

clr pushed a change to branch workbench-remove-missing-phone
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from b3b6e53  Update parts.js.rb
 add 8b323cc  Update parts.js.rb

No new revisions were added by this update.

Summary of changes:
 www/secretary/workbench/views/parts.js.rb | 2 --
 1 file changed, 2 deletions(-)

[whimsy] branch workbench-remove-missing-phone created (now b3b6e53)

[clr]

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

clr pushed a change to branch workbench-remove-missing-phone
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


  at b3b6e53  Update parts.js.rb

This branch includes the following new commits:

 new b3b6e53  Update parts.js.rb

The 1 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.

[whimsy] 01/01: Update parts.js.rb

[clr]

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

clr pushed a commit to branch workbench-remove-missing-phone
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit b3b6e53d08b93ffd89c16b9162beae3d75ce40d0
Author: Craig L Russell 
AuthorDate: Fri Oct 15 17:45:37 2021 -0700

Update parts.js.rb

Remove "missing phone" from "incomplete ICLA"
---
 www/secretary/workbench/views/parts.js.rb | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/www/secretary/workbench/views/parts.js.rb 
b/www/secretary/workbench/views/parts.js.rb
index c54591c..ebffe73 100644
--- a/www/secretary/workbench/views/parts.js.rb
+++ b/www/secretary/workbench/views/parts.js.rb
@@ -165,13 +165,6 @@ class Parts < Vue
 spacer = "\u00A0"*4 # non-breaking space as UTF-8
 _label do
   _ spacer
-  _input type: 'checkbox', checked: @missing_phone,
-  onClick:-> {@missing_phone = !@missing_phone}
-  _span ' missing phone number'
-end
-
-_label do
-  _ spacer
   _input type: 'checkbox', checked: @missing_address,
   onClick:-> {@missing_address = !@missing_address}
   _span ' missing or partial postal address'

[whimsy] branch master updated: Family First support in secretary workbench (#120)

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new 58e35df  Family First support in secretary workbench (#120)
58e35df is described below

commit 58e35df90f4387ba2de09e50e3c50eb99c69f736
Author: Craig L Russell 
AuthorDate: Wed Aug 11 10:32:35 2021 -0700

Family First support in secretary workbench (#120)

* Family First support in secretary workbench

* Fix file name algorithm

* Add LDAP sn and givenName fields to icla form

* Fix obvious errors

- spurious trailing )
- duplicate function name

* Update icla.js.rb

Fix calling protocol for genldapsn and genldapgivenname

* Make split of public name explicit split(" ")

* remove dependency on puma

* Family first flag implementation for review after testing

* Disable LDAP icla.js.rb form fields

Co-authored-by: Sebb 
---
 www/secretary/iclaparser.rb|  1 +
 www/secretary/workbench/views/forms/icla.js.rb | 93 --
 2 files changed, 88 insertions(+), 6 deletions(-)

diff --git a/www/secretary/iclaparser.rb b/www/secretary/iclaparser.rb
index b35bc94..973a6c5 100644
--- a/www/secretary/iclaparser.rb
+++ b/www/secretary/iclaparser.rb
@@ -116,6 +116,7 @@ module ICLAParser
   NAME2FIELD = {
 'fullname' => :FullName,
 'publicname' => :PublicName,
+'familyfirst' => :FamilyFirst,
 'mailingaddress' => :MailingAddress,
 'mailingaddress2' => :MailingAddress2,
 'postaladdress' => :MailingAddress,
diff --git a/www/secretary/workbench/views/forms/icla.js.rb 
b/www/secretary/workbench/views/forms/icla.js.rb
index 5ddb5df..6480860 100644
--- a/www/secretary/workbench/views/forms/icla.js.rb
+++ b/www/secretary/workbench/views/forms/icla.js.rb
@@ -31,7 +31,8 @@ class ICLA < Vue
   _th 'Real Name'
   _td do
 _input name: 'realname', value: @realname, required: true,
-   disabled: (@filed or @pdfbusy), onChange: self.changeRealName
+   disabled: (@filed or @pdfbusy),
+   onChange: self.changeRealName, onBlur: self.changeRealName
   end
 end
 
@@ -39,7 +40,18 @@ class ICLA < Vue
   _th 'Public Name'
   _td do
 _input name: 'pubname', value: @pubname, required: true,
-  disabled: (@filed or @pdfbusy), onFocus: lambda {@pubname ||= 
@realname}
+  disabled: (@filed or @pdfbusy), onFocus: lambda {@pubname ||= 
@realname},
+  onChange: self.changePublicName, onBlur: self.changePublicName
+  end
+end
+
+_tr do
+  _th 'Family First'
+  _td do
+_input name: 'familyfirst', required: true,
+  type: 'checkbox', checked: @familyfirst,
+  disabled: (@filed or @pdfbusy),
+  onChange: self.changeFamilyFirst, onBlur: self.changeFamilyFirst
   end
 end
 
@@ -69,6 +81,23 @@ class ICLA < Vue
   end
 end
 
+# May be useful in future
+#   _tr do
+# _th 'LDAP givenname'
+# _td do
+#   _input name: 'ldapgivenname', value: @ldapgivenname,
+# disabled: (@filed or @pdfbusy)
+# end
+#   end
+
+#   _tr do
+# _th 'LDAP sn'
+# _td do
+#   _input name: 'ldapsn', value: @ldapsn,
+# disabled: (@filed or @pdfbusy)
+# end
+#   end
+#
 _tr do
   if @project
 _th do
@@ -122,7 +151,11 @@ class ICLA < Vue
 
 @realname = name
 @pubname = parsed.PublicName || name
-@filename = self.genfilename(name)
+@pubnamearray = @pubname.split(" ")
+@familyfirst = parsed.FamilyFirst || false
+@ldapsn = self.genldapsn(@pubnamearray, @familyfirst)
+@ldapgivenname = self.genldapgivenname(@pubnamearray, @familyfirst)
+@filename = self.genfilename(name, @familyfirst)
 @email = parsed.EMail || @@headers.from
 @user = parsed.ApacheID || ''
 project = parsed.Project
@@ -202,14 +235,62 @@ class ICLA < Vue
 end
   end
 
+  # when real name changes, update file name
   def changeRealName(event)
 @realname = event.target.value;
-@filename = self.genfilename(event.target.value)
+@filename = self.genfilename(@realname, @familyfirst)
+  end
+
+  # when family first changes, update file name and LDAP default fields
+  def changeFamilyFirst(event)
+@filename = self.genfilename(@realname, @familyfirst)
+@pubnamearray = @pubname.split(' ')
+@ldapsn = self.genldapsn(@pubnamearray, @familyfirst)
+@ldapgivenname = self.genldapgivenname(@pubnamearray, @familyfirst)
+  end
+
+  # when public name changes, update LDAP default fields
+  def changePublicName(event)
+

[whimsy] branch family-first updated (5809389 -> 6dc1d42)

[clr]

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

clr pushed a change to branch family-first
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from 5809389  Merge branch 'master' into family-first
 add c655777  Disable LDAP icla.js.rb form fields
 add 6dc1d42  Merge branch 'family-first' of github.com:apache/whimsy into 
family-first Remote branch was updated

No new revisions were added by this update.

Summary of changes:
 www/secretary/workbench/views/forms/icla.js.rb | 33 +-
 1 file changed, 17 insertions(+), 16 deletions(-)

[whimsy] branch family-first updated (acd3aa0 -> 5809389)

[clr]

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

clr pushed a change to branch family-first
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from acd3aa0  Family first flag implementation for review after testing
 add c3d2a04  WHIMSY-368 - return last certificate found
 add fef8928  Add support for CLI aliases etc
 add 0e3b9d0  Oops - accidental commit
 add e166623  WHIMSY-366 - don't rely on Infra puppet repo
 add 11e3739  Docco
 add fda2740  Update Gemfile
 add cce314e  Merge pull request #121 from 
apache/remove-puma-gem-from-configuration
 add 5809389  Merge branch 'master' into family-first

No new revisions were added by this update.

Summary of changes:
 DOCKER.md   |  5 -
 Rakefile|  5 +
 lib/whimsy/asf/auth.rb  |  1 +
 lib/whimsy/asf/git.rb   | 14 --
 lib/whimsy/asf/ldap.rb  | 24 +---
 www/secretary/workbench/Gemfile |  1 -
 6 files changed, 15 insertions(+), 35 deletions(-)

[whimsy] branch family-first updated (10ef9fa -> acd3aa0)

[clr]

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

clr pushed a change to branch family-first
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from 10ef9fa  Make split of public name explicit split(" ")
 add 99b7055  Make it easier to tidy api dir
 add 6fd236e  Only want whimsy dir, not test or spec
 add 734f545  Non-standard list name
 add 468b9b9  Add draft method to convert cn to sn + givenName
 add cf561d9  Simplify; add doc note
 add d04a9cd  Simplify: move docker to top level
 add 82bdb44  chore: fix spelling (#113)
 add a2708cc  More explanation
 add ffd60ef  Drop .gitconfig
 add 56952f7  Typo
 add 3e38a02  No point showing claRef without file link
 add 48fdcf7  Fix caching issue
 add 13568cd  Drop cache; restore secretary access
 add 8143c76  Use previously fetched list
 add a75728a  Attic issues don't apply to non-PMC
 add a968588  Patience...
 add 9eafd51  Use public name
 add 0e90590  Try to find duplicate ICLAs
 add 4316de7  Link to new check
 add 762cbaa  Add Public Name
 add a28206d  Look for additional matches of first/last names
 add 03c3e65  Don't save an empty line
 add eb17ee4  Don't save an empty line
 add 75b1959  Don't create PDFProject key unnecessarily
 add 6f8c47f  Handle widgets as well
 add 2e02dd4  Look for ICLA duplicates
 add f30c630  Linkify warnings
 add ba227ab  Unused
 add 5feaeae  Don't init ldap unnecessarily
 add f95c56a  Show LDAP hosts for members
 add af806b7  Update to Wunderbar 1.5.0
 add a4fe8af  Don't pin any gems
 add d8be3c8  make post.js parseable with latest version of Ruby parser
 add 14bf617  avoid name collisions
 add 677a244  Obsolete reference
 add b4d6016  Not needed ?
 add 4bdab1f  Merge branch 'master' into family-first way old
 add 03f838b  remove dependency on puma
 add acd3aa0  Family first flag implementation for review after testing

No new revisions were added by this update.

Summary of changes:
 .dockerignore  |   6 ++
 DEPLOYMENT.md  |   2 +-
 DOCKER.md  |  24 +++--
 docker/Dockerfile => Dockerfile|   5 +-
 Gemfile|   3 +-
 MACOSX.md  |   4 +-
 README.md  |   2 +-
 Rakefile   |  81 ++--
 asf.gemspec|   4 +-
 docker/docker-compose.yaml => docker-compose.yaml  |   9 +-
 lib/Gemfile|   3 +-
 lib/spec/lib/mail/mlist_spec.rb|   1 +
 lib/spec/lib/person_spec.rb|  38 
 lib/whimsy/asf/icla.rb |  30 ++
 lib/whimsy/asf/person.rb   |  19 
 lib/whimsy/logparser.rb|   1 -
 ruby2js.version|   1 -
 secmail.py |   2 +-
 tools/Gemfile  |   3 +-
 tools/toccomments.sh   |   2 +-
 wunderbar.version  |   1 -
 www/board/agenda/Gemfile   |   6 +-
 www/board/agenda/README.md |  22 ++---
 .../agenda/test/data/board_agenda_2015_01_21.txt   |   2 +-
 .../agenda/test/data/board_agenda_2015_02_18.txt   |  20 ++--
 .../agenda/test/data/board_minutes_2015_01_21.txt  |   6 +-
 www/board/agenda/views/buttons/post.js.rb  |   4 +-
 www/board/agenda/views/models/agenda.js.rb |  10 +-
 www/brand/replyedit.cgi|   2 +-
 www/brand/replyui.cgi  |   2 +-
 www/committers/Gemfile |   3 +-
 www/docs/.gitignore|   1 +
 www/docs/api/.gitignore|   2 -
 www/fundraising/invoice.cgi|   2 +-
 www/index.html |   1 +
 www/members/Gemfile|   3 +-
 www/project/icla/Gemfile   |   8 +-
 www/roster/Gemfile |   6 +-
 www/roster/main.rb |  63 
 www/roster/models/nonpmc.rb|   2 +-
 www/roster/public/javascript/es6-promise.js|   3 +-
 www/roster/public_json_common.rb   |   1 -
 www/roster/public_ldap_people.rb   |   2 +-
 www/roster/views/AAREADME.txt  |   2 +-
 www/roster/views/iclaSearch.js.rb  |   9 +-
 www/roster/views/nonpmc/main.js.rb |  19 +---
 www/secretary/Gemfile   

[whimsy] 01/01: Update Gemfile

[clr]

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

clr pushed a commit to branch remove-puma-gem-from-configuration
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit fda27401648a7bf922350b863af30b2dd8fca3ed
Author: Craig L Russell 
AuthorDate: Fri Aug 6 14:06:42 2021 -0700

Update Gemfile
---
 www/secretary/workbench/Gemfile | 4 
 1 file changed, 4 deletions(-)

diff --git a/www/secretary/workbench/Gemfile b/www/secretary/workbench/Gemfile
index dc32b03..d245ff0 100644
--- a/www/secretary/workbench/Gemfile
+++ b/www/secretary/workbench/Gemfile
@@ -22,7 +22,3 @@ gem 'execjs'
 gem 'listen'
 gem 'escape'
 gem 'pdf-reader'
-
-group :demo do
-  gem 'puma'
-end

[whimsy] branch remove-puma-gem-from-configuration created (now fda2740)

[clr]

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

clr pushed a change to branch remove-puma-gem-from-configuration
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


  at fda2740  Update Gemfile

This branch includes the following new commits:

 new fda2740  Update Gemfile

The 1 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.

[whimsy] branch family-first updated (7d1e3fd -> 10ef9fa)

[clr]

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

clr pushed a change to branch family-first
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from 7d1e3fd  Update icla.js.rb
 add 10ef9fa  Make split of public name explicit split(" ")

No new revisions were added by this update.

Summary of changes:
 www/secretary/workbench/views/forms/icla.js.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[whimsy] branch family-first updated (9a297b3 -> 7d1e3fd)

[clr]

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

clr pushed a change to branch family-first
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from 9a297b3  Fix obvious errors
 add 7d1e3fd  Update icla.js.rb

No new revisions were added by this update.

Summary of changes:
 www/secretary/workbench/views/forms/icla.js.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[whimsy] branch family-first updated (ff28004 -> 63692d4)

[clr]

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

clr pushed a change to branch family-first
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from ff28004  Fix file name algorithm
 add 63692d4  Add LDAP sn and givenName fields to icla form

No new revisions were added by this update.

Summary of changes:
 www/secretary/workbench/views/forms/icla.js.rb | 54 ++
 1 file changed, 54 insertions(+)

[whimsy] branch family-first updated (9bc830b -> ff28004)

[clr]

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

clr pushed a change to branch family-first
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from 9bc830b  Family First support in secretary workbench
 add ff28004  Fix file name algorithm

No new revisions were added by this update.

Summary of changes:
 www/secretary/workbench/views/forms/icla.js.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[whimsy] 01/01: Family First support in secretary workbench

[clr]

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

clr pushed a commit to branch family-first
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit 9bc830b03a1d32a9e8973a72764d272da7f6d9d1
Author: Craig L Russell 
AuthorDate: Sat Jul 24 12:17:21 2021 -0700

Family First support in secretary workbench
---
 www/secretary/iclaparser.rb|  1 +
 www/secretary/workbench/views/forms/icla.js.rb | 30 ++
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/www/secretary/iclaparser.rb b/www/secretary/iclaparser.rb
index 2aa35c2..7e89a09 100644
--- a/www/secretary/iclaparser.rb
+++ b/www/secretary/iclaparser.rb
@@ -116,6 +116,7 @@ module ICLAParser
   NAME2FIELD = {
 'fullname' => :FullName,
 'publicname' => :PublicName,
+'familyfirst' => :FamilyFirst,
 'mailingaddress' => :MailingAddress,
 'mailingaddress2' => :MailingAddress2,
 'postaladdress' => :MailingAddress,
diff --git a/www/secretary/workbench/views/forms/icla.js.rb 
b/www/secretary/workbench/views/forms/icla.js.rb
index 5ddb5df..b6ed936 100644
--- a/www/secretary/workbench/views/forms/icla.js.rb
+++ b/www/secretary/workbench/views/forms/icla.js.rb
@@ -44,6 +44,14 @@ class ICLA < Vue
 end
 
 _tr do
+  _th 'Family First'
+  _td do
+_input name: 'familyfirst', value: @familyfirst, required: true,
+  disabled: (@filed or @pdfbusy), onChange: self.changeFamilyFirst
+  end
+end
+
+_tr do
   _th 'E-mail'
   _td do
 _input name: 'email', value: @email, required: true, type: 'email',
@@ -122,7 +130,8 @@ class ICLA < Vue
 
 @realname = name
 @pubname = parsed.PublicName || name
-@filename = self.genfilename(name)
+@familyfirst = parsed.FamilyFirst || false
+@filename = self.genfilename(name, @familyfirst)
 @email = parsed.EMail || @@headers.from
 @user = parsed.ApacheID || ''
 project = parsed.Project
@@ -204,12 +213,25 @@ class ICLA < Vue
 
   def changeRealName(event)
 @realname = event.target.value;
-@filename = self.genfilename(event.target.value)
+@filename = self.genfilename(event.target.value, @familyfirst)
+  end
+
+  def changeFamilyFirst(event)
+@familyfirst = event.target.value;
+@filename = self.genfilename(@realname, @familyfirst)
   end
 
   # generate file name from the real name
-  def genfilename(realname)
-return asciize(realname.strip()).downcase().gsub(/\W+/, '-')
+  def genfilename(realname, familyfirst))
+nominalname = asciize(realname.strip()).downcase().gsub(/\W+/, '-')
+if !familyfirst
+  return nominalname
+else
+  # compute file name with family first; move last name to first
+  namearray = nominalname.split("-")
+  namearray.insert(0, namearray(-1)).delete_at(-1)
+  return namearray.join("-")
+end
   end
 
   # when leaving an input field, trigger change event (for Safari)

[whimsy] branch family-first created (now 9bc830b)

[clr]

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

clr pushed a change to branch family-first
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


  at 9bc830b  Family First support in secretary workbench

This branch includes the following new commits:

 new 9bc830b  Family First support in secretary workbench

The 1 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.

[whimsy] branch master updated: Update ldap-names.cgi: repeat header after 30 lines

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new 61504b9  Update ldap-names.cgi: repeat header after 30 lines
61504b9 is described below

commit 61504b93d494fb5a56c5afebdc0074d6948727d6
Author: Craig L Russell 
AuthorDate: Mon Jul 19 16:02:04 2021 -0700

Update ldap-names.cgi: repeat header after 30 lines
---
 www/secretary/ldap-names.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/secretary/ldap-names.cgi b/www/secretary/ldap-names.cgi
index 732395d..67a7118 100755
--- a/www/secretary/ldap-names.cgi
+++ b/www/secretary/ldap-names.cgi
@@ -149,7 +149,7 @@ _html do
 matches += 1
 next
   end
-  if 0 == (mismatches += 1) % 30 #repeat header each 30 lines
+  if 0 == (mismatches += 1) % 25 #repeat header every 25 lines
 _tr bgcolor: 'lightblue' do
   _td 'uid'
   _td "ICLA file"
@@ -160,7 +160,7 @@ _html do
   _td 'Modify to?'
   _td 'sn'
   _td 'Modify to?'
-  _td 'Unused names'
+  _td 'Unused'
 end
   end
 
@@ -241,7 +241,7 @@ _html do
   _td 'Modify to?'
   _td 'sn'
   _td 'Modify to?'
-  _td 'Unused names'
+  _td 'Unused'
 end
   end
 

[whimsy] branch master updated: Update ldap-names.cgi: repeat header after 30 lines

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new 5308746  Update ldap-names.cgi: repeat header after 30 lines
5308746 is described below

commit 53087461ba000f0077b1bbab8c99de7369929fdd
Author: Craig L Russell 
AuthorDate: Mon Jul 19 14:39:57 2021 -0700

Update ldap-names.cgi: repeat header after 30 lines
---
 www/secretary/ldap-names.cgi | 20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/www/secretary/ldap-names.cgi b/www/secretary/ldap-names.cgi
index d1b4825..732395d 100755
--- a/www/secretary/ldap-names.cgi
+++ b/www/secretary/ldap-names.cgi
@@ -99,6 +99,7 @@ _html do
   matches = 0
   badGiven = 0
   badSN = 0
+  mismatches = 0
 
   # prefetch ICLA data
   ASF::ICLA.preload
@@ -148,6 +149,21 @@ _html do
 matches += 1
 next
   end
+  if 0 == (mismatches += 1) % 30 #repeat header each 30 lines
+_tr bgcolor: 'lightblue' do
+  _td 'uid'
+  _td "ICLA file"
+  _td "iclas.txt real name"
+  _td "iclas.txt public name"
+  _td 'cn'
+  _td 'givenName'
+  _td 'Modify to?'
+  _td 'sn'
+  _td 'Modify to?'
+  _td 'Unused names'
+end
+  end
+
   next if givenOK and skipSN #and unused.size == 0
 
   claRef = icla.claRef if icla
@@ -217,6 +233,8 @@ _html do
 end
 _tr bgcolor: 'lightblue' do
   _td 'uid'
+  _td "ICLA file"
+  _td "iclas.txt real name"
   _td "iclas.txt public name"
   _td 'cn'
   _td 'givenName'
@@ -291,4 +309,4 @@ _html do
 enable_submit()
   end
 
-end
\ No newline at end of file
+end

[whimsy] branch master updated: LDAP-namecheck print header each 30 rows

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new 4bc01f3  LDAP-namecheck print header each 30 rows
4bc01f3 is described below

commit 4bc01f34154e06cbd0d68b6f7cf76e80c1389b12
Author: Craig L Russell 
AuthorDate: Mon Jul 12 17:08:50 2021 -0700

LDAP-namecheck print header each 30 rows
---
 www/members/ldap-namecheck.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/members/ldap-namecheck.cgi b/www/members/ldap-namecheck.cgi
index 0ecb830..4b9d8b0 100755
--- a/www/members/ldap-namecheck.cgi
+++ b/www/members/ldap-namecheck.cgi
@@ -97,7 +97,7 @@ _html do
 next
   end
 
-  if 0 == ++mismatches % 30 # repeat header every 30 lines
+  if 0 == (mismatches += 1) % 30 # repeat header every 30 lines
 _tr bgcolor: 'lightblue' do
   _td 'uid'
   _td "iclas.txt public name"

[whimsy] branch master updated: LDAP-namecheck print header each 30 rows

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new 691d31d  LDAP-namecheck print header each 30 rows
691d31d is described below

commit 691d31dba517c94e02b880f5f0ee8eb98b143a62
Author: Craig L Russell 
AuthorDate: Mon Jul 12 16:59:33 2021 -0700

LDAP-namecheck print header each 30 rows
---
 www/members/ldap-namecheck.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/members/ldap-namecheck.cgi b/www/members/ldap-namecheck.cgi
index 2b21be6..0ecb830 100755
--- a/www/members/ldap-namecheck.cgi
+++ b/www/members/ldap-namecheck.cgi
@@ -99,7 +99,7 @@ _html do
 
   if 0 == ++mismatches % 30 # repeat header every 30 lines
 _tr bgcolor: 'lightblue' do
-  _td 'uid' + str(mismatches)
+  _td 'uid'
   _td "iclas.txt public name"
   _td 'cn'
   _td 'givenName'

[whimsy] branch master updated: LDAP-namecheck print header each 30 rows

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new 3e2d408  LDAP-namecheck print header each 30 rows
3e2d408 is described below

commit 3e2d40870bfb852d62c5d3f116c30fcc72c6378a
Author: Craig L Russell 
AuthorDate: Mon Jul 12 16:47:38 2021 -0700

LDAP-namecheck print header each 30 rows
---
 www/members/ldap-namecheck.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/members/ldap-namecheck.cgi b/www/members/ldap-namecheck.cgi
index 9442ed5..2b21be6 100755
--- a/www/members/ldap-namecheck.cgi
+++ b/www/members/ldap-namecheck.cgi
@@ -99,7 +99,7 @@ _html do
 
   if 0 == ++mismatches % 30 # repeat header every 30 lines
 _tr bgcolor: 'lightblue' do
-  _td 'uid' + mismatches
+  _td 'uid' + str(mismatches)
   _td "iclas.txt public name"
   _td 'cn'
   _td 'givenName'

[whimsy] branch master updated: LDAP-namecheck print header each 30 rows

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new 71e3c04  LDAP-namecheck print header each 30 rows
71e3c04 is described below

commit 71e3c04745264cecd6e6b161dd4b9217a3b80031
Author: Craig L Russell 
AuthorDate: Mon Jul 12 16:39:11 2021 -0700

LDAP-namecheck print header each 30 rows
---
 www/members/ldap-namecheck.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/members/ldap-namecheck.cgi b/www/members/ldap-namecheck.cgi
index 5b60a8e..9442ed5 100755
--- a/www/members/ldap-namecheck.cgi
+++ b/www/members/ldap-namecheck.cgi
@@ -97,9 +97,9 @@ _html do
 next
   end
 
-  if 0 == ((++mismatches) % 30) # repeat header every 30 lines
-_tr do
-  _td 'uid'
+  if 0 == ++mismatches % 30 # repeat header every 30 lines
+_tr bgcolor: 'lightblue' do
+  _td 'uid' + mismatches
   _td "iclas.txt public name"
   _td 'cn'
   _td 'givenName'

[whimsy] branch master updated: LDAP-namecheck print header each 30 rows

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new cbf6fad  LDAP-namecheck print header each 30 rows
cbf6fad is described below

commit cbf6fadae3e85eefc09abe96593e1f6b3b8ff243
Author: Craig L Russell 
AuthorDate: Mon Jul 12 16:32:10 2021 -0700

LDAP-namecheck print header each 30 rows
---
 www/members/ldap-namecheck.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/members/ldap-namecheck.cgi b/www/members/ldap-namecheck.cgi
index d6247ad..5b60a8e 100755
--- a/www/members/ldap-namecheck.cgi
+++ b/www/members/ldap-namecheck.cgi
@@ -97,7 +97,7 @@ _html do
 next
   end
 
-  if ++mismatches % 30 == 0 # repeat header every 30 lines
+  if 0 == ((++mismatches) % 30) # repeat header every 30 lines
 _tr do
   _td 'uid'
   _td "iclas.txt public name"

[whimsy] branch master updated: LDAP-namecheck print header each 30 rows

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new aa3163a  LDAP-namecheck print header each 30 rows
aa3163a is described below

commit aa3163a5e8607a7bb5b82e76ff7d8d689febe72d
Author: Craig L Russell 
AuthorDate: Mon Jul 12 16:28:26 2021 -0700

LDAP-namecheck print header each 30 rows
---
 www/members/ldap-namecheck.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/members/ldap-namecheck.cgi b/www/members/ldap-namecheck.cgi
index 34fc818..d6247ad 100755
--- a/www/members/ldap-namecheck.cgi
+++ b/www/members/ldap-namecheck.cgi
@@ -97,7 +97,7 @@ _html do
 next
   end
 
-  if mismatches % 30 == 0 # repeat header every 30 lines
+  if ++mismatches % 30 == 0 # repeat header every 30 lines
 _tr do
   _td 'uid'
   _td "iclas.txt public name"
@@ -108,6 +108,7 @@ _html do
   _td 'Modify to?'
   _td 'Unused names'
 end
+  end
 
   _tr do
 _td do

[whimsy] branch master updated: LDAP-namecheck print header each 30 rows

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new 32b08b9  LDAP-namecheck print header each 30 rows
 new 71fe14c  Merge branch 'master' of github.com:apache/whimsy
32b08b9 is described below

commit 32b08b9282852a66ff8aaec4cbfc786bb8cd3501
Author: Craig L Russell 
AuthorDate: Mon Jul 12 16:16:12 2021 -0700

LDAP-namecheck print header each 30 rows
---
 www/members/ldap-namecheck.cgi | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/www/members/ldap-namecheck.cgi b/www/members/ldap-namecheck.cgi
index ebff683..34fc818 100755
--- a/www/members/ldap-namecheck.cgi
+++ b/www/members/ldap-namecheck.cgi
@@ -46,6 +46,7 @@ _html do
   # prefetch LDAP data
   people = ASF::Person.preload(%w(uid cn sn givenName loginShell))
   matches = 0
+  mismatches = 0
   badGiven = 0
   badSN = 0
 
@@ -96,6 +97,18 @@ _html do
 next
   end
 
+  if mismatches % 30 == 0 # repeat header every 30 lines
+_tr do
+  _td 'uid'
+  _td "iclas.txt public name"
+  _td 'cn'
+  _td 'givenName'
+  _td 'Modify to?'
+  _td 'sn'
+  _td 'Modify to?'
+  _td 'Unused names'
+end
+
   _tr do
 _td do
   _a p.uid, href: '/roster/committer/' + p.uid
@@ -165,4 +178,4 @@ _html do
 _ "Total: #{people.size} Matches: #{matches} GivenBad: #{badGiven} SNBad: 
#{badSN}"
   end
 
-end
\ No newline at end of file
+end

[whimsy] branch master updated: Update coi.cgi (#117)

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new 1edb586  Update coi.cgi (#117)
1edb586 is described below

commit 1edb586a8ef63103343336fc8edd16c230fec2f9
Author: Craig L Russell 
AuthorDate: Tue Apr 20 16:06:22 2021 -0700

Update coi.cgi (#117)

Remove cc: secretary when filing COI document
---
 www/officers/coi.cgi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/www/officers/coi.cgi b/www/officers/coi.cgi
index f8f39d8..3991e0e 100755
--- a/www/officers/coi.cgi
+++ b/www/officers/coi.cgi
@@ -208,7 +208,6 @@ def emit_post(_)
 ASF::Mail.configure
 mail = Mail.new do
   to "#{USERNAME}<#{USERMAIL}>"
-  cc "secret...@apache.org"
   from USERMAIL
   subject "Conflict of Interest affirmation from #{USERNAME}"
   text_part do

[whimsy] 01/01: Update coi.cgi

[clr]

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

clr pushed a commit to branch coi-cc-secretary
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit e8cfc4476d5e7b9a0bc15ee61c899e8d0eb0bc56
Author: Craig L Russell 
AuthorDate: Fri Apr 16 14:44:28 2021 -0700

Update coi.cgi

Remove cc: secretary when filing COI document
---
 www/officers/coi.cgi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/www/officers/coi.cgi b/www/officers/coi.cgi
index f8f39d8..3991e0e 100755
--- a/www/officers/coi.cgi
+++ b/www/officers/coi.cgi
@@ -208,7 +208,6 @@ def emit_post(_)
 ASF::Mail.configure
 mail = Mail.new do
   to "#{USERNAME}<#{USERMAIL}>"
-  cc "secret...@apache.org"
   from USERMAIL
   subject "Conflict of Interest affirmation from #{USERNAME}"
   text_part do

[whimsy] branch coi-cc-secretary created (now e8cfc44)

[clr]

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

clr pushed a change to branch coi-cc-secretary
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


  at e8cfc44  Update coi.cgi

This branch includes the following new commits:

 new e8cfc44  Update coi.cgi

The 1 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.

[whimsy] branch add-account-name-to-ack-email updated (5611e00 -> d681d3f)

[clr]

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

clr pushed a change to branch add-account-name-to-ack-email
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from 5611e00  Update icla-account-requested.erb
 add d681d3f  Update icla-account-requested.erb

No new revisions were added by this update.

Summary of changes:
 www/secretary/workbench/templates/icla-account-requested.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[whimsy] branch add-account-name-to-ack-email created (now 5611e00)

[clr]

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

clr pushed a change to branch add-account-name-to-ack-email
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


  at 5611e00  Update icla-account-requested.erb

This branch includes the following new commits:

 new 5611e00  Update icla-account-requested.erb

The 1 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.

[whimsy] 01/01: Update icla-account-requested.erb

[clr]

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

clr pushed a commit to branch add-account-name-to-ack-email
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit 5611e00172f0ffd6bc0d6c6ce877d7e26c2c95f1
Author: Craig L Russell 
AuthorDate: Mon Feb 1 12:14:44 2021 -0800

Update icla-account-requested.erb

Add requested account name to acknowledgement email to user
---
 www/secretary/workbench/templates/icla-account-requested.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/secretary/workbench/templates/icla-account-requested.erb 
b/www/secretary/workbench/templates/icla-account-requested.erb
index 6555b45..ff539c4 100644
--- a/www/secretary/workbench/templates/icla-account-requested.erb
+++ b/www/secretary/workbench/templates/icla-account-requested.erb
@@ -2,7 +2,7 @@ Dear <%= @pubname %>,
 
 This message acknowledges receipt of your ICLA, which has been filed in the 
Apache Software Foundation records.
 
-Your account has been requested for you and you should receive email with next 
steps
+Your account <%= @user %> has been requested for you and you should receive 
email with next steps
 within the next few days (can take up to a week).
 
 Please refer to https://www.apache.org/foundation/how-it-works.html#developers

[whimsy] branch master updated (42c6040 -> 1ff6e22)

[clr]

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

clr pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from 42c6040  Add temp debug to detect stalling
 add 1ff6e22  Use symbols :emeritusReady and :emeritusReady; use target: 
_blank for ready emeritus requests

No new revisions were added by this update.

Summary of changes:
 www/secretary/workbench/server.rb | 2 +-
 www/secretary/workbench/views/index.js.rb | 6 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

[whimsy] branch master updated: Enable creation of emeritus request by owner

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
 new 09681f5  Enable creation of emeritus request by owner
09681f5 is described below

commit 09681f5e922bfcae049383fe5c42b5c4800759ef
Author: Craig L Russell 
AuthorDate: Sat Jul 11 12:30:52 2020 -0700

Enable creation of emeritus request by owner
---
 www/roster/views/actions/memstat.json.rb | 35 ++--
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/www/roster/views/actions/memstat.json.rb 
b/www/roster/views/actions/memstat.json.rb
index f28c8df..370c524 100644
--- a/www/roster/views/actions/memstat.json.rb
+++ b/www/roster/views/actions/memstat.json.rb
@@ -28,7 +28,6 @@ if @action == 'emeritus' or @action == 'active' or @action == 
'deceased'
   index = text.index(/^\s\*\)\s/, text.index(/^Emeritus/))
   entry.sub! %r{\s*/\* deceased, .+?\*/},'' # drop the deceased comment if 
necessary
   # if pending emeritus request was found, move it to emeritus
-  # If emeritus request was found, move it to emeritus
   filename = ASF::EmeritusRequestFiles.extractfilename(@emeritusfileurl)
   if filename
 extra << ['mv', @emeritusfileurl, ASF::SVN.svnpath!('emeritus', 
filename)]
@@ -59,7 +58,7 @@ if @action == 'rescind_emeritus'
   # TODO handle case where rescinded file already exists
   ASF::SVN.svn_!('mv', [@emeritusfileurl, 
ASF::SVN.svnurl('emeritus-requests-rescinded')], _, {env:env, msg:message})
 elsif @action == 'request_emeritus'
-  # Create mail to secretary requesting emeritus
+  # Create emeritus request and send acknowlegement mail from secretary
   template, err =
 ASF::SVN.svn('cat', ASF::SVN.svnpath!('foundation', 
'emeritus-request.txt').untaint, {env:env})
   raise RuntimeError.new("Failed to read emeritus-request.txt: " + err) unless 
template
@@ -74,20 +73,26 @@ elsif @action == 'request_emeritus'
 .gsub('Signed: __',
   'Signed by validated user at: Whimsy www/committer_')
 .gsub('Date: _',
-  ('Date: ___' + centered_date))
-
-  ASF::Mail.configure
-  mail = Mail.new do
-to "secret...@apache.org"
-cc "#{USERNAME}<#{USERMAIL}>"
-from "#{USERMAIL}"
-subject "Emeritus request from #{USERNAME}"
-text_part do
-  body "Please accept my emeritus request, which is 
attached.\n\nRegards,\n\n#{USERNAME}\n\n"
+  ('Date: ___' + centered_date)).untaint
+  # Write the emeritus request to emeritus-requests-received
+  EMERITUS_REQUEST_URL = 
ASF::SVN.svnpath!('emeritus-requests-received').untaint
+  Dir.mktmpdir do |tmpdir|
+filename =File.join(tmpdir,'tmpfile')
+File.write(filename, signed_request)
+if 0 == ASF::SVN.create_(EMERITUS_REQUEST_URL, "#{USERID}.txt", filename, 
"Emeritus request from #{USERNAME} (#{USERID})", env, _)
+  ASF::Mail.configure
+  mail = Mail.new do
+from "secret...@apache.org"
+to "#{USERNAME}<#{USERMAIL}>"
+subject "Acknowledgement of emeritus request from #{USERNAME}"
+text_part do
+  body "This acknowledges receipt of your emeritus request. You can 
find the request at #{EMERITUS_REQUEST_URL}#{USERID}.txt. A copy is attached 
for your records.\n\nWarm Regards,\n\nSecretary, Apache Software 
Foundation\nsecret...@apache.org\n\n"
+end
+  end
+  mail.attachments["#{USERID}.txt"] = signed_request
+  mail.deliver!
 end
   end
-  mail.attachments["#{USERID}.txt"] = signed_request.untaint
-  mail.deliver!
 elsif @action == 'request_reinstatement'
   ASF::Mail.configure
   mail = Mail.new do
@@ -96,7 +101,7 @@ elsif @action == 'request_reinstatement'
 from "#{USERMAIL}"
 subject "Emeritus reinstatement request from #{USERNAME}"
 text_part do
-  body "I respectfully request reinstatement to full 
membership.\n\nRegards,\n\n#{USERNAME}"
+  body "I respectfully request reinstatement to full membership in The 
Apache Software Foundation.\n\nRegards,\n\n#{USERNAME}"
 end
   end
   mail.deliver!

[whimsy] branch roster-emeritus updated (99733df -> 38e7d4c)

[clr]

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

clr pushed a change to branch roster-emeritus
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from 99733df  merge master
 new 2cbabb3  Update file handling for emeritus request
 add d665844  += emeritus-request.txt
 add 718b3db  Don't show button unless there is a file
 add c6924da  Define extra before first use
 add f329178  rescue crash in local testing
 add 956b71d  Allow override of svn @base; allow svn: URLs
 add 58754a1  Tool to set up test repo
 add 98ee31a  Fix depth except for symlinks; check depth
 add 158f964  Fix up magic strings
 add e0a8bec  Fix comment
 add 59f4d36  Message is different on https; add options
 add 26c67c6  Get correct svn parent directory for listings
 new 38e7d4c  merge

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:
 Rakefile | 47 +++-
 lib/whimsy/asf/svn.rb| 52 +--
 repository.yml   |  3 +-
 tools/comdevtalks.rb |  6 ++--
 tools/setup_local_repo.rb| 61 
 www/roster/views/actions/memstat.json.rb | 32 +
 www/roster/views/person/memstat.js.rb|  8 +++--
 www/secretary/workbench/server.rb|  2 +-
 8 files changed, 154 insertions(+), 57 deletions(-)
 create mode 100755 tools/setup_local_repo.rb

[whimsy] 02/02: merge

[clr]

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

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

commit 38e7d4cc63e6fb8104cb3bd6200a4a1c28d14c10
Merge: 2cbabb3 26c67c6
Author: Craig L Russell 
AuthorDate: Thu Jul 9 14:30:06 2020 -0700

merge

 Rakefile | 47 +++-
 lib/whimsy/asf/svn.rb| 52 +--
 repository.yml   |  3 +-
 tools/comdevtalks.rb |  6 ++--
 tools/setup_local_repo.rb| 61 
 www/roster/views/actions/memstat.json.rb |  3 +-
 www/roster/views/person/memstat.js.rb|  8 +++--
 www/secretary/workbench/server.rb|  2 +-
 8 files changed, 138 insertions(+), 44 deletions(-)

[whimsy] 01/02: Update file handling for emeritus request

[clr]

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

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

commit 2cbabb3e495c0720ae923da24a8606b34231eb4a
Author: Craig L Russell 
AuthorDate: Thu Jul 9 14:26:36 2020 -0700

Update file handling for emeritus request
---
 lib/whimsy/asf/svn.rb|  2 +-
 www/roster/views/actions/memstat.json.rb | 29 -
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/lib/whimsy/asf/svn.rb b/lib/whimsy/asf/svn.rb
index 13e2211..c979e77 100644
--- a/lib/whimsy/asf/svn.rb
+++ b/lib/whimsy/asf/svn.rb
@@ -753,7 +753,7 @@ module ASF
   out, err = self.svn('list', target, {env: env})
   return 1 if out # already exists
   # Need to check for unexpected errors; the error message does not 
include the full repo URL
-  unless err =~ %r{^svn: warning: W160013: Path '.+#{filename}' not found}
+  unless err =~ %r{^svn: warning: W160013:}
 throw RuntimeError.new("#{filename} already exists! #{err}")
   end
   commands = [['put', source, target]]
diff --git a/www/roster/views/actions/memstat.json.rb 
b/www/roster/views/actions/memstat.json.rb
index b13f217..0e51c9f 100644
--- a/www/roster/views/actions/memstat.json.rb
+++ b/www/roster/views/actions/memstat.json.rb
@@ -77,23 +77,26 @@ elsif @action == 'request_emeritus'
 .gsub('Signed: __',
   'Signed by validated user at: Whimsy www/committer_')
 .gsub('Date: _',
-  ('Date: ___' + centered_date))
+  ('Date: ___' + centered_date)).untaint
   # Write the emeritus request to emeritus-requests-received
   EMERITUS_REQUEST_URL = 
ASF::SVN.svnpath!('emeritus-requests-received').untaint
-  rc = ASF::SVN.create_(EMERITUS_REQUEST_URL, "#{USERID}.txt", signed_request, 
"Emeritus request from #{USERNAME}  (#{USERID}", env, _)
-  ASF::Mail.configure
-  mail = Mail.new do
-from "secret...@apache.org"
-to "#{USERNAME}<#{USERMAIL}>"
-subject "Emeritus request acknowledgement from #{USERNAME}"
-text_part do
-  body "This acknowledges receipt of your emeritus request. You can find 
the request at #{EMERITUS_REQUEST_URL}/#{USERID}.txt. A copy is attached for 
your records.\n\nRegards,\n\nsecret...@apache.org\n\n"
+  Dir.mktmpdir do |tmpdir|
+filename =File.join(tmpdir,'tmpfile')
+File.write(filename, signed_request)
+if 0 == ASF::SVN.create_(EMERITUS_REQUEST_URL, "#{USERID}.txt", filename, 
"Emeritus request from #{USERNAME} (#{USERID})", env, _)
+  ASF::Mail.configure
+  mail = Mail.new do
+from "secret...@apache.org"
+to "#{USERNAME}<#{USERMAIL}>"
+subject "Emeritus request acknowledgement from #{USERNAME}"
+text_part do
+  body "This acknowledges receipt of your emeritus request. You can 
find the request at #{EMERITUS_REQUEST_URL}/#{USERID}.txt. A copy is attached 
for your records.\n\nWarm Regards,\n\nSecretary, Apache Software 
Foundation\nsecret...@apache.org\n\n"
+end
+  end
+  mail.attachments["#{USERID}.txt"] = signed_request
+  mail.deliver!
 end
   end
-  mail.attachments["#{USERID}.txt"] = signed_request.untaint
-  if rc == 0
-mail.deliver!
-  end
 elsif @action == 'request_reinstatement'
   ASF::Mail.configure
   mail = Mail.new do

[whimsy] branch roster-emeritus updated (19c7b49 -> 99733df)

[clr]

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

clr pushed a change to branch roster-emeritus
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from 19c7b49  Defer checking return from create
 add 4d3e6fc  += create_ metthod
 add 287de46  Use correct SVN name
 add 91b3ba1  only need podlings.xml
 add dce6c48  Unused
 add ebcfdff  Eliminate variables only used once
 add c5b3fdf  Eliminate unnecessary variable
 add 814cbd1  Unnecessary variable
 add 9627356  Unnecessary variable
 add db162dd  Obsolete
 add 8affe30  Docn
 add 74e5fac  More unneeded checkouts
 add 18a2b56  Simpler check
 add 5bb4688  Only read calendar once as part of ASF::SVN.update
 add b5511d1  No need for local checkout of calendar.mdtext
 add 5683da0  No need for local checkout
 add 59c50b7  Error check needed
 add 76b7f5d  Detect commit error
 add 2800636  Dropped site-board
 add feb3b33  Optionally return all repo entries
 add e03242d  Keep only needed board files
 add 712c07a  SImply; don't use system shell
 add 52e3d68  update now supports diff option
 add 5c39934  Allow for frozen values (eg. in test setups)
 add fea7fe0  Add check for file presence
 add 3b39c32  Simplify by using SVN.update method
 add 419aeea  Tidy; don't use system shell
 add 4b561d1  Only need a few files from officers and foundation
 add 61c698f  Docn
 new 99733df  merge master

The 1 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:
 Rakefile   |  18 ++-
 lib/spec/lib/svn_spec.rb   |   2 +-
 lib/whimsy/asf/icla.rb |   6 +-
 lib/whimsy/asf/rack.rb |   4 +-
 lib/whimsy/asf/svn.rb  |  74 +++--
 lib/whimsy/asf/watch.rb|   3 +-
 repository.yml |  32 +++-
 tools/iclasort.rb  |  20 +--
 tools/membersort.rb|  19 ++-
 tools/migrate_podlings.rb  |   4 +-
 www/board/agenda/views/actions/publish.json.rb |  44 +++---
 www/board/publish_minutes.cgi  | 170 -
 www/roster/views/actions/memstat.json.rb   |   7 +-
 www/secretary/response-time.cgi|   3 +-
 www/secretary/workbench/views/actions/ccla.json.rb |  21 +--
 15 files changed, 152 insertions(+), 275 deletions(-)
 delete mode 100755 www/board/publish_minutes.cgi

[whimsy] 01/01: merge master

[clr]

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

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

commit 99733df47dd2b52eef1697dd76103171f8082b59
Merge: 19c7b49 61c698f
Author: Craig L Russell 
AuthorDate: Wed Jul 8 15:27:01 2020 -0700

merge master

 Rakefile   |  18 ++-
 lib/spec/lib/svn_spec.rb   |   2 +-
 lib/whimsy/asf/icla.rb |   6 +-
 lib/whimsy/asf/rack.rb |   4 +-
 lib/whimsy/asf/svn.rb  |  74 +++--
 lib/whimsy/asf/watch.rb|   3 +-
 repository.yml |  32 +++-
 tools/iclasort.rb  |  20 +--
 tools/membersort.rb|  19 ++-
 tools/migrate_podlings.rb  |   4 +-
 www/board/agenda/views/actions/publish.json.rb |  44 +++---
 www/board/publish_minutes.cgi  | 170 -
 www/roster/views/actions/memstat.json.rb   |   7 +-
 www/secretary/response-time.cgi|   3 +-
 www/secretary/workbench/views/actions/ccla.json.rb |  21 +--
 15 files changed, 152 insertions(+), 275 deletions(-)

diff --cc www/roster/views/actions/memstat.json.rb
index d383584,9d86373..b13f217
--- a/www/roster/views/actions/memstat.json.rb
+++ b/www/roster/views/actions/memstat.json.rb
@@@ -63,11 -60,9 +60,11 @@@ if @action == 'rescind_emeritus
emeritus_rescinded_url = ASF::SVN.svnurl('emeritus-requests-rescinded')
ASF::SVN.svn_('mv', [@emeritusfileurl, emeritus_rescinded_url], _, 
{env:env, msg:message})
  elsif @action == 'request_emeritus'
 -  # Create mail to secretary requesting emeritus
 +  # Create emeritus request and send mail from secretary
 +  FOUNDATION_URL = ASF::SVN.svnurl('foundation')
 +  EMERITUS_TEMPLATE_URL = ASF::SVN.svnpath!('foundation', 
'emeritus-request.txt').untaint
template, err =
- ASF::SVN.svn('cat', EMERITUS_TEMPLATE_URL, {env:env})
+ ASF::SVN.svn('cat', ASF::SVN.svnpath!('foundation', 
'emeritus-request.txt').untaint, {env:env})
raise RuntimeError.new("Failed to read emeritus-request.txt: " + err) 
unless template
centered_id = "#{USERID}".center(55, '_')
centered_name = "#{USERNAME}".center(55, '_')

[whimsy] branch roster-emeritus updated: Defer checking return from create

[clr]

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

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


The following commit(s) were added to refs/heads/roster-emeritus by this push:
 new 19c7b49  Defer checking return from create
19c7b49 is described below

commit 19c7b491b54be0418ccfa37c0ee05749cf3312be
Author: Craig L Russell 
AuthorDate: Wed Jul 8 15:23:07 2020 -0700

Defer checking return from create
---
 www/roster/views/actions/memstat.json.rb | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/roster/views/actions/memstat.json.rb 
b/www/roster/views/actions/memstat.json.rb
index 25fb878..d383584 100644
--- a/www/roster/views/actions/memstat.json.rb
+++ b/www/roster/views/actions/memstat.json.rb
@@ -82,10 +82,8 @@ elsif @action == 'request_emeritus'
 .gsub('Date: _',
   ('Date: ___' + centered_date))
   # Write the emeritus request to emeritus-requests-received
-  EMERITUS_REQUEST_URL = ASF::SVN.svnpath('emeritus-requests-received').untaint
+  EMERITUS_REQUEST_URL = 
ASF::SVN.svnpath!('emeritus-requests-received').untaint
   rc = ASF::SVN.create_(EMERITUS_REQUEST_URL, "#{USERID}.txt", signed_request, 
"Emeritus request from #{USERNAME}  (#{USERID}", env, _)
-  if rc == 1 break # do nothing if there is already an emeritus request
-
   ASF::Mail.configure
   mail = Mail.new do
 from "secret...@apache.org"
@@ -96,7 +94,9 @@ elsif @action == 'request_emeritus'
 end
   end
   mail.attachments["#{USERID}.txt"] = signed_request.untaint
-  mail.deliver!
+  if rc == 0
+mail.deliver!
+  end
 elsif @action == 'request_reinstatement'
   ASF::Mail.configure
   mail = Mail.new do

[whimsy] branch roster-emeritus updated (f1733a6 -> b3dbb56)

[clr]

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

clr pushed a change to branch roster-emeritus
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from f1733a6  Enable writing the emeritus request
 add 9600976  Capitalise
 add e3df6f9  Dummy change
 add ceb56c9  Missing RE prefix
 add 3741709  Change names to avoid unnecessary search hits
 add c526d73  Use actual httpd conf
 add f3d7b3d  Restore ASF/PIT parsing
 add 009ac8a  Handle missing repo details
 add 7b562c8  Allow for missing next group
 add 8cf6976  Cannot use whimsy gems in Ruby2js code
 add 8f97901  get icla path from server; only say href once
 add 69ab353  iclapath already ends in /
 add 31d38a3  Get svn path from caller
 add 31a90a2  Id is a built-id
 add f668889  Neater
 add be3f658  Wrong array entry to check
 add 843b00a  quick exit if puppet is not in path
 add 10f89f1  Check for additional required tools
 add 08f34ae  simplify
 add 727ad35  pdf90 etc are no longer provided with pdfjam 3.02
 add 93cfd68  Don't assume infra-puppet is checked out
 add 90b5b27  No longer depend on Puppet3 checkout
 add 97f0026  Docco
 add 1cbd9c3  Fix up insecure op crash
 add 8553732  Extract sample names as constants
 add da7f445  templates no longer needed
 add 374d2db  Change to standard sample name
 add eab75a9  site-root no longer needed
 add eb0214c  Document dependency
 add ce2d3bc  Sort
 add 7acb44f  Merge branch 'roster-emeritus'
 add 16d43c6  URI::File is not in 2.3.1
 add ce7ed8f  String might be frozen
 add 9ac18f8  Ensure env auth is untainted
 add fdc0ad1  File.delete fails at line 716
 add 28181b5  Try to fix Insecure operation
 add 7253b29  Need some more untainting
 new b3dbb56  Merge branch 'master' into roster-emeritus

The 1 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:
 MACOSX.md  |  4 +-
 Rakefile   |  5 +-
 lib/spec/lib/svn_spec.rb   | 67 +++---
 lib/spec/lib/svn_wunderbar_spec.rb |  2 +-
 lib/spec/spec_helper.rb|  6 +-
 lib/test/svn/{templates => minutes}/README.txt |  0
 lib/whimsy/asf/auth.rb | 54 ++---
 lib/whimsy/asf/rack.rb |  2 +
 lib/whimsy/asf/svn.rb  | 11 ++--
 repository.yml | 59 ---
 secmail.py | 14 ++---
 tools/mkconf.rb|  5 +-
 tools/pubsub.rb| 23 +---
 tools/vhosttest.rb |  2 +-
 tools/wwwdocs.rb   | 48 ++--
 www/roster/views/actions/memstat.json.rb   |  2 +-
 www/roster/views/committerSearch.js.rb |  3 +-
 www/roster/views/committers.html.rb|  4 +-
 www/roster/views/iclaSearch.js.rb  |  3 +-
 www/roster/views/iclas.html.rb |  2 +-
 .../views/actions/rotate-attachment.json.rb| 10 ++--
 www/status/monitors/git.rb | 30 +-
 22 files changed, 181 insertions(+), 175 deletions(-)
 rename lib/test/svn/{templates => minutes}/README.txt (100%)

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

[clr]

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

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

commit b3dbb56c45504bc6026d52dbb90146234482c38a
Merge: f1733a6 7253b29
Author: Craig L Russell 
AuthorDate: Wed Jul 8 15:00:03 2020 -0700

Merge branch 'master' into roster-emeritus

 MACOSX.md  |  4 +-
 Rakefile   |  5 +-
 lib/spec/lib/svn_spec.rb   | 67 +++---
 lib/spec/lib/svn_wunderbar_spec.rb |  2 +-
 lib/spec/spec_helper.rb|  6 +-
 lib/test/svn/{templates => minutes}/README.txt |  0
 lib/whimsy/asf/auth.rb | 54 ++---
 lib/whimsy/asf/rack.rb |  2 +
 lib/whimsy/asf/svn.rb  | 11 ++--
 repository.yml | 59 ---
 secmail.py | 14 ++---
 tools/mkconf.rb|  5 +-
 tools/pubsub.rb| 23 +---
 tools/vhosttest.rb |  2 +-
 tools/wwwdocs.rb   | 48 ++--
 www/roster/views/actions/memstat.json.rb   |  2 +-
 www/roster/views/committerSearch.js.rb |  3 +-
 www/roster/views/committers.html.rb|  4 +-
 www/roster/views/iclaSearch.js.rb  |  3 +-
 www/roster/views/iclas.html.rb |  2 +-
 .../views/actions/rotate-attachment.json.rb| 10 ++--
 www/status/monitors/git.rb | 30 +-
 22 files changed, 181 insertions(+), 175 deletions(-)

[whimsy] branch roster-emeritus updated (b0e80d2 -> f1733a6)

[clr]

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

clr pushed a change to branch roster-emeritus
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from b0e80d2  Remove debug code
 new 9980c47  Change emeritus request email from request to ack
 new f1733a6  Enable writing the emeritus request

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/roster/views/actions/memstat.json.rb | 17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

[whimsy] 01/02: Change emeritus request email from request to ack

[clr]

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

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

commit 9980c47a83dc60a6df4d2b476774a8fb32d44635
Author: Craig L Russell 
AuthorDate: Wed Jul 8 14:35:06 2020 -0700

Change emeritus request email from request to ack
---
 www/roster/views/actions/memstat.json.rb | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/www/roster/views/actions/memstat.json.rb 
b/www/roster/views/actions/memstat.json.rb
index 9ec7068..5cf00c2 100644
--- a/www/roster/views/actions/memstat.json.rb
+++ b/www/roster/views/actions/memstat.json.rb
@@ -84,12 +84,11 @@ elsif @action == 'request_emeritus'
 
   ASF::Mail.configure
   mail = Mail.new do
-to "secret...@apache.org"
-cc "#{USERNAME}<#{USERMAIL}>"
-from "#{USERMAIL}"
-subject "Emeritus request from #{USERNAME}"
+from "secret...@apache.org"
+to "#{USERNAME}<#{USERMAIL}>"
+subject "Emeritus request acknowledgement from #{USERNAME}"
 text_part do
-  body "Please accept my emeritus request, which is 
attached.\n\nRegards,\n\n#{USERNAME}\n\n"
+  body "This acknowledges receipt of your emeritus request, a copy of 
which is attached for your records.\n\nRegards,\n\nsecret...@apache.org\n\n"
 end
   end
   mail.attachments["#{USERID}.txt"] = signed_request.untaint
@@ -102,7 +101,7 @@ elsif @action == 'request_reinstatement'
 from "#{USERMAIL}"
 subject "Emeritus reinstatement request from #{USERNAME}"
 text_part do
-  body "I respectfully request reinstatement to full 
membership.\n\nRegards,\n\n#{USERNAME}"
+  body "I respectfully request reinstatement to full membership in The 
Apache Software Foundation.\n\nRegards,\n\n#{USERNAME}"
 end
   end
   mail.deliver!

[whimsy] 02/02: Enable writing the emeritus request

[clr]

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

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

commit f1733a6ea633ace6491e3e28799c65ea157cc380
Author: Craig L Russell 
AuthorDate: Wed Jul 8 14:59:33 2020 -0700

Enable writing the emeritus request
---
 www/roster/views/actions/memstat.json.rb | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/www/roster/views/actions/memstat.json.rb 
b/www/roster/views/actions/memstat.json.rb
index 5cf00c2..dab18b0 100644
--- a/www/roster/views/actions/memstat.json.rb
+++ b/www/roster/views/actions/memstat.json.rb
@@ -63,7 +63,7 @@ if @action == 'rescind_emeritus'
   emeritus_rescinded_url = ASF::SVN.svnurl('emeritus-requests-rescinded')
   ASF::SVN.svn_('mv', [@emeritusfileurl, emeritus_rescinded_url], _, {env:env, 
msg:message})
 elsif @action == 'request_emeritus'
-  # Create mail to secretary requesting emeritus
+  # Create emeritus request and send mail from secretary
   FOUNDATION_URL = ASF::SVN.svnurl('foundation')
   EMERITUS_TEMPLATE_URL = ASF::SVN.svnpath!('foundation', 
'emeritus-request.txt').untaint
   template, err =
@@ -81,6 +81,10 @@ elsif @action == 'request_emeritus'
   'Signed by validated user at: Whimsy www/committer_')
 .gsub('Date: _',
   ('Date: ___' + centered_date))
+  # Write the emeritus request to emeritus-requests-received
+  EMERITUS_REQUEST_URL = ASF::SVN.svnpath('emeritus-requests-received').untaint
+  rc = ASF::SVN.create_(EMERITUS_REQUEST_URL, "#{USERID}.txt", signed_request, 
"Emeritus request from #{USERNAME}  (#{USERID}", env, _)
+  if rc == 1 break # do nothing if there is already an emeritus request
 
   ASF::Mail.configure
   mail = Mail.new do
@@ -88,7 +92,7 @@ elsif @action == 'request_emeritus'
 to "#{USERNAME}<#{USERMAIL}>"
 subject "Emeritus request acknowledgement from #{USERNAME}"
 text_part do
-  body "This acknowledges receipt of your emeritus request, a copy of 
which is attached for your records.\n\nRegards,\n\nsecret...@apache.org\n\n"
+  body "This acknowledges receipt of your emeritus request. You can find 
the request at #{EMERITUS_REQUEST_URL}/#{USERID}.txt. A copy is attached for 
your records.\n\nRegards,\n\nsecret...@apache.org\n\n"
 end
   end
   mail.attachments["#{USERID}.txt"] = signed_request.untaint

[whimsy] 01/01: Merge branch 'roster-emeritus'

[clr]

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

clr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit 7acb44f860a22684a81e5999603704cb6451c762
Merge: ce2d3bc b0e80d2
Author: Craig L Russell 
AuthorDate: Mon Jul 6 10:31:18 2020 -0700

Merge branch 'roster-emeritus'

 lib/whimsy/asf/documents.rb  |  24 ++
 www/roster/views/actions/memstat.json.rb | 129 ---
 www/roster/views/person/main.js.rb   |  16 
 www/roster/views/person/memstat.js.rb|  81 ---
 4 files changed, 194 insertions(+), 56 deletions(-)

[whimsy] branch roster-emeritus updated (e79a519 -> b0e80d2)

[clr]

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

clr pushed a change to branch roster-emeritus
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from e79a519  Use library routines svnpath, svn_, {env:env}; enable request 
emeritus
 add b0e80d2  Remove debug code

No new revisions were added by this update.

Summary of changes:
 www/roster/views/actions/memstat.json.rb | 6 --
 1 file changed, 6 deletions(-)

[whimsy] branch roster-emeritus updated (03a0376 -> e79a519)

[clr]

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

clr pushed a change to branch roster-emeritus
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from 03a0376  Merge branch 'master' into roster-emeritus
 add a5ebc7c  Add documentation for methods extractfilename
 add e79a519  Use library routines svnpath, svn_, {env:env}; enable request 
emeritus

No new revisions were added by this update.

Summary of changes:
 lib/whimsy/asf/documents.rb  |  8 
 www/roster/views/actions/memstat.json.rb | 20 
 2 files changed, 16 insertions(+), 12 deletions(-)

[whimsy] branch roster-emeritus updated (5598398 -> 03a0376)

[clr]

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

clr pushed a change to branch roster-emeritus
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from 5598398  rename emeritus_file_name to emeritus_file_url; remove 
console messages
 add 9dcbeae  Skip letsencrypt workspace if certbot present
 add 100baec  Use File.join where possible
 add b8889bc  Docn
 add 3b5c323  Use library methods
 add e2951a5  Docco
 add 2a1ded7  Trim link text
 add 24b7124  Use library routines
 add d6df4d6  Ensure system does not run shell
 add 4dede46  No longer available
 add 4ff11a3  Note script
 add f7700ab  Test gitpubsub
 add aad37a6  Don't use system shell
 add b745258  More tests
 add 9093b05  Eliminate arbitrary :args parameter
 add 03a0376  Merge branch 'master' into roster-emeritus

No new revisions were added by this update.

Summary of changes:
 DEPLOYMENT.md  |   9 ++-
 Rakefile   |  41 +-
 lib/spec/lib/svn_spec.rb   |  43 +-
 lib/spec/lib/svn_wunderbar_spec.rb |  27 ---
 lib/whimsy/asf/svn.rb  |  47 +--
 tools/download_check.rb|   1 +
 tools/pubsub.rb|  12 +--
 www/board/agenda/views/actions/publish.json.rb |  51 
 www/board/publish_minutes.cgi  | 104 +++--
 www/index.html |   1 -
 www/members/proxy.cgi  |   2 +-
 www/officers/coi.cgi   |   2 +-
 www/secretary/workbench/tasks.rb   |   5 ++
 www/treasurer/bill-upload.cgi  |   1 -
 14 files changed, 186 insertions(+), 160 deletions(-)

[whimsy] branch roster-emeritus updated (6ee5bfa -> 5598398)

[clr]

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

clr pushed a change to branch roster-emeritus
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from 6ee5bfa  Merge branch 'master' into roster-emeritus
 add 5598398  rename emeritus_file_name to emeritus_file_url; remove 
console messages

No new revisions were added by this update.

Summary of changes:
 lib/whimsy/asf/documents.rb  | 16 
 www/roster/views/actions/memstat.json.rb | 24 ++--
 www/roster/views/person/main.js.rb   |  8 
 www/roster/views/person/memstat.js.rb| 12 ++--
 4 files changed, 40 insertions(+), 20 deletions(-)

[whimsy] branch roster-emeritus updated (3b0c160 -> 6ee5bfa)

[clr]

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

clr pushed a change to branch roster-emeritus
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


from 3b0c160  Merge branch 'master' into roster-emeritus
 add 990721c  sort by last name
 add 81f3da6  Agree with capitalisation everywhere else
 add 5c49cab  Can't extend Wvisible comment
 add d37126c  Cater for multiple categories
 add 2b8e090  Add hover text for the permission icon
 add 0202350  Add categories
 add 6ee5bfa  Merge branch 'master' into roster-emeritus

No new revisions were added by this update.

Summary of changes:
 tools/wwwdocs.rb |  8 
 www/committers/tools.cgi | 10 ++
 www/officers/coi.cgi |  8 +---
 www/test/example.cgi |  3 ++-
 4 files changed, 17 insertions(+), 12 deletions(-)