5054 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zanz2	601335a807	Fixed non .js errors hound	2018-08-21 12:08:14 +02:00
Zanz2	0ed62b7375	refactored according to PR review	2018-08-21 11:35:22 +02:00
Zanz2	817d09ad5f	fixed hound	2018-08-21 11:29:38 +02:00
Zanz2	2d1d4c78bc	Merge branch 'master' into zz_in_app_tooltips_help_sci2662	2018-08-21 11:27:01 +02:00
Zanz2	36cca3d6aa	Implemented popover tooltips in all specified places, and fixed a bug where old popovers were open on page switch with ajax	2018-08-21 11:11:25 +02:00
Zanz2	880582de25	Added just a data attribute, so i dont have to add it on other branch	2018-08-21 09:59:49 +02:00
Zanz2	9a482eab2e	Checkbox now gets styled properly and defaults to true	2018-08-21 09:02:54 +02:00
Zanz2	beb1d02914	Made fiew part for toggler, now debugging why checkbox doenst render properly and why it defaults to false always	2018-08-20 15:57:09 +02:00
Oleksii Kriuchykhin	62d99a4372	Fix report elements sorting [SCI-2654]	2018-08-20 14:46:23 +02:00
Oleksii Kriuchykhin	3a5238f6f3	Fix error on activities page when user doesn't have any [SCI-2628]	2018-08-20 14:26:42 +02:00
Zanz2	91f112dc38	Saving minor changes, deleted comments, stuck at drag n drop	2018-08-20 13:45:43 +02:00
Oleksii Kriuchykhin	6795b08a91	Refactor invite users modal initialization [SCI-2651]	2018-08-20 13:13:34 +02:00
Zanz2	1159a32ce2	Implemented all except 2 tooltips, debbugging why they dont work now	2018-08-20 13:03:30 +02:00
Oleksii Kriuchykhin	1a57289009	Improve health check endpoint [SCI-2604]	2018-08-17 16:13:21 +02:00
Zanz2	8c492e1491	started implementing tooltips, and upgraded behaviour, also trying to fix some bugs with data content attribute	2018-08-17 16:03:49 +02:00
Oleksii Kriuchykhin	8df6ebb5f2	Remove test for old api token endpoint [SCI-2515]	2018-08-17 14:14:18 +02:00
Oleksii Kriuchykhin	ecde634a2c	Add OAuth2 provider [SCI-2515]	2018-08-17 13:17:59 +02:00
Zanz2	e1cadfc75e	saving work, removed testing buttons	2018-08-17 11:52:10 +02:00
Zanz2	637c7dfb19	modified styling and behaviour of popovers (tooltips) also made relevant text changes, except for last one in epic	2018-08-17 11:33:44 +02:00
Alex Kriuchykhin	422baaf64a	Merge pull request #1258 from okriuchykhin/ok_SCI_2619 ... Add team deletion service [SCI-2619]	2018-08-17 10:56:11 +02:00
Zanz2	a09834db6a	testing, made new popover designs	2018-08-16 16:10:19 +02:00
Zanz2	d2373980d4	Testing out new popover	2018-08-16 15:07:59 +02:00
Zanz2	9fd02e71c9	initial popover/tooltip config	2018-08-16 13:04:42 +02:00
Zanz2	dfcaa40f1a	Merge branch 'master' into zz_refactor_icons_sci_2445_v2	2018-08-14 13:33:43 +02:00
Zanz2	45a4c1c598	changed the icons as per last comment in jira issue	2018-08-14 13:26:48 +02:00
Oleksii Kriuchykhin	3f7590bb57	Rename type for inventories and add mimetype for JSON API [SCI-2614][SCI-2616][SCI-2617]	2018-08-10 17:01:14 +02:00
Oleksii Kriuchykhin	ca6fc84ae2	Remove duplicated task outputs deletion [SCI-2619]	2018-08-10 16:43:40 +02:00
Zanz2	27e0d27862	Merge pull request #1248 from Zanz2/zz_checklist_duplicates_bug_sci_1621 ... Fixes duplicate checkbox entries in activity log [SCI-1621]	2018-08-09 11:50:34 +02:00
Zanz2	2bc7d8a9bd	Merge pull request #1249 from Zanz2/zz_protocols_edit_rtf_form_bug_sci2305_v2 ... Fixes tinymce rtf editor not displaying (updated gem) [SCI-2305]	2018-08-09 11:49:59 +02:00
Zanz2	2608561560	Merge branch 'master' into zz_protocols_edit_rtf_form_bug_sci2305_v2	2018-08-09 11:38:15 +02:00
Zanz2	1de9e4b360	changed version	2018-08-09 11:35:50 +02:00
Oleksii Kriuchykhin	ef7e0ac489	Add GET inventory columns API endpoint [SCI-2615]	2018-08-08 17:31:37 +02:00
Oleksii Kriuchykhin	5efcacbf3d	Rename type for rows and cells serializers [SCI-2614][SCI-2616][SCI-2617]	2018-08-08 17:15:08 +02:00
Oleksii Kriuchykhin	6c59e1e159	Fix failing tests [SCI-2614][SCI-2616][SCI-2617]	2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin	4df9a4c9ca	Fix code style warnings [SCI-2614][SCI-2616][SCI-2617]	2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin	8d11e03d47	Add read inventories and inventory items endpoints [SCI-2614][SCI-2616][SCI-2617]	2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin	938ec5acb8	Change primary key to bigint on repositories [SCI-2614][SCI-2616][SCI-2617]	2018-08-08 17:01:49 +02:00
Alex Kriuchykhin	6004f8411b	Merge pull request #1260 from okriuchykhin/ok_SCI_2611 ... Add GET teams and team API endpoints [SCI-2611][SCI-2612]	2018-08-08 16:59:42 +02:00
Oleksii Kriuchykhin	dc2411c5ed	Fix Hound warnings [SCI-2611][SCI-2612]	2018-08-08 16:27:43 +02:00
mlorb	30091da94f	Merge pull request #1263 from mlorb/ml-sci-2652 ... fix time zone selector [SCI-2652]	2018-08-08 15:00:11 +02:00
mlorb	a6dd577b4e	fix time zone selector	2018-08-08 11:43:18 +02:00
Oleksii Kriuchykhin	298b866df4	Fix failing tests [SCI-2611][SCI-2612]	2018-08-07 14:58:02 +02:00
mlorb	f52ccfd606	fix editing of inventory items of hidden columns	2018-08-07 11:47:26 +02:00
okriuchykhin	29f0f2afeb	Merge pull request #1257 from okriuchykhin/ok_SCI_2609 ... Refactor tasks tree API endpoint [SCI-2609]	2018-08-02 17:10:55 +02:00
okriuchykhin	bb5d029c30	Merge pull request #1251 from okriuchykhin/ok_SCI_2253 ... Upgrade to Turbolinks 5 [SCI-2253]	2018-08-02 14:43:19 +02:00
Oleksii Kriuchykhin	8f5d30ad1f	Fix load protocol modal [SCI-2253]	2018-08-02 14:35:19 +02:00
okriuchykhin	3503eb775b	Merge pull request #1254 from okriuchykhin/ok_SCI_2601 ... Fix files search results display [SCI-2601]	2018-08-02 11:53:02 +02:00
okriuchykhin	dd9090efef	Merge pull request #1253 from okriuchykhin/ok_SCI_2608 ... Adds API authentication with Azure AD [SCI-2608]	2018-08-02 11:28:18 +02:00
Oleksii Kriuchykhin	38c36ab798	Fix modals handling with Turbolinks [SCI-2253]	2018-08-02 11:25:14 +02:00
okriuchykhin	6c49ecfd4c	Merge pull request #1250 from okriuchykhin/team_migration_fix ... Fix team import service	2018-08-01 15:01:43 +02:00