| 
						
					 | 
					
						
						
							
						
						9613fcde89
					 | 
					
						
						
							
							Squashed commit of the following:
						
						
						
						
						
						
						
						commit 885a2ed057
Author: Jens Langhammer <jens.langhammer@beryju.org>
Date:   Tue Jun 30 12:17:23 2020 +0200
    flows: fix linting error 
						
						
					 | 
					
						2020-06-30 12:18:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						34be1dd9f4
					 | 
					
						
						
							
							admin: add execute button to flow which executes flow without cache
						
						
						
						
						
						
					 | 
					
						2020-06-30 11:18:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f040223646
					 | 
					
						
						
							
							audit: move events list from admin to audit app
						
						
						
						
						
						
					 | 
					
						2020-06-30 10:23:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bf297b8593
					 | 
					
						
						
							
							admin: add info about latest version
						
						
						
						
						
						
					 | 
					
						2020-06-30 10:23:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b1b63fbb7f
					 | 
					
						
						
							
							stages/prompt: add prompt order field
						
						
						
						
						
						
					 | 
					
						2020-05-28 23:21:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						270739a45a
					 | 
					
						
						
							
							admin: fix policy testing form not showing the correct result
						
						
						
						
						
						
					 | 
					
						2020-05-28 21:50:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						df8995deed
					 | 
					
						
						
							
							policies/*: remove Policy.negate, order, timeout (#39)
						
						
						
						
						
						
						
						policies: rewrite engine to use PolicyBinding for order/negate/timeout
policies: rewrite engine to use PolicyResult instead of tuple 
						
						
					 | 
					
						2020-05-28 21:45:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4377d1e86e
					 | 
					
						
						
							
							admin: fix flow ordering, fix source URLs
						
						
						
						
						
						
					 | 
					
						2020-05-20 16:09:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cafe2f1e1f
					 | 
					
						
						
							
							admin: fix linting
						
						
						
						
						
						
					 | 
					
						2020-05-20 13:59:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						969da05437
					 | 
					
						
						
							
							admin: show object's docstring on inheritance based lists
						
						
						
						
						
						
					 | 
					
						2020-05-20 13:47:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						24a3e787dd
					 | 
					
						
						
							
							migrate to per-model UUID Primary key, remove UUIDModel (#26)
						
						
						
						
						
						
						
						* *: migrate to per-model UUID Primary key, remove UUIDModel
* *: fix import order, fix unittests 
						
						
					 | 
					
						2020-05-20 09:17:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						db69c3e38d
					 | 
					
						
						
							
							admin: add generic tests
						
						
						
						
						
						
					 | 
					
						2020-05-19 20:59:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5ba55356a9
					 | 
					
						
						
							
							admin: cleanup templates, cleanup templatetags
						
						
						
						
						
						
					 | 
					
						2020-05-19 20:29:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9a1b8eb7c8
					 | 
					
						
						
							
							admin: add empty views to all lists, move invitation to stage-invitations
						
						
						
						
						
						
					 | 
					
						2020-05-16 21:43:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e68352b09c
					 | 
					
						
						
							
							admin: add flow-stage-bindings, add policy-bindings, add prompts
						
						
						
						
						
						
					 | 
					
						2020-05-16 19:55:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						df1cb88abc
					 | 
					
						
						
							
							admin: fix slow load for templates using get_links
						
						
						
						
						
						
					 | 
					
						2020-05-16 19:00:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7bd65120b9
					 | 
					
						
						
							
							*: migrate from PolicyModel to PolicyBindingModel, move Policy to passbook_policies
						
						
						
						
						
						
					 | 
					
						2020-05-16 18:07:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						227966e727
					 | 
					
						
						
							
							core: rename nonce to token
						
						
						
						
						
						
					 | 
					
						2020-05-16 16:11:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						406f69080b
					 | 
					
						
						
							
							Revert "*: providers and sources -> channels, PolicyModel to PolicyBindingModel that uses custom M2M through"
						
						
						
						
						
						
						
						This reverts commit 7ed3ceb960. 
						
						
					 | 
					
						2020-05-16 16:02:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7ed3ceb960
					 | 
					
						
						
							
							*: providers and sources -> channels, PolicyModel to PolicyBindingModel that uses custom M2M through
						
						
						
						
						
						
					 | 
					
						2020-05-16 14:03:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						461fed5567
					 | 
					
						
						
							
							admin: remove more duplicate code
						
						
						
						
						
						
					 | 
					
						2020-05-13 13:45:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d5f6714ed7
					 | 
					
						
						
							
							admin: remove redundant code
						
						
						
						
						
						
					 | 
					
						2020-05-13 11:57:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c42ed6bc99
					 | 
					
						
						
							
							admin: sort types, minor fixups
						
						
						
						
						
						
					 | 
					
						2020-05-13 11:57:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						137e90355b
					 | 
					
						
						
							
							flows: default-auth -> default-authentication
						
						
						
						
						
						
					 | 
					
						2020-05-12 14:49:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7500e622f6
					 | 
					
						
						
							
							stages/invitation: start extracting invitation from core
						
						
						
						
						
						
					 | 
					
						2020-05-11 21:58:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						69120da45c
					 | 
					
						
						
							
							core: remove redundant views/forms
						
						
						
						
						
						
					 | 
					
						2020-05-11 00:49:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2ffa2fc6b8
					 | 
					
						
						
							
							admin: update templates and stage views
						
						
						
						
						
						
					 | 
					
						2020-05-10 18:44:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						212e966dd4
					 | 
					
						
						
							
							factors: -> stage
						
						
						
						
						
						
					 | 
					
						2020-05-08 20:59:51 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						08c0eb2ec6
					 | 
					
						
						
							
							admin: add flows
						
						
						
						
						
						
					 | 
					
						2020-05-08 18:45:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8df55f22aa
					 | 
					
						
						
							
							crypto: implement simple certificate-key pair for easier management
						
						
						
						
						
						
					 | 
					
						2020-03-03 23:35:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						53e5cf7826
					 | 
					
						
						
							
							admin: fix some models not being paginated
						
						
						
						
						
						
					 | 
					
						2020-02-27 15:30:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						82654b3fd9
					 | 
					
						
						
							
							ui: re-organize some of the navigation to make it cleaner for end-users
						
						
						
						
						
						
					 | 
					
						2020-02-27 14:59:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						03905b74ff
					 | 
					
						
						
							
							admin: exclude anonymous user from listing
						
						
						
						
						
						
					 | 
					
						2020-02-23 15:27:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0f46207ea4
					 | 
					
						
						
							
							admin: fix provider list not having pagination
						
						
						
						
						
						
					 | 
					
						2020-02-23 14:29:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2a4d68911b
					 | 
					
						
						
							
							helm: change static healthcheck and port
						
						
						
						
						
						
					 | 
					
						2020-02-21 21:50:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						efd88c27ad
					 | 
					
						
						
							
							audit: *crit* fix audit log not being protected correctly
						
						
						
						
						
						
					 | 
					
						2020-02-21 21:33:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ea6a1422f7
					 | 
					
						
						
							
							ui: rewrite admin templates to pf4, add some helper scripts
						
						
						
						
						
						
					 | 
					
						2020-02-21 14:20:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ff25c1c057
					 | 
					
						
						
							
							admin: load custom policy templates
						
						
						
						
						
						
					 | 
					
						2020-02-18 21:35:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						78cddca0d7
					 | 
					
						
						
							
							admin: fix user object being overwritten when deleting a user
						
						
						
						
						
						
					 | 
					
						2020-02-18 21:35:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						73b173b92a
					 | 
					
						
						
							
							admin: fix form missing on update pages
						
						
						
						
						
						
					 | 
					
						2020-02-17 21:02:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9400b01a55
					 | 
					
						
						
							
							admin: parameterise generic from's base template
						
						
						
						
						
						
					 | 
					
						2020-02-17 20:29:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3bd1eadd51
					 | 
					
						
						
							
							all: implement black as code formatter
						
						
						
						
						
						
					 | 
					
						2019-12-31 12:51:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						328c999cb9
					 | 
					
						
						
							
							ci(minor): reenable prospector
						
						
						
						
						
						
					 | 
					
						2019-12-05 14:31:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						73d4d9dfe0
					 | 
					
						
						
							
							admin(major): fix incorrect permissions being set
						
						
						
						
						
						
					 | 
					
						2019-11-07 17:25:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ffca957838
					 | 
					
						
						
							
							audit(major): AuditEntry -> Event
						
						
						
						
						
						
					 | 
					
						2019-10-28 14:26:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						feb80049aa
					 | 
					
						
						
							
							Merge branch 'master' into guardian
						
						
						
						
						
						
					 | 
					
						2019-10-25 22:18:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d4cb1a98c7
					 | 
					
						
						
							
							policy(major): simplify PolicyEngine API, add flag to ignore cache for debug purposes
						
						
						
						
						
						
					 | 
					
						2019-10-15 15:44:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						261d57ad7b
					 | 
					
						
						
							
							Merge branch 'master' into guardian
						
						
						
						
						
						
						
						# Conflicts:
#	Pipfile
#	Pipfile.lock
#	passbook/admin/views/invitations.py
#	passbook/admin/views/policy.py
#	passbook/admin/views/providers.py
#	passbook/admin/views/sources.py
#	passbook/admin/views/users.py 
						
						
					 | 
					
						2019-10-15 15:09:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2a27325dfd
					 | 
					
						
						
							
							admin(major): add pagination to all listviews
						
						
						
						
						
						
					 | 
					
						2019-10-14 13:15:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a6dee2e8ed
					 | 
					
						
						
							
							admin(minor): fix sidebar disappearing when editing user
						
						
						
						
						
						
					 | 
					
						2019-10-14 13:14:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |