6610 commits

Author	SHA1	Message	Date
aignatov-bio	80d6e5e87c	Add project folders to team import/export	2020-11-13 14:13:26 +01:00
Urban Rotnik	0f5bf45cf6	Rebase, add toolbar, minor fixes css and JS	2020-11-06 13:56:21 +01:00
Urban Rotnik	9f12c5f343	New cards and list layout	2020-11-06 13:01:52 +01:00
Oleksii Kriuchykhin	327baafcd7	Improve CSS structure for project toolbar [SCI-5129]	2020-11-04 16:10:40 +01:00
Oleksii Kriuchykhin	258c57870f	Implement the toolbar on the Team Projects page [SCI-5129]	2020-11-02 13:28:37 +01:00
Alex Kriuchykhin	8566d56b68	Merge pull request #2928 from okriuchykhin/ok_SCI_5126 ... Create database structure for project folders [SCI-5126]	2020-11-02 11:46:15 +01:00
Urban Rotnik	042231469c	Fix syntax	2020-10-30 13:37:59 +01:00
Oleksii Kriuchykhin	e87407bbd3	Create database structure for project folders [SCI-5126]	2020-10-29 15:44:21 +01:00
Urban Rotnik	b94a3a6cb8	Clean up controller	2020-10-26 16:17:39 +01:00
Urban Rotnik	1ffc3449bf	Clean up index view	2020-10-26 13:42:32 +01:00
Urban Rotnik	b23f110184	Merge pull request #2905 from urbanrotnik/ur-sci-5085-active-filters ... Add mark for active filters [SCI-5085]	2020-10-25 16:06:59 +01:00
Urban Rotnik	c5a1d34c36	Merge pull request #1967 from jbargu/jg_sci_2228 ... [SCI-2228] Remove samples, sample types, sample groups, custom sample columns from the codebase	2020-10-23 15:33:22 +02:00
Urban Rotnik	75351a3aed	px to em	2020-10-23 14:11:56 +02:00
Urban Rotnik	6ccd34291d	Merge pull request #2904 from urbanrotnik/ur-sci-5093 ... Fix smart annotation in checklist title [SCI-5093]	2020-10-23 13:36:22 +02:00
Urban Rotnik	aa1520bfb8	Merge branch 'develop' into jg_sci_2228	2020-10-22 14:21:39 +02:00
Urban Rotnik	2f99e3a464	Remove border, update copy	2020-10-21 09:58:35 +02:00
Urban Rotnik	e7d2d78935	Add mark for active filters	2020-10-20 16:45:54 +02:00
Urban Rotnik	a728ba2f2d	Fix smart annotation in checklist title	2020-10-20 13:02:49 +02:00
Urban Rotnik	e1e7496307	Merge pull request #2884 from urbanrotnik/ur-sci-5043 ... DOCX lists [SCI-5043]	2020-10-15 11:53:58 +02:00
Urban Rotnik	e748e1eff3	Fix smart annotations and links styling	2020-10-14 17:58:07 +02:00
mlorb	83ba40d135	Merge pull request #2870 from mlorb/ml-sci-4841 ... Fix at long inventory name snapshot in title is not visible [SCI-4841]	2020-10-14 14:38:04 +02:00
Mojca Lorber	5013f224ee	Fix ems	2020-10-14 13:16:38 +02:00
Urban Rotnik	a19e0ef846	Refactor	2020-10-13 14:23:39 +02:00
Urban Rotnik	1b860afe30	Move TinyMCE parser to separate class	2020-10-13 09:45:13 +02:00
Urban Rotnik	ae8b2cbf8f	Add text to I18n	2020-10-13 08:37:32 +02:00
Mojca Lorber	a944525d25	Change px to em	2020-10-12 16:59:33 +02:00
Mojca Lorber	cf367baefa	Merge branch 'develop' into ml-sci-4841	2020-10-12 14:43:03 +02:00
Oleksii Kriuchykhin	caa2098550	Improve handling of empty cells in inventory imports [SCI-5094]	2020-10-12 14:42:47 +02:00
Urban Rotnik	274293348e	Clean up	2020-10-09 09:53:27 +02:00
Urban Rotnik	dfca798e2d	Refactored tiny_mce_table parser and renderer	2020-10-09 09:43:36 +02:00
Urban Rotnik	92b4d95c72	Implement lists in DOCX	2020-10-09 09:43:00 +02:00
Oleksii Kriuchykhin	7cd12bfb07	Fix protocol repository save/load timestamps [SCI-5067]	2020-10-06 15:30:04 +02:00
Miha Mencin	3a4a166856	Merge pull request #2888 from okriuchykhin/ok_SCI_5082 ... Fix index page for users without a team [SCI-5082]	2020-10-05 10:16:04 +02:00
Oleksii Kriuchykhin	dd64206b25	Fix index page for users without a team [SCI-5082]	2020-10-02 16:57:46 +02:00
Oleksii Kriuchykhin	6c367428a1	Fix team switcher [SCI-5080]	2020-10-02 14:25:44 +02:00
Oleksii Kriuchykhin	aeba25cf09	Fix Hound warning	2020-10-01 11:56:33 +02:00
Oleksii Kriuchykhin	21fab4198c	Merge branch 'develop' into features/local	2020-10-01 11:52:59 +02:00
aignatov-bio	9010f9c1db	Merge pull request #2876 from aignatov-bio/ai-sci-5066-fix-switch-team ... Fix switch team on link for object from other team [SCI-5066]	2020-09-30 10:09:19 +02:00
Urban Rotnik	e9ac999645	Merge pull request #2880 from urbanrotnik/ur-sci-5067-protocols-sync ... Fix updating updated_at on protocol while load/sync with repository [SCI-5067]	2020-09-29 16:54:42 +02:00
Urban Rotnik	7c312a844f	Fix updating updated_at on protocol while load/sync with repository	2020-09-29 15:37:40 +02:00
aignatov-bio	d21aee1843	Remove complete step button from protocol managment	2020-09-29 15:08:01 +02:00
Alex Kriuchykhin	939c0096de	Merge pull request #2881 from biosistemika/features/yomu ... Switch to a new version of Yomu gem	2020-09-29 14:41:36 +02:00
Oleksii Kriuchykhin	1603ec6d1a	Switch to a new version of Yomu gem	2020-09-29 13:11:50 +02:00
Oleksii Kriuchykhin	25a9f5c685	Add typeface-lato for shipping Lato fonts	2020-09-28 18:02:47 +02:00
aignatov-bio	16fe11f0f7	Fix smitch team on link for object from other team	2020-09-28 17:16:18 +02:00
aignatov-bio	7c3a3e4490	Small smart annotation fixes	2020-09-28 12:03:01 +02:00
Alex Kriuchykhin	fb28fa557b	Merge pull request #2872 from okriuchykhin/ok_SCI_5062 ... Improve performance of fetching of statuses [SCI-5062]	2020-09-25 15:00:30 +02:00
Alex Kriuchykhin	3eb448c39b	Merge pull request #2862 from okriuchykhin/ok_SCI_5001 ... Add Endpoins for Project Membership manipulation [SCI-5001]	2020-09-25 14:25:20 +02:00
Oleksii Kriuchykhin	134e549ed5	Improve performance of fetching of statuses [SCI-5062]	2020-09-25 10:14:57 +02:00
Urban Rotnik	f4f0bc706a	Fix step deletion	2020-09-25 08:43:03 +02:00