search

noisebridge / rfid-access-control

Little system to handle RFID access control at Noisebridge
GNU General Public License v2.0
48 stars 19 forks source link

Adds philanthropist ability to grant 30day access tokens #31

Closed BekaValentine closed 5 years ago

BekaValentine commented 5 years ago

NOTE: This PR extends Adds control panel feature upgrades and should only be merged after that PR.

This PR is pursuant to the following consensus item:

Date: 2018-10-23 Proposed by: r Wording: 30-day daytime access to the space through the RFID access control system can be activated by Philanthropists (but the right for a philanthropist to give daytime access is granted by a member).

Consensus Item History

hzeller commented 5 years ago

Please make sure to only include the changes relevant for philanthropist changes (e.g. this also contains the changes for the opening door UI changes).

Also make sure to include one commit that applies the reverse of https://github.com/noisebridge/rfid-access-control/commit/1a08324942a469d1982debf4e6b00f20a37db3b9 otherwise this can not be merged. (so essentially take HEAD, apply the reverse change, then submit a second submit with the https://github.com/noisebridge/rfid-access-control/pull/31/commits/17e4035dece9bac2d0c9d6d314db60772d9414ca change. Then this will be a conflict-free pull request)

hzeller commented 5 years ago

I've created pull request #32 now with @rizend's changes and that merges cleanly with head.