Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds philanthropist ability to grant 30day access tokens #31

Closed
wants to merge 8 commits into from

Conversation

BekaValentine
Copy link

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
Copy link
Collaborator

hzeller commented Nov 14, 2018

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 1a08324 otherwise this can not be merged.
(so essentially take HEAD, apply the reverse change, then submit a second submit with the 17e4035 change. Then this will be a conflict-free pull request)

@hzeller
Copy link
Collaborator

hzeller commented Nov 15, 2018

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

@hzeller hzeller closed this Nov 15, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants