881 Commits

Author	SHA1	Message	Date
Inga Kirschnick	b1586b3679	social-area page and profile page update	2023-03-01 14:09:15 +01:00
Inga Kirschnick	ec6d0a6477	corpus permission decorator + sidenav update	2023-02-28 10:27:10 +01:00
Inga Kirschnick	d2828cabbe	Explanation update and profile link button	2023-02-24 15:46:44 +01:00
Inga Kirschnick	e2ddbf26f1	Update User Card and Share link with specific role	2023-02-24 15:22:26 +01:00
Patrick Jentsch	9e5bb7ad90	Merge branch 'public-corpus' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into public-corpus	2023-02-23 13:05:11 +01:00
Patrick Jentsch	38d09a3490	Integrate CorpusFollowerRoles	2023-02-23 13:05:04 +01:00
Inga Kirschnick	a459d6607a	Update Share Link	2023-02-23 09:50:09 +01:00
Inga Kirschnick	3ad942f17b	Share link implementation for followers	2023-02-22 16:00:04 +01:00
Inga Kirschnick	4fab75f0e2	Merge branch 'public-corpus' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into public-corpus	2023-02-21 16:18:58 +01:00
Inga Kirschnick	726e781692	share link generator update	2023-02-21 16:18:04 +01:00
Patrick Jentsch	2dc41fd387	Add CorpusFollowerList and functions	2023-02-20 10:40:33 +01:00
Patrick Jentsch	dcdb71ac74	Remove more UI leftovers from community update	2023-02-15 11:30:27 +01:00
Patrick Jentsch	3e8bc5214c	Remove public share mechanisms until legal matters are clarified	2023-02-15 10:56:54 +01:00
Inga Kirschnick	dabf0d1344	Merge branch 'public-corpus' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into public-corpus	2023-02-10 09:43:05 +01:00
Inga Kirschnick	33a54b6206	Corpus first share link	2023-02-10 09:37:31 +01:00
Patrick Jentsch	428400df3f	Add public switch without form	2023-02-09 16:22:37 +01:00
Inga Kirschnick	e03b54cfcd	update public corpora list on dashboard	2023-02-09 14:03:03 +01:00
Patrick Jentsch	91a800f7fd	Add analyse button in public corpus pages	2023-02-09 12:10:37 +01:00
Patrick Jentsch	52fa23ff65	Fix some problems after merge	2023-02-09 12:02:00 +01:00
Inga Kirschnick	66fbf4d57b	update corpus public page	2023-02-09 11:56:02 +01:00
Inga Kirschnick	4d227415d9	Merge branch 'development' into public-corpus	2023-02-09 11:54:58 +01:00
Inga Kirschnick	f06508b412	New Public Corpus Page	2023-02-09 11:21:03 +01:00
Patrick Jentsch	71d13d482b	Add back old news implementation	2023-02-09 11:07:13 +01:00
Patrick Jentsch	965bc9d68a	Update public corpus logic	2023-02-09 11:05:27 +01:00
Patrick Jentsch	817c9c376f	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development	2023-02-08 15:57:25 +01:00
Inga Kirschnick	5b6e889443	New public corpus route	2023-02-07 16:06:09 +01:00
Inga Kirschnick	96520fa46f	Merge branch 'following-mechanics' into development	2023-02-07 08:58:30 +01:00
Patrick Jentsch	2b164fc51d	remove new news system as it needs more work	2023-02-06 15:50:07 +01:00
Inga Kirschnick	c8cfbc8e21	Query Builder fix and placeholder change	2023-02-06 12:12:19 +01:00
Inga Kirschnick	b0f61b28fe	Small changes on the Corpus page	2023-02-02 09:14:50 +01:00
Inga Kirschnick	e2cdcd3f7c	first implementation of follow mechanics	2023-01-31 08:59:42 +01:00
Inga Kirschnick	0bf54ad00b	Updated Clean Up	2023-01-12 10:05:14 +01:00
Inga Kirschnick	b832536f2b	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development	2023-01-12 09:26:08 +01:00
Inga Kirschnick	f1b9680764	Cleanup of tests to push into live system	2023-01-12 09:25:58 +01:00
Patrick Jentsch	d462c1e4d6	Rename PublicUserList to UserList	2023-01-11 13:47:09 +01:00
Patrick Jentsch	632aab258b	Simplify News aggregation	2023-01-10 10:04:15 +01:00
Patrick Jentsch	7836774fef	Update AdminUserList	2023-01-09 08:45:47 +01:00
Patrick Jentsch	8b18571725	Rework all Resource Lists	2023-01-04 20:00:37 +01:00
Patrick Jentsch	7b88493e7d	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development	2023-01-03 17:03:56 +01:00
Patrick Jentsch	77b58d03c3	Change List.js integration and rename service-icon css	2023-01-03 17:03:47 +01:00
Inga Kirschnick	647969ef0e	profile to users	2022-12-23 18:08:33 +01:00
Inga Kirschnick	5e34252cb4	Fix ID/Hashid Problem	2022-12-23 09:55:46 +01:00
Inga Kirschnick	e633b834c6	Adding date and time to news content	2022-12-21 15:23:59 +01:00
Inga Kirschnick	f5a1cf75dd	Bug fixes and new styling for the news page	2022-12-21 14:38:17 +01:00
Patrick Jentsch	c79bc1ed57	Update Dashboard2	2022-12-21 14:34:53 +01:00
Patrick Jentsch	14d7dfc957	Update some logic for avatars	2022-12-19 16:25:10 +01:00
Patrick Jentsch	b8637fcb9f	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development	2022-12-19 15:37:48 +01:00
Patrick Jentsch	c00f5230a1	Some changes for profile	2022-12-19 15:35:06 +01:00
Inga Kirschnick	7674550f33	Merge branch 'profile-page' into development	2022-12-19 15:04:00 +01:00
Inga Kirschnick	7d368ed0ac	Avatar picture dashboard list	2022-12-19 15:02:43 +01:00
Inga Kirschnick	c0d015acd8	Merge branch 'profile-page' into development	2022-12-19 12:51:06 +01:00
Inga Kirschnick	d9699b9c6d	Avatar Update	2022-12-19 12:46:18 +01:00
Patrick Jentsch	9904e54c51	Add dashboard2	2022-12-15 09:53:19 +01:00
Inga Kirschnick	5a396ce214	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development	2022-12-13 15:05:20 +01:00
Inga Kirschnick	3c4bf096d4	Merge branch 'profile-page' into development	2022-12-13 15:05:08 +01:00
Inga Kirschnick	61a6ddd4be	Privacy settings for profile pages	2022-12-13 15:01:04 +01:00
Patrick Jentsch	a413b41dfd	Update News page	2022-12-12 15:37:33 +01:00
Patrick Jentsch	69152f5e6a	Remove PublicCorporaList.js	2022-12-12 13:18:22 +01:00
Patrick Jentsch	65c907a990	Add search functionality to public corpora page	2022-12-07 14:12:30 +01:00
Patrick Jentsch	f056a15ba8	Merge branch 'development' into public-corpora	2022-12-07 14:05:21 +01:00
Patrick Jentsch	c51a47a9aa	Add first work for masto news and update public coropora page	2022-12-07 14:04:36 +01:00
Inga Kirschnick	7856e97402	Social area update	2022-12-07 14:02:33 +01:00
Inga Kirschnick	3ee62f0a82	profile page update for other users	2022-12-05 16:25:54 +01:00
Inga Kirschnick	be517a04af	Update profile page with avatar	2022-12-05 09:40:02 +01:00
Patrick Jentsch	4e6aec3575	Merge branch 'development' into public-corpora	2022-11-30 14:59:10 +01:00
Patrick Jentsch	c8d7de434f	Extend CorpusList for use in public corpora route	2022-11-30 14:58:45 +01:00
Inga Kirschnick	b98e711ad5	Merge branch 'profile-page' into development	2022-11-30 14:56:17 +01:00
Inga Kirschnick	a009bbe1f9	Profile page	2022-11-30 14:36:42 +01:00
Inga Kirschnick	102772d1a7	user settings page	2022-11-29 16:46:33 +01:00
Patrick Jentsch	5491cb184a	add all files for last commit	2022-11-29 15:28:10 +01:00
Patrick Jentsch	aff85f2145	Remove last edited date from FileMixin	2022-11-24 12:24:29 +01:00
Inga Kirschnick	3e9d749574	Small fix titles	2022-11-18 13:46:52 +01:00
Inga Kirschnick	2ef5063a44	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development ... update breadcrumbs	2022-11-18 13:37:36 +01:00
Inga Kirschnick	3d170487eb	Update breadcrumbs contributions package	2022-11-18 13:36:58 +01:00
Patrick Jentsch	7dbbf9db48	Let everyone upload new models	2022-11-18 13:28:58 +01:00
Inga Kirschnick	f4ec47ad57	Share toggle update & fix	2022-11-17 12:48:19 +01:00
Patrick Jentsch	bbea1553b8	Remove darkmode setting	2022-11-17 10:52:46 +01:00
Patrick Jentsch	527ab5ac0f	better job form handling	2022-11-16 16:05:34 +01:00
Patrick Jentsch	f1677e2931	Fix url issues and remove unused modules	2022-11-16 14:15:52 +01:00
Patrick Jentsch	9d34a5b71b	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development	2022-11-15 15:11:19 +01:00
Patrick Jentsch	cd72614c0f	Contributions update revised	2022-11-15 15:11:16 +01:00
Inga Kirschnick	7bfbe4fd32	Merge branch 'binarization-threshold' into development	2022-11-14 15:53:48 +01:00
Inga Kirschnick	df5ae19e68	Addition pipeline_name in Contribution Package	2022-11-14 15:02:41 +01:00
Inga Kirschnick	9502891536	Merge branch 'development' into binarization-threshold	2022-11-11 15:39:40 +01:00
Inga Kirschnick	79d76f158f	update binarization threshold	2022-11-10 16:19:58 +01:00
Inga Kirschnick	f4f0628b60	Ocropus nlbin threshold extension	2022-11-10 12:14:03 +01:00
Inga Kirschnick	033872718e	Small changes in the contribution package	2022-11-08 14:11:57 +01:00
Inga Kirschnick	05340ea7ff	Contribution Package Spacy NLP	2022-11-07 09:15:38 +01:00
Inga Kirschnick	46ba14b923	Contribution Package Tesseract OCR	2022-11-03 15:38:35 +01:00
Inga Kirschnick	0c809cc75c	Merge branch 'contributors-update' into development	2022-10-26 10:38:25 +02:00
Inga Kirschnick	0b3456f877	Small fixes	2022-10-24 15:01:13 +02:00
Inga Kirschnick	8bee4196d3	URL revision	2022-10-21 09:46:15 +02:00
Inga Kirschnick	0009a0bacf	Query Builder implementation	2022-10-20 15:52:25 +02:00
Inga Kirschnick	20b1a96862	New CSS File	2022-10-13 15:15:53 +02:00
Patrick Jentsch	dc3709decb	Remove the TranskribusHTRPipelineModel and fetch data on request.	2022-10-12 15:10:55 +02:00
Patrick Jentsch	236d3e7ee4	Rename tables for pipeline models	2022-10-12 10:23:05 +02:00
Patrick Jentsch	40348cebe1	Remove version change handling in templates as it is already implemented in CreateJobForm.js	2022-10-04 15:32:31 +02:00
Patrick Jentsch	0e982e0749	Remove QueryBuilder artifacts from merge	2022-10-04 13:24:04 +02:00
dameyer	9802fdd175	Add form and template for adding a model.	2022-10-02 23:49:14 +02:00
Inga Kirschnick	dc86c1e85d	fix wrong url creation	2022-09-20 15:02:44 +02:00
Patrick Jentsch	650a77f055	Remove merge leftover	2022-09-07 15:16:32 +02:00
Patrick Jentsch	7372e538f4	Add querybuilder js file	2022-09-07 14:56:40 +02:00
Inga Kirschnick	7fe183bf2a	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development	2022-09-07 14:53:51 +02:00
Inga Kirschnick	d537a38712	Querybuilder 1.0	2022-09-07 09:06:21 +02:00
Patrick Jentsch	ceef272d06	Add API functionality	2022-09-02 13:24:14 +02:00
Patrick Jentsch	8e1d94bb5d	Restructure project	2022-09-02 13:07:30 +02:00
Inga Kirschnick	9781425602	Query Builder New Design	2022-08-03 16:21:11 +02:00
Inga Kirschnick	4497567de0	Final prototype	2022-08-01 10:00:12 +02:00
Patrick Jentsch	1f3ca9664d	Remove dummy /users route	2022-07-18 17:10:44 +02:00
Patrick Jentsch	29900f3ab1	Update some JS libraries	2022-07-18 17:10:21 +02:00
Inga Kirschnick	5cbc6ea822	Prototype Query Builder for demo only	2022-07-13 14:06:22 +02:00
Patrick Jentsch	42ad6e27e2	Add Contributions Mockup and fix email notifications on job status change	2022-07-11 12:14:01 +02:00
Patrick Jentsch	4e5957eea2	Change the Subscription Logic for Socket.IO Data exchange	2022-07-08 11:46:47 +02:00
Patrick Jentsch	76924956de	Change the user session SocketIO Logic	2022-07-04 14:09:17 +02:00
Patrick Jentsch	b8bf004684	Restructure code and use APScheduler for daemon functionality	2022-06-28 12:30:02 +02:00
Patrick Jentsch	7c52d3f392	Add Hint on how to store your job data	2022-06-14 12:00:22 +02:00
Patrick Jentsch	8136cedccb	Add a manual page	2022-05-17 15:31:05 +02:00
Patrick Jentsch	6b8d4d87bb	Fix a JS error regarding non existent data for query results	2022-05-05 15:11:36 +02:00
Patrick Jentsch	80a18386ee	Fix some display issues on smaller screens for the landing page	2022-05-05 15:11:02 +02:00
Patrick Jentsch	a4e65cac33	Update FAQ	2022-05-05 15:10:44 +02:00
Patrick Jentsch	c7c9fece46	Bump Socket.IO client version	2022-05-05 15:10:28 +02:00
Patrick Jentsch	7b10a6be2e	Add April 2022 update news	2022-04-28 14:35:05 +02:00
Patrick Jentsch	ccdd0d3faa	Integrate TranskribusHTRModels	2022-04-22 15:27:52 +02:00
Patrick Jentsch	9d4001f469	Reimplement corpus import and activate it again	2022-04-19 11:48:44 +02:00
Patrick Jentsch	63217a7e1d	Fix uploading corpus files	2022-04-13 09:08:11 +02:00
Patrick Jentsch	99ddd2e3dd	normalize forms	2022-04-12 16:11:24 +02:00
Patrick Jentsch	ce997e69ea	Rename all services, use scss, cleanup, add sandpaper conversion script	2022-04-04 13:31:09 +02:00
Patrick Jentsch	15e897f005	Delete unused files, restructure assets and use scss	2022-02-15 09:25:34 +01:00
Patrick Jentsch	df6ab3991c	Use enums where appropriate. This commit includes new migrations that are NOT compatible with older nopaque instances	2022-02-08 12:26:20 +01:00
Patrick Jentsch	fe938c0ca2	Big update, corpus analysis reworked, versioned services, preliminary work for contributions	2022-02-03 12:39:16 +01:00
Patrick Jentsch	44f9d0a560	Further codestyle improvements	2021-12-09 15:39:45 +01:00
Patrick Jentsch	40bd169101	Some cleanup (css, html, js)	2021-12-09 12:50:14 +01:00
Patrick Jentsch	3d99b8770c	Codestyle enhancements	2021-12-08 14:45:05 +01:00
Patrick Jentsch	1fd7a2e38c	Add nopaque video to index	2021-12-08 11:51:34 +01:00
Patrick Jentsch	832a0283bd	Some styling for ressource lists	2021-12-08 11:25:52 +01:00
Patrick Jentsch	b3f34648c4	Bug fixes	2021-12-03 16:10:54 +01:00
Patrick Jentsch	3e37cb8582	Fix some navigation issues	2021-12-03 14:56:56 +01:00
Patrick Jentsch	123537cd16	Add new roles and a new permission	2021-12-03 14:07:03 +01:00
Patrick Jentsch	89f518fe38	Sort lists by ressources creation date. CSS and HTML cleanup	2021-12-03 12:01:50 +01:00
Patrick Jentsch	03a57fd7ee	Create a proper class for the upload form	2021-12-02 16:25:48 +01:00
Patrick Jentsch	d8f11a9759	update nopaque forms	2021-12-02 13:48:48 +01:00
Patrick Jentsch	962e58f2d3	Enable auto initialization for ressource lists	2021-12-02 11:16:06 +01:00
Patrick Jentsch	82745629bc	Bug fixes	2021-12-01 16:03:55 +01:00
Patrick Jentsch	12ec6be60b	JS codestyle enhancements	2021-12-01 14:15:20 +01:00
Patrick Jentsch	72ba61f369	Only reveal hashids to the ui	2021-11-30 16:22:16 +01:00
Patrick Jentsch	9308618e63	New faq and service desk	2021-11-18 12:09:15 +01:00
Patrick Jentsch	a2e4fd2df5	Add news regarding current maintenance state	2021-11-16 15:50:07 +01:00
Patrick Jentsch	f6c2292e03	Big Corpus analysis update	2021-11-16 15:23:57 +01:00
Patrick Jentsch	c1436c2a5d	Add model section to template and add API link to sidenav	2021-11-15 14:54:08 +01:00
Patrick Jentsch	70d541690f	Add 503 error handler	2021-11-15 14:36:18 +01:00
Patrick Jentsch	cedce5545d	Fix wrong corpus analysis link in sidenav	2021-08-24 09:21:43 +02:00
Patrick Jentsch	da350474fb	standardize the use of service name handles, e.g. file-setup instead of file_setup	2021-08-04 12:26:49 +02:00
Patrick Jentsch	ec7a88f36e	Simplify color setup in templates	2021-08-04 09:07:18 +02:00
Patrick Jentsch	d6ab379418	Change directory structure (move ./nopaque/* to ./)	2021-07-20 15:07:42 +02:00
Patrick Jentsch	cb2b64fa9d	integrate nopaque repo	2020-06-05 14:42:04 +02:00
Patrick Jentsch	d5569fa65b	flashed messages for unauthenticated users too!	2020-05-27 13:34:55 +02:00
Patrick Jentsch	ba916b70bd	Change location where socket is initialized...again	2020-05-27 13:32:07 +02:00
Patrick Jentsch	ecac2c481c	Only initialize socket when the user is logged in	2020-05-27 11:11:54 +02:00
Patrick Jentsch	d4e81b11e0	Fix foreign user data transmission for admins	2020-05-20 10:32:39 +02:00
Patrick Jentsch	2af6daccf2	switch parallax images so that the code image is displayed when the user is logged in	2020-05-19 14:39:23 +02:00
Patrick Jentsch	b93bcb36f7	update	2020-05-19 14:27:35 +02:00
Patrick Jentsch	ddfa0f47bf	Add new config variable and rename opaque_domain -> nopaque_domain	2020-05-19 14:19:23 +02:00
Patrick Jentsch	94a193f6dd	Add legal notice and gitlab link as button	2020-05-19 10:25:16 +02:00
Patrick Jentsch	3d41b18daf	Jobpage rework	2020-05-13 16:36:06 +02:00
Stephan Porada	cb8f3faae0	Add curren ttoken and max token nr	2020-05-04 12:08:43 +02:00
Stephan Porada	c49684611a	Add more metadata	2020-05-04 11:05:17 +02:00
Stephan Porada	58295b986d	Rename some things. Add metadata to downloadable json	2020-04-30 15:21:55 +02:00
Stephan Porada	1350e6ddd6	Add metadata object on analysis	2020-04-30 14:45:54 +02:00
Patrick Jentsch	f87fe589c1	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-30 11:29:01 +02:00
Patrick Jentsch	e1b07d8719	Handle user data streams different 1/2 ... In the future this will be much more performant!	2020-04-30 11:28:55 +02:00
Stephan Porada	d4318cb205	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-29 16:15:12 +02:00
Stephan Porada	d54a3d3f33	First metadata addition	2020-04-29 16:15:11 +02:00
Patrick Jentsch	4d677244e0	Some styling	2020-04-28 16:33:47 +02:00
Stephan Porada	eb5e5c3253	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-27 16:16:59 +02:00
Stephan Porada	deda16f0f5	Add meta data recv after corpus analysis init	2020-04-27 16:16:57 +02:00
Patrick Jentsch	b30382e605	beauty enhancements	2020-04-27 14:33:49 +02:00
Patrick Jentsch	45a3c664a2	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-27 13:51:07 +02:00
Patrick Jentsch	565274fce1	A lot of database changes and add options to change notification level	2020-04-27 13:50:54 +02:00
Stephan Porada	5dfaf51793	Add download for context data.	2020-04-27 13:25:29 +02:00
Stephan Porada	7cfa3bd022	Change darmode setting	2020-04-27 10:19:20 +02:00
Patrick Jentsch	d520184d1d	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-23 13:41:43 +02:00
Patrick Jentsch	4a7f2dbb24	Add word-break to corpus file list.	2020-04-23 13:41:37 +02:00
Stephan Porada	9e693fc440	Remove &nsbp;	2020-04-23 13:28:13 +02:00
Patrick Jentsch	a4f122bdab	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-23 12:40:04 +02:00
Patrick Jentsch	154631dcb4	Add placeholder to indicate required file types in forms	2020-04-23 12:39:59 +02:00
Stephan Porada	d9353e3d7d	Clean up	2020-04-23 12:07:08 +02:00
Stephan Porada	191f197b6c	clean up	2020-04-23 11:21:20 +02:00
Stephan Porada	7efb16246f	Clean up and better text break in amtch context	2020-04-23 11:18:50 +02:00
Stephan Porada	a1439f37d7	Set callbac kfor match_context	2020-04-23 10:37:44 +02:00
Patrick Jentsch	60cc93a806	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-21 18:34:27 +02:00
Patrick Jentsch	bc27744946	Create and use a decorator for background functions	2020-04-21 18:34:21 +02:00
Stephan Porada	ddc7859002	Some visual stuff	2020-04-21 10:31:34 +02:00
Stephan Porada	b4c98a9713	Last fix	2020-04-20 13:59:28 +02:00
Stephan Porada	f7dc83f51d	Disable export in inspect modal	2020-04-20 13:49:59 +02:00
Patrick Jentsch	8a9db7f4b8	Add validation flag if field is required.	2020-04-20 11:12:20 +02:00
Stephan Porada	2eb3d2f03e	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-20 09:59:34 +02:00
Patrick Jentsch	188aeae88f	Fix wrong macro usage.	2020-04-17 19:50:21 +02:00
Patrick Jentsch	b9ebb64fcc	Change macro names	2020-04-17 11:13:11 +02:00
Patrick Jentsch	1f0a87a474	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-17 11:07:47 +02:00
Patrick Jentsch	3aafe664a3	Add macros and use them	2020-04-17 11:04:09 +02:00