178 commits

Author	SHA1	Message	Date
zandercymatics	bd615a18a2	Merge branch 'main' into za/2352-portfolio-user-can-view-and-update-suborgs	2024-08-09 13:31:30 -06:00
zandercymatics	f339266bd0	Update user.py	2024-08-06 08:07:19 -06:00
zandercymatics	b59f77b833	Merge branch 'main' into za/2348-csv-export-org-member-domain-export	2024-08-05 12:32:02 -06:00
zandercymatics	9c800e1f1d	Linting cleanup	2024-08-05 12:23:49 -06:00
zandercymatics	03e184e261	Add readonly view	2024-08-02 14:38:45 -06:00
zandercymatics	7b811895b3	Merge branch 'main' into za/2352-portfolio-user-can-view-and-update-suborgs	2024-08-02 13:41:34 -06:00
Rachid Mrad	226696ddcb	merge main - again	2024-08-02 14:05:40 -04:00
zandercymatics	22bdb1d3b0	More content	2024-08-02 11:40:18 -06:00
Rachid Mrad	c8797e77dd	merge main	2024-08-02 13:12:02 -04:00
zandercymatics	2769a9e5ba	Fix merge conflicts	2024-08-02 09:05:47 -06:00
Rachid Mrad	3e70b344e3	cleanup	2024-08-01 14:26:13 -04:00
zandercymatics	86f040e4b7	Reapply "Merge branch 'main' into za/2348-csv-export-org-member-domain-export" ... This reverts commit 8becad8186.	2024-08-01 09:53:59 -06:00
zandercymatics	8becad8186	Revert "Merge branch 'main' into za/2348-csv-export-org-member-domain-export" ... This reverts commit 4118bf17f9, reversing changes made to 7eba6b721d.	2024-08-01 08:58:38 -06:00
zandercymatics	4118bf17f9	Merge branch 'main' into za/2348-csv-export-org-member-domain-export	2024-08-01 08:53:54 -06:00
Rachid Mrad	70d30f9cee	fix unit tests	2024-08-01 08:52:02 -04:00
Rachid Mrad	53a419a25e	merge main	2024-08-01 08:23:59 -04:00
Rachid Mrad	8f84f33756	portfolio invitation model	2024-07-31 20:34:34 -04:00
zandercymatics	117c7e0c42	Rebase logic	2024-07-31 11:55:50 -06:00
zandercymatics	a0bfdbf2b1	Merge branch 'za/bugfix-hide-csv-export-button-on-empty' into za/2348-csv-export-org-member-domain-export	2024-07-31 11:16:32 -06:00
zandercymatics	280f7cbc1b	Add logic	2024-07-31 11:02:18 -06:00
Rachid Mrad	6a94da8a5d	cleanup	2024-07-30 20:22:53 -04:00
Rachid Mrad	867ccd097e	remove migration	2024-07-30 20:21:41 -04:00
Rachid Mrad	7f212edda5	revert some of the tweaks	2024-07-30 19:58:39 -04:00
zandercymatics	558207d1aa	Update user.py	2024-07-30 14:43:25 -06:00
zandercymatics	511f545f26	Clamp to perms	2024-07-30 14:39:50 -06:00
Rachid Mrad	ee18be87c7	use css for read only styles	2024-07-30 11:39:48 -04:00
David Kennedy	658e7c98a7	initial working code	2024-07-24 22:28:34 -04:00
David Kennedy	ed50709fe3	small change to permission	2024-07-23 10:44:11 -04:00
David Kennedy	f96d9bcf3c	a few changes post merge	2024-07-23 09:29:44 -04:00
Rachid Mrad	faddfcec50	merge main	2024-07-22 15:39:46 -04:00
Rachid Mrad	5ed4581e21	revisions	2024-07-22 15:20:54 -04:00
Rachid Mrad	d8fce10016	merge main	2024-07-18 16:31:10 -04:00
David Kennedy	e9ba08f20a	small refactor	2024-07-18 13:48:27 -04:00
Rachid Mrad	cb3b1fd7fa	lint	2024-07-17 21:12:16 -04:00
Rachid Mrad	ea6ccae948	unit tests	2024-07-17 21:04:59 -04:00
Rachid Mrad	72ee81a43c	handle DJA ui and handle permission test for UserDomainRole	2024-07-17 15:38:38 -04:00
Rachid Mrad	777be646a4	working permissions	2024-07-17 13:57:04 -04:00
zandercymatics	57bf284291	add additional check	2024-07-17 11:17:41 -06:00
zandercymatics	ac3dd401ba	Update user.py	2024-07-17 11:02:13 -06:00
zandercymatics	cea47d1d3d	Bug fix after merge and cleanup	2024-07-17 10:52:27 -06:00
Rachid Mrad	58957e1250	cleanup	2024-07-16 19:16:57 -04:00
Rachid Mrad	af4423ce18	merge main	2024-07-16 17:56:53 -04:00
zandercymatics	28a4b3a0fb	Add missing override on user	2024-07-16 12:14:03 -06:00
Rachid Mrad	ebb95a7d67	build our permissions a bit more	2024-07-16 13:12:13 -04:00
Rachid Mrad	b1ae220602	basic infra	2024-07-15 18:40:24 -04:00
Rachid Mrad	a1fca00b8f	wip	2024-07-05 15:28:33 -04:00
David Kennedy	6361369953	removed user-contact connection	2024-07-02 15:10:49 -04:00
zandercymatics	594f7e70bc	Modify help text ... Some old code snuck in here. Fixing that	2024-06-06 12:39:46 -06:00
zandercymatics	8a1101a250	Merge branch 'main' into za/1988-investigate-indexes	2024-06-04 09:50:47 -06:00
zandercymatics	8954714ec9	Merge branch 'main' into za/2047-force-new-users-profile	2024-05-28 08:45:28 -06:00