156 commits

Author	SHA1	Message	Date
Andrej	79118effa7	Merge branch 'develop' into features/october-release	2023-10-10 11:09:04 +02:00
wandji20	dd34e72fb9	Add helper method to show grey layout background [SCI-9406]	2023-10-03 12:48:31 +01:00
Andrej	835cfb5e07	Refactor export stock consumption modal [SCI-9386]	2023-10-03 09:27:10 +02:00
Oleksii Kriuchykhin	d69b7cc6e8	Merge branch 'develop' into features/october-release	2023-09-26 11:11:30 +02:00
Anton	40144ea33f	Update protocol template screen [SCI-9319]	2023-09-21 10:37:58 +02:00
Oleksii Kriuchykhin	3b170a0c0d	Connect backend to the new item card [SCI-9313]	2023-09-18 16:42:01 +02:00
Oleksii Kriuchykhin	36f4e22fa3	Merge branch 'develop' into features/october-release	2023-09-15 14:08:45 +02:00
wandji20	0b0eddd62b	Add default columns to inventory item card [SCI-9151]	2023-09-15 11:39:42 +01:00
Anton	af0fbfeec0	Merge branch 'develop' into features/september-release	2023-09-14 13:45:40 +02:00
Gregor Lasnibat	6709d5ee73	Finished v.01 of inventory item card (RepositoryItemSidebar) [SCI-9091]	2023-09-13 08:34:07 +02:00
Martin Artnik	3724a4a067	Merge branch 'develop' into features/september-release	2023-09-01 10:30:48 +02:00
Andrej	29cddf5ef7	Merge branch 'develop' into features/ove-integration	2023-08-22 11:00:34 +02:00
Anton	0161277380	Fix bootstrap in report [SCI-9085]	2023-08-21 15:26:58 +02:00
Anton	2d64d2fcbf	Merge branch 'develop' into features/september-release	2023-08-21 11:25:27 +02:00
artoscinote	20c20012b2	Merge pull request #5863 from ivanscinote/SCI-8807-notifications ... Remove system notifications [SCI-8807]	2023-08-18 10:28:05 +02:00
Alex Kriuchykhin	145b834e8a	Merge pull request #5935 from ivanscinote/SCI-8800-projects-table-double-load ... Add turbolinks-cache-control to no-preview [SCI-8800]	2023-08-16 11:06:16 +02:00
Martin Artnik	8d31c5eb3b	Merge branch 'develop' into features/ove-integration	2023-08-16 10:41:26 +02:00
Alex Kriuchykhin	a4ea995027	Revert to using intermediate jquery_bundle file [SCI-9031] (#5962)	2023-08-10 17:19:28 +02:00
Alex Kriuchykhin	c6a545d8b3	Fix Turbolinks redirects with ajax requests, add JQuery migration library [SCI-9031] (#5961)	2023-08-10 16:25:04 +02:00
Anton	ac37885885	Merge branch 'develop' into features/september-release	2023-08-10 15:01:58 +02:00
aignatov-bio	acab34679d	Merge pull request #5960 from aignatov-bio/ai-test-jquery-pr ... Restore bootstrap overrides	2023-08-10 14:43:12 +02:00
Anton	3c0ccc730f	Restore bootstrap overrides	2023-08-10 14:36:06 +02:00
Martin Artnik	16dbd48ad3	Merge branch 'develop' into features/september-release	2023-08-10 13:21:27 +02:00
ajugo	2ddb43c2ea	Merge pull request #5850 from sboursen-scinote/sb_SCI-8842 ... Update illustrations [SCI-8842]	2023-08-10 10:53:41 +02:00
sboursen-scinote	d97035988a	Move images to public folder [SCI-8842]	2023-08-10 10:33:35 +02:00
Martin Artnik	a952319afd	Merge branch 'develop' into features/september-release	2023-08-09 16:43:15 +02:00
Anton	2da83f460f	Test moving jquery	2023-08-09 14:43:17 +02:00
Anton	f688995635	Refactor task page UX [SCI-8951]	2023-08-09 11:03:30 +02:00
Ivan Kljun	5d92987779	Add turbolinks-cache-control to no-preview and thus eliminating double js loading on turbolinks [SCI-8800]	2023-08-08 14:21:26 +02:00
Anton	7961bee35f	Merge branch 'develop' into features/september-release	2023-08-07 14:11:29 +02:00
Anton	89c526103d	Merge branch 'develop' into features/remove-front-end-gems	2023-08-07 11:23:21 +02:00
Anton	937bc60542	Merge branch 'features/september-release' of github.com:scinote-eln/scinote-web into features/september-release	2023-08-07 10:37:20 +02:00
Martin Artnik	76a0f433cd	Basic OVE editor implementation [SCI-8929]	2023-08-02 14:13:04 +02:00
Soufiane	382a4e57ac	Load external services asynchronously [SCI-8937] (#5900)	2023-08-02 11:17:34 +02:00
Ivan Kljun	18fb319351	Drop system notifications tables and remove logic	2023-07-25 14:48:03 +02:00
sboursen-scinote	e0fa6c0a0f	Update illustrations [SCI-8842]	2023-07-25 09:19:02 +02:00
Martin Artnik	5cc087835a	Merge branch 'develop' into features/august-release	2023-07-19 11:21:24 +02:00
Giga Chubinidze	4025a4a497	changed tw class	2023-07-19 11:10:08 +02:00
Anton	85f14a6bb0	Merge branch 'features/remove-front-end-gems' of github.com:scinote-eln/scinote-web into features/remove-front-end-gems	2023-07-18 14:38:25 +02:00
Anton	1087f67228	Merge branch 'develop' into features/remove-front-end-gems	2023-07-18 14:36:40 +02:00
Oleksii Kriuchykhin	fca9aea4a8	Merge branch 'features/rails-upgrade' into develop	2023-07-13 13:10:59 +02:00
Anton	2daa9126d1	Small fixes for css bundling [SCI-8773]	2023-07-07 11:44:42 +02:00
Anton	f071e482d8	Migrate to css bundling [SCI-8773]	2023-07-06 13:26:41 +02:00
Soufiane	ea6a714dac	Disallow scripts loading over https [SCI-8634] (#5713) ... Co-authored-by: Sboursen <dev.sboursen@gmail.com>	2023-07-05 13:19:16 +02:00
Anton	9a5abfabf7	Move js gems to packages [SCI-8772]	2023-07-05 12:03:44 +02:00
Martin Artnik	9364d139e0	Make label print modal work globally [SCI-8506]	2023-06-22 14:52:47 +02:00
Oleksii Kriuchykhin	66b361c689	Upgrade Rails to version 7.0.5 [SCI-8632]	2023-06-21 14:38:32 +02:00
aignatov-bio	45764498ed	Merge pull request #5612 from sboursen-scinote/sb_SCI-8641 ... Stretched image on the empty dashboard screen [SCI-8641]	2023-06-16 12:39:58 +02:00
Alex Kriuchykhin	2df9367b01	Remove old JS code, unneeded JS include nonce [SCI-8670] (#5607)	2023-06-16 10:19:54 +02:00
sboursen-scinote	a1b62b22b1	Fix image size and position in no-teams-jumbotron [SCI-8641] ... Co-authored-by: Sboursen <dev.sboursen@gmail.com>	2023-06-16 08:39:26 +02:00