2766 commits

Author	SHA1	Message	Date
Urban Rotnik	7c14da70d9	Merge branch 'features/task-flows' into develop_to_task_flows	2020-08-04 14:50:46 +02:00
Urban Rotnik	cce76f6f0f	Merge pull request #2763 from aignatov-bio/ai-sci-4895-add-sorting-to-reults ... Add ordering for result page [SCI-4895]	2020-08-04 11:17:43 +02:00
Alex Kriuchykhin	a9bc5b664a	Merge pull request #2750 from aignatov-bio/ai-sci-4835-add-status-flow-modal ... Add modal for status flow [SCI-4835]	2020-08-04 09:47:40 +02:00
Alex Kriuchykhin	22015beeb5	Merge pull request #2757 from urbanrotnik/ur-sci-4813-base64-multipart-upload ... Extend asset API upload to support base64 [SCI-4813]	2020-08-04 09:43:01 +02:00
Urban Rotnik	9b06510dcc	Update PUT result file endpoint, refactor	2020-08-03 15:14:58 +02:00
Urban Rotnik	aaae33e603	Merge pull request #2764 from aignatov-bio/ai-sci-4766-add-start-date-filter-to-dashboard ... Add start date to current task dashboard filter [SCI-4766]	2020-08-03 11:56:24 +02:00
Urban Rotnik	ac3c06d882	Merge pull request #2741 from aignatov-bio/ai-sci-4748-add-export-for-assinged-items ... Add export for assigned items [SCI-4748]	2020-08-03 11:30:31 +02:00
aignatov-bio	536367362c	Add statuses to dashboard filters	2020-07-31 10:59:10 +02:00
aignatov-bio	2f5231e832	Add start date to current task dashboard filter	2020-07-29 16:09:23 +02:00
aignatov-bio	15b5f9bb68	Add ordering for result page	2020-07-28 15:39:29 +02:00
aignatov-bio	68fc6ec58a	Add sorting my module statuses	2020-07-27 16:36:21 +02:00
aignatov-bio	9f7efe6068	Add backend for status flow show	2020-07-27 13:48:21 +02:00
aignatov-bio	6bd12e0397	Add modal for status flow	2020-07-27 13:48:21 +02:00
Oleksii Kriuchykhin	1a8333612a	Merge branch 'features/pwa' into develop	2020-07-27 09:47:41 +02:00
Oleksii Kriuchykhin	7bedbd3511	Fix canvas update method [SCI-4817]	2020-07-24 18:38:53 +02:00
Oleksii Kriuchykhin	94588e4698	Refactor task archive and move permissions [SCI-4817]	2020-07-24 17:00:42 +02:00
Urban Rotnik	4958139699	Extend asset API upload to support base64	2020-07-24 14:57:03 +02:00
Urban Rotnik	025378cd0e	Fix translations and JS	2020-07-23 15:53:46 +02:00
Alex Kriuchykhin	26cfa001c8	Merge pull request #2747 from urbanrotnik/ur-sci-4769-canvas-test ... Add test for canvas_controller [SCI-4769]	2020-07-23 15:18:01 +02:00
Alex Kriuchykhin	d4408f6af7	Merge pull request #2738 from aignatov-bio/ai-sci-4732-add-pagination-to-results ... Add pagination to results page [SCI-4732]	2020-07-23 14:45:10 +02:00
aignatov-bio	04a6a2a250	Small fixes	2020-07-23 11:35:22 +02:00
Alex Kriuchykhin	cb9fe04584	Merge pull request #2745 from aignatov-bio/ai-sci-4785-fix-inventories-activity-filters ... Fix global activities filters [SCI-4785]	2020-07-23 10:09:36 +02:00
Urban Rotnik	512d6f3229	Add actions for update status, clean old complete actions	2020-07-22 16:12:34 +02:00
aignatov-bio	005bfb2ba7	Fix merge conflicts	2020-07-22 12:37:18 +02:00
aignatov-bio	ddfe8231d8	Merge branch 'features/2fa' into develop	2020-07-22 11:56:36 +02:00
Urban Rotnik	3232b4d6bf	Add test for canvas_controller	2020-07-21 13:49:59 +02:00
aignatov-bio	75930b99c3	Fix global activities filters	2020-07-20 15:01:00 +02:00
aignatov-bio	e69e3ea8d3	Add export for assigned items	2020-07-17 15:17:09 +02:00
aignatov-bio	7c4bfad09b	Add pagination to results page	2020-07-16 15:47:19 +02:00
aignatov-bio	c592954400	Add UX	2020-07-13 16:05:23 +02:00
aignatov-bio	7d20bf6fea	Add recovery screen	2020-07-13 09:51:04 +02:00
Oleksii Kriuchykhin	b4fab62d38	Merge branch 'develop' into ok_SCI_4776	2020-07-10 13:40:46 +02:00
aignatov-bio	fef6e5f1db	Add recovery strategy for 2fa	2020-07-09 17:01:00 +02:00
Urban Rotnik	721f3accbe	Merge pull request #2694 from urbanrotnik/ur-sci-4790 ... Show assigned users modal also for view only [SCI-4790]	2020-07-09 16:12:20 +02:00
Urban Rotnik	d2415c3b1d	Show assigned users modal also for view	2020-07-09 15:11:53 +02:00
Urban Rotnik	d8d0f7ef8e	Fix counter in assign dropdown menu on task	2020-07-09 14:50:37 +02:00
Urban Rotnik	b11f166c38	Fix cucumber tests	2020-07-09 13:14:07 +02:00
aignatov-bio	6245e19069	Merge pull request #2718 from biosistemika/master ... Merge master to develop	2020-07-09 12:56:31 +02:00
Urban Rotnik	950f65b90e	Merge pull request #2715 from urbanrotnik/ur-sci-4771-improve-report-layout ... Improve report layout [SCI-4771]	2020-07-09 11:48:33 +02:00
mlorb	efbef2c876	Merge pull request #2384 from mlorb/ml-sci-4261 ... Clean up controllers for manage repository columns [SCI-4261]	2020-07-09 09:18:23 +02:00
Mojca Lorber	de9df7f1b0	Add NotImplementedError	2020-07-08 13:28:12 +02:00
Urban Rotnik	d6f37ce28e	Merge pull request #2710 from urbanrotnik/ur-sci-4568-remove-flash-message ... Remove flash message for redirects from root url [SCI-4568]	2020-07-08 11:42:05 +02:00
Urban Rotnik	5d067077b1	Add logo and timestamp to PDF and Doc reports	2020-07-08 10:48:29 +02:00
aignatov-bio	be3a1994f8	Add basic UX to 2FA	2020-07-07 13:09:48 +02:00
aignatov-bio	13f7653667	Merge branch 'develop' into features/2fa	2020-07-07 13:05:45 +02:00
Urban Rotnik	ceddfdd978	Remove flash message for redirects from root url	2020-07-07 11:13:36 +02:00
Oleksii Kriuchykhin	aa38d92982	Improve completed_on generation for steps/my_modules [SCI-4776]	2020-07-07 09:34:51 +02:00
aignatov-bio	b127d8c754	Improve active/archive switcher	2020-07-06 14:03:55 +02:00
Oleksii Kriuchykhin	dc481cf236	Add API endpoints for checklists, checklist items, tables, API code improvements [SCI-4776]	2020-07-03 16:48:29 +02:00
aignatov-bio	9b33cbc104	Rename ensure 2fa method	2020-07-02 11:24:33 +02:00
aignatov-bio	46256c89c9	Fix tests	2020-07-01 15:44:52 +02:00
aignatov-bio	742fb0d27b	Small 2fa improvments	2020-07-01 14:41:55 +02:00
aignatov-bio	4b9881e31e	Add 2fa to user settings page	2020-07-01 13:25:06 +02:00
Urban Rotnik	62a4a5f203	Add 2fa login	2020-07-01 12:46:26 +02:00
Mojca Lorber	22b71bc9cb	Merge branch 'develop' into ml-sci-4261	2020-06-30 13:47:32 +02:00
Mojca Lorber	cf9c3be4cf	Move before actions in RepositoryColumnsController	2020-06-30 13:44:49 +02:00
aignatov-bio	1c34762af3	Merge pull request #2690 from aignatov-bio/ai-sci-4791-fix-shared-inventories-in-task-repositories-dropdown ... Fix repositories dropdown on task page [SCI-4791]	2020-06-29 09:51:51 +02:00
Alex Kriuchykhin	faa76a6442	Merge pull request #2660 from okriuchykhin/ok_SCI_4707_v2 ... Improve user input filtering on user settings page and for task tags [SCI-4707]	2020-06-29 09:30:45 +02:00
aignatov-bio	968963c24b	Fix repositories dropdown on task page	2020-06-26 11:19:40 +02:00
Oleksii Kriuchykhin	7ea577d8d4	Merge branch 'features/inventory-archiving' into develop	2020-06-24 14:04:54 +02:00
Alex Kriuchykhin	2a315ac106	Merge pull request #2681 from biosistemika/SCI-4780-replace-delete-button ... SCI-4780 replace delete button with archive button	2020-06-24 13:16:11 +02:00
Alex Kriuchykhin	e1b862a332	Merge pull request #2679 from urbanrotnik/ur-sci-4741-api-endopints-update ... Filter out non active repositories and rows [SCI-4741]	2020-06-24 12:51:13 +02:00
Alex Kriuchykhin	8a17b721db	Merge pull request #2678 from urbanrotnik/ur-sci-4878 ... Update all rows on repository archive/restore [SCI-4787]	2020-06-24 12:06:41 +02:00
Oleksii Kriuchykhin	8e0ed286fb	Improve repositories loading for archive/restore [SCI-4780]	2020-06-24 12:01:38 +02:00
Urban Rotnik	2f4bf95373	Revert scrope	2020-06-24 11:42:59 +02:00
Oleksii Kriuchykhin	29f62419bd	Improve repository archive/restore actions [SCI-4780]	2020-06-24 11:32:20 +02:00
aignatov-bio	5fc3146174	Update my module repositories dropdown list	2020-06-24 11:23:17 +02:00
miha	41bb825f33	SCI-4780 Added archive and restore items to repository actions dropdown, minor refactoring of controller	2020-06-23 22:59:21 +02:00
Urban Rotnik	c565cbe579	Filter out non active repositories and rows	2020-06-23 10:23:22 +02:00
Urban Rotnik	30de400cf9	Merge pull request #2676 from mlorb/ml-sci-4786 ... Revert default_scope for active repositories [SCI-4786]	2020-06-22 16:17:39 +02:00
Mojca Lorber	be19190ff1	Revert default_scope for active repositories	2020-06-22 14:57:35 +02:00
aignatov-bio	6f2d5b359e	Add action buttons to repository index	2020-06-19 15:54:45 +02:00
Mojca Lorber	3d59bbd50e	Fix default scope bugs	2020-06-18 18:08:53 +02:00
Mojca Lorber	6e8062179c	Implement archiving and restoring of whole inventories	2020-06-18 18:07:23 +02:00
aignatov-bio	e7659da0e7	Fix tests	2020-06-18 14:09:29 +02:00
aignatov-bio	323929b270	Add restore/delete buttons	2020-06-18 14:09:29 +02:00
Urban Rotnik	123375f494	Update scopes in reports	2020-06-18 09:33:12 +02:00
Urban Rotnik	41c1230db1	Remove position check from contorller	2020-06-17 11:55:43 +02:00
Urban Rotnik	83bd8c3ad4	Add default scope for non archived repositories	2020-06-16 09:18:22 +02:00
Oleksii Kriuchykhin	0641ad094f	Improve user input filtering on user settings page and for task tags [SCI-4707]	2020-06-15 15:41:06 +02:00
Urban Rotnik	39eb8145c2	Rename params method	2020-06-11 16:11:23 +02:00
Urban Rotnik	c7d6c4d60e	Add repository_rows restoring and archiving actions on FE	2020-06-09 22:16:55 +02:00
Urban Rotnik	fabfd7ddaf	Add controller action for Archive&Restore	2020-06-09 19:18:30 +02:00
aignatov-bio	4a6d7d0e12	Add archived inventories	2020-06-04 19:07:10 +02:00
aignatov-bio	66a77d8de9	Add sidebar reload on view change	2020-06-04 18:41:45 +02:00
Oleksii Kriuchykhin	48865c8cea	Clear the obsolete code for assiging inventory items to the task [SCI-4571]	2020-06-03 22:54:45 +02:00
Miha Mencin	d89dce9f72	Merge pull request #2632 from okriuchykhin/ok_SCI_4715 ... Remove inventory links of unshared inventory [SCI-4715]	2020-06-02 10:46:33 +02:00
Oleksii Kriuchykhin	6afebdc5da	Remove inventory links of unshared inventory [SCI-4715]	2020-06-01 17:50:31 +02:00
mlorb	26bdabb0c3	Merge pull request #2609 from mlorb/ml-sci-4529 ... Add rename task and rename experiment activities [SCI-4529]	2020-06-01 12:58:36 +02:00
aignatov-bio	4d6282510d	Merge pull request #2629 from aignatov-bio/ai-sci-4599-fix-ordering-for-projects-in-sidebar ... Fixed projects ordering in sidebar on team page [SCI-4599]	2020-06-01 11:19:29 +02:00
aignatov-bio	2269299b61	Fixed projects ordering in sidebar on team page	2020-06-01 10:55:23 +02:00
aignatov-bio	aee75a2f83	Add repository list view	2020-06-01 10:24:03 +02:00
Alex Kriuchykhin	c6291ef09e	Merge pull request #2623 from aignatov-bio/ai-sci-4709-filter-assigned-private-tasks ... Filter private assigned tasks [SCI-4709]	2020-05-29 18:19:42 +02:00
Alex Kriuchykhin	26449fdfe2	Merge pull request #2625 from okriuchykhin/ok_SCI_4712 ... Fix assigned repositories list and snapshot creation for shared repositories [SCI-4712]	2020-05-29 09:52:08 +02:00
Oleksii Kriuchykhin	8027cc6a49	Fix assigned repositories list and snapshot creation for shared repositories [SCI-4712]	2020-05-28 16:15:05 +02:00
aignatov-bio	116747f261	Filter private assigned tasks	2020-05-28 15:35:19 +02:00
aignatov-bio	34eaf4a138	Merge pull request #2618 from aignatov-bio/ai-sci-4599-order-elements-in-sidebar ... Add name order for porject/experiment/task sidebar [SCI-4599]	2020-05-28 14:23:53 +02:00
Mojca Lorber	285280827a	Refactor repository column base controller	2020-05-28 12:18:46 +02:00
Mojca Lorber	c673e27109	Merge branch 'develop' into ml-sci-4261	2020-05-28 08:18:24 +02:00
Oleksii Kriuchykhin	0465dba2cf	Fix file dowload from MS Office online [SCI-4673]	2020-05-27 16:59:28 +02:00
aignatov-bio	aaff5eb67f	Add name order for porject/experiment/task sidebar	2020-05-27 13:31:00 +02:00
aignatov-bio	15f58be1c2	Fix snapshot date creation	2020-05-26 15:59:49 +02:00
Mojca Lorber	9b7d321666	Add rename task and rename experiment activities	2020-05-26 15:34:20 +02:00
Miha Mencin	79ba0b3708	Merge pull request #2605 from biosistemika/SCI-4674-tehnician-snapshots-permissions ... SCI-4674 allow tehnician to create, delete and select snapshot	2020-05-25 16:55:33 +02:00
Miha Mencin	77e1feda97	SCI-4674 name permissions more properly	2020-05-25 16:29:00 +02:00
Miha Mencin	5994e8c6a6	SCI-4674 create special permissions for snapshots on task	2020-05-25 15:49:31 +02:00
Miha Mencin	cd70d9c5a6	SCI-4674 allow tehnician to create, delete and select snapshot	2020-05-25 15:03:37 +02:00
Alex Kriuchykhin	6ada4dc723	Merge pull request #2604 from okriuchykhin/ok_SCI_4669 ... Fix viewing of office files in repository snapshots [SCI-4669]	2020-05-25 13:55:31 +02:00
Oleksii Kriuchykhin	3cabe2250b	Fix viewing of office files in repository snapshots [SCI-4669]	2020-05-25 12:30:08 +02:00
Mojca Lorber	76a1f73989	Change order of snapshots versions	2020-05-25 12:15:24 +02:00
aignatov-bio	100108bd43	Merge pull request #2596 from aignatov-bio/ai-sci-4642-improve-assigned-task-search ... Improve search through assigned tasks [SCI-4642]	2020-05-25 09:09:19 +02:00
Oleksii Kriuchykhin	c98b042585	Improve handling of unassigned inventories with existing snapshots [SCI-4661]	2020-05-22 17:36:04 +02:00
Alex Kriuchykhin	b5e0e4649c	Merge pull request #2597 from urbanrotnik/4663-fix-button-visibility ... Fix for snapshot creation [SCI-4672]	2020-05-22 16:38:29 +02:00
Urban Rotnik	a407bf857f	Fix for show and create	2020-05-22 16:19:21 +02:00
aignatov-bio	3287070df7	Improve search through assigned tasks	2020-05-22 14:36:28 +02:00
Mojca Lorber	92861fdd32	Expand assigned inventory after updating assigned items on task	2020-05-21 22:36:09 +02:00
aignatov-bio	d3781a7048	Merge pull request #2588 from aignatov-bio/ai-sci-4660-change-assigned-private-task-view ... Add private tasks to assigned task list [SCI-4660]	2020-05-21 12:57:59 +02:00
Miha Mencin	7de12990a9	SCI-4628 moving snapshot provisioning logic into repository model, making snapshot unique selection validation conditional	2020-05-21 00:36:24 +02:00
aignatov-bio	d16930e987	Add private tasks to assigned task list	2020-05-20 17:23:48 +02:00
aignatov-bio	f8b246eb2a	Fix repositories order in dropdown	2020-05-19 16:18:01 +02:00
Alex Kriuchykhin	afdd6fd149	Merge pull request #2572 from okriuchykhin/ok_SCI_4629 ... Prevent the inventory items editing while snapshot is being created [SCI-4629]	2020-05-19 10:10:34 +02:00
Oleksii Kriuchykhin	8b968f6f67	Fix selection of the default snapshot on tasks [SCI-4637]	2020-05-18 11:06:42 +02:00
Oleksii Kriuchykhin	c0521c3ca7	Prevent the inventory items editing while snapshot is being created [SCI-4629]	2020-05-15 17:46:59 +02:00
Urban Rotnik	a2ade6e0ec	Merge branch 'develop' into features/new-task-layout	2020-05-15 14:27:56 +02:00
aignatov-bio	ce1540aaa9	Small task inventories corrections	2020-05-14 16:41:02 +02:00
Oleksii Kriuchykhin	ba1661b40f	Fix handling of deleted repositories for snapshots [SCI-4596]	2020-05-13 18:00:56 +02:00
Oleksii Kriuchykhin	c74fa3c244	Make snapshots selectable [SCI-4596]	2020-05-13 17:58:05 +02:00
Alex Kriuchykhin	76d1196724	Merge pull request #2544 from okriuchykhin/ok_SCI_4597 ... Refactor Repository permissions and implement deduplication for files in snapshots [SCI-4597]	2020-05-13 16:42:47 +02:00
aignatov-bio	8e20dccc66	Merge pull request #2510 from aignatov-bio/ai-sci-4509-add-recent-protocols-tab ... Add recent protocol tab to load protocal from repository [SCI-4509]	2020-05-08 13:17:26 +02:00
aignatov-bio	6997586357	Merge pull request #2541 from aignatov-bio/ai-sci-4591-merge-assign-unassign-service ... Merge assign and unassign service [SCI-4591]	2020-05-08 13:15:06 +02:00
aignatov-bio	d2a479c2e8	Merge pull request #2526 from aignatov-bio/ai-sci-4559-add-assigned-tasks-dropdown-to-inventory ... Add assigned task dropdown to repository and task page [SCI-4559][SCI-4565]	2020-05-08 12:39:28 +02:00
aignatov-bio	d3faec1070	Rename service	2020-05-08 12:28:37 +02:00
aignatov-bio	2728df5bac	Move helper method to my_module_helper	2020-05-08 11:56:29 +02:00
aignatov-bio	c9545ddb19	Merge branch 'features/new-task-layout' into ai-sci-4509-add-recent-protocols-tab	2020-05-08 10:28:33 +02:00
aignatov-bio	29903f570d	Merge assign and unassign service	2020-05-07 13:51:07 +02:00
aignatov-bio	8ec7a4b7b4	Merge branch 'features/new-task-layout' into ai-sci-4559-add-assigned-tasks-dropdown-to-inventory	2020-05-07 13:03:00 +02:00
aignatov-bio	8076d8f464	Create helper for partial	2020-05-07 12:51:18 +02:00
Urban Rotnik	a38b850601	Merge pull request #2520 from urbanrotnik/ur-sci-4522-activity-links ... Activities links [SCI-4522] & [SCI-4514]	2020-05-06 22:11:58 +02:00
Oleksii Kriuchykhin	25f9c5bc7d	Refactor Repository permissions and implement deduplication for files in snapshots [SCI-4597]	2020-05-06 15:17:54 +02:00
Urban Rotnik	8ff7c33431	Fix start date activity message	2020-05-06 12:34:45 +02:00
aignatov-bio	938f00484b	Fix markup	2020-04-29 15:17:15 +02:00
aignatov-bio	19d30e2019	Merge branch 'features/new-task-layout' into ai-sci-4523-add-assign-items-to-task	2020-04-29 15:13:38 +02:00
Alex Kriuchykhin	0e865f8e45	Merge pull request #2525 from okriuchykhin/ok_SCI_4552 ... Implement background processing of repository snapshots [SCI-4552]	2020-04-29 12:03:23 +02:00
aignatov-bio	61bbca6bcf	Fix path names and markup	2020-04-28 19:12:17 +02:00
Urban Rotnik	5c72200801	Remove tooltips settings for user	2020-04-28 12:44:47 +02:00
aignatov-bio	b9c5089c2b	Add search to assigned tasks dropdown	2020-04-28 12:41:59 +02:00
Oleksii Kriuchykhin	e6ad5047e0	Implement background processing of repository snapshots [SCI-4552]	2020-04-28 12:09:36 +02:00
aignatov-bio	0604815c00	Add assigned task dropdown to repository	2020-04-24 15:43:10 +02:00
aignatov-bio	f65b50c6ff	Fix rebase conflicts	2020-04-23 16:36:22 +02:00
Urban Rotnik	de4e4ca967	Add before_action for team switch	2020-04-23 16:20:01 +02:00
aignatov-bio	d48997464d	Fix markup	2020-04-23 15:25:28 +02:00
aignatov-bio	34d6e903a4	Add assign items modal and update modal for task inventories	2020-04-23 15:24:40 +02:00
aignatov-bio	10fdd0c1c7	Merge branch 'develop' into features/new-task-layout	2020-04-23 14:07:40 +02:00
Urban Rotnik	38c198705c	Change current_team to target team, add id param to link	2020-04-23 12:40:43 +02:00
Oleksii Kriuchykhin	943285d4a0	Fix Azure AD user creation on sign in [SCI-4544]	2020-04-22 16:47:06 +02:00
Oleksii Kriuchykhin	f811d11c59	Add versions sidebar to assigned repository rows full view modal [SCI-4525]	2020-04-21 14:49:36 +02:00
aignatov-bio	be47efce74	Merge pull request #2509 from aignatov-bio/ai-sci-4506-add-repositories-dropdown-list ... Add repositories dropdown list [SCI-4506]	2020-04-16 14:17:17 +02:00
mlorb	9584b11d45	Merge pull request #2507 from mlorb/ml-sci-4505 ... Add the user management section of to the Details section of task layout [SCI-4505]	2020-04-16 13:47:31 +02:00
Alex Kriuchykhin	436f0bf63d	Merge pull request #2506 from okriuchykhin/ok_SCI_4516 ... Add repository snapshots with service, refactor item assigning [SCI-4516]	2020-04-15 17:32:25 +02:00
aignatov-bio	0d1dd74f02	Fix typo	2020-04-14 18:17:54 +02:00
Mojca Lorber	e9959747d6	small refactor	2020-04-14 17:25:36 +02:00
aignatov-bio	f00561cc22	Fix markup	2020-04-14 13:10:13 +02:00
aignatov-bio	c1cac01b28	Add repositories dropdown list	2020-04-14 12:10:16 +02:00
aignatov-bio	fe718349da	Add recent protocol tab to load protocal from repository	2020-04-09 17:29:39 +02:00
Oleksii Kriuchykhin	837437309e	Fix failing tests [SCI-4516]	2020-04-09 17:11:58 +02:00
Oleksii Kriuchykhin	3a67c99982	Switch to STI for repositories, fix cell values snapshotting [SCI-4516]	2020-04-09 12:33:04 +02:00
Mojca Lorber	f22f076e6c	Add the user management secion of to the Details section of task layout	2020-04-08 16:24:59 +02:00
aignatov-bio	087f71a82f	Add full view for my-module repository	2020-04-07 21:02:16 +02:00
Oleksii Kriuchykhin	a9c3102835	Add repository snapshots with service, refactor item assigning [SCI-4516]	2020-04-07 18:26:39 +02:00
aignatov-bio	845e8c3d6d	Fix loading process	2020-04-07 12:36:01 +02:00
aignatov-bio	7fdc169ba2	Add simple view to repository table	2020-04-06 19:52:41 +02:00
aignatov-bio	fc810b5524	Merge pull request #2503 from aignatov-bio/ai-sci-4507-add-assigned-repositories-list ... Add assigned repositories list [SCI-4507]	2020-04-03 13:59:26 +02:00
aignatov-bio	dd3f2cb219	Update my_module assigned repository method	2020-04-03 12:33:42 +02:00
aignatov-bio	9678372dd5	Add assigned repositories list	2020-04-02 12:05:07 +02:00
aignatov-bio	af02201b43	Add decimals to repository column API	2020-04-01 13:29:21 +02:00
Oleksii Kriuchykhin	3c53be1f9a	Add start date to the task [SCI-4504]	2020-03-31 14:17:14 +02:00
Alex Kriuchykhin	92279d07ad	Merge pull request #2437 from aignatov-bio/ai-sci-4380-saving-navigation-state ... Refactor sidebar [SCI-4380]	2020-03-30 09:56:51 +02:00
Oleksii Kriuchykhin	c5dd572e8e	Fix annotation notifications for inventory rows [SCI-4469]	2020-03-23 18:45:36 +01:00
Alex Kriuchykhin	2a2e479cd3	Merge pull request #2470 from okriuchykhin/ok_SCI_4408 ... Enable time fraction for task due date [SCI-4408]	2020-03-16 18:55:10 +01:00
Oleksii Kriuchykhin	a518bfe023	Enable time fraction for task due date [SCI-4408]	2020-03-16 17:55:35 +01:00
Oleksii Kriuchykhin	2e2e6be31c	Fix file view permission check in inventories [SCI-4440]	2020-03-12 11:52:46 +01:00
aignatov-bio	d924faaafd	Merge pull request #2455 from aignatov-bio/ai-sci-4403-recent-work-layout ... Add recent work widget [SCI-4400][SCI-4401][SCI-4402][SCI-4403]	2020-03-12 11:26:23 +01:00
aignatov-bio	b898f03767	Add user check to project filter in quick start widget	2020-03-11 14:51:21 +01:00
Miha Mencin	26b687f2e6	Merge pull request #2460 from biosistemika/features/dashboard ... Features/dashboard	2020-03-10 18:06:23 +01:00
Miha Mencin	aeeb0b79a4	Merge pull request #2459 from aignatov-bio/ai-sci-4445-add-error-handling-new-task-modal ... Add error handling to create task modal [SCI-4445]	2020-03-10 17:39:56 +01:00
aignatov-bio	63a5459d21	Add error handling to create task modal	2020-03-10 13:16:56 +01:00
Alex Kriuchykhin	769ba76afa	Merge pull request #2445 from okriuchykhin/ok_SCI_4379 ... Improve file upload checks [SCI-4382]	2020-03-10 09:47:23 +01:00
aignatov-bio	180b736769	Refactor recent work service	2020-03-09 15:10:51 +01:00
aignatov-bio	4328634e78	Remove uneditable projects from create task widget	2020-03-09 13:38:38 +01:00
Alex Kriuchykhin	4bea0781da	Merge pull request #2418 from okriuchykhin/ok_SCI_4276 ... Add API endpoints for new column types [SCI-4276]	2020-03-09 12:58:54 +01:00
Miha Mencin	62b934f012	Merge branch 'develop' into features/dashboard	2020-03-09 09:56:32 +01:00
aignatov-bio	e729aa043e	Add recent work widget	2020-03-06 13:51:18 +01:00
aignatov-bio	6f395b8e36	Merge pull request #2450 from aignatov-bio/ai-sci-4421-sorting-task-without-due-date ... Add alphabetical order for tasks without due date [SCI-4421]	2020-03-05 14:52:58 +01:00
aignatov-bio	3494d1071e	Merge pull request #2448 from aignatov-bio/ai-sci-4416-add-yellow-due-dates ... Refactor current task widget [SCI-4416]	2020-03-05 14:46:16 +01:00
aignatov-bio	79560e517d	Fix markup	2020-03-05 14:40:46 +01:00
aignatov-bio	f9be7a2cb8	Add alphabetical order for tasks without due date	2020-03-05 12:58:25 +01:00
Alex Kriuchykhin	f201826eb8	Merge pull request #2426 from okriuchykhin/ok_SCI_4383 ... Add global repositories limit [SCI-4383]	2020-03-05 12:45:02 +01:00
Mojca Lorber	8325ed80f0	Add endpoints for lists of projects and experiments with filtering and finish the frontend for quick start create new task on dashboard	2020-03-04 23:26:01 +01:00
aignatov-bio	77d66b65b1	Refactor current task for addons integration	2020-03-04 13:21:52 +01:00
aignatov-bio	30545f5cf4	Merge pull request #2443 from aignatov-bio/ai-sci-4409-fix-visibilty-of-tasks ... Fix task visibility for current task widget [SCI-4409]	2020-03-03 16:35:22 +01:00
mlorb	ba438e7728	Merge branch 'features/dashboard' into ml-sci-4354	2020-03-03 16:29:47 +01:00
Mojca Lorber	4f37260571	Fix controller	2020-03-03 16:17:29 +01:00
aignatov-bio	9fa8818a5d	Fix markup	2020-03-03 16:10:52 +01:00
aignatov-bio	da4967b3d0	Fix markup	2020-03-03 16:09:19 +01:00
aignatov-bio	7d7cdce91a	Add file size limitation to tinyMCE	2020-03-03 15:55:17 +01:00
Oleksii Kriuchykhin	11a5536af5	Improve file upload checks [SCI-4382]	2020-03-03 15:26:40 +01:00
aignatov-bio	3dc94a225d	Small visual improvments for current tasks widget	2020-03-03 14:21:16 +01:00
aignatov-bio	eb4a783337	Fix task visibility for current task widget	2020-03-03 13:13:46 +01:00
mlorb	4d52fc9b45	Merge branch 'features/dashboard' into ml-sci-4354	2020-03-03 13:00:05 +01:00
Mojca Lorber	52493fd834	Add pagination for current tasks on dashboard	2020-03-03 12:07:21 +01:00
aignatov-bio	d9bfd8c28e	Add search to current task widget	2020-03-03 09:50:44 +01:00
Oleksii Kriuchykhin	a819e1b8f4	Merge branch 'hotfix/1.17.11' into develop	2020-03-02 11:58:25 +01:00
Alex Kriuchykhin	409c4b7f65	Merge pull request #2438 from okriuchykhin/ok_SCI_4356 ... Improve loading of tasks statistics for dashboard [SCI-4356]	2020-02-28 16:38:39 +01:00
Oleksii Kriuchykhin	78ceb41a9e	Improve loading of tasks statistics for dashboard [SCI-4356]	2020-02-28 16:17:32 +01:00
aignatov-bio	0ae5e51cb3	Merge branch 'features/dashboard' into ai-sci-4375-end-point-to-task-create	2020-02-28 14:37:27 +01:00
aignatov-bio	8b273acaca	Update all sidebars	2020-02-28 14:03:08 +01:00
Miha Mencin	1fd876bb40	Merge pull request #2425 from mlorb/ml-sci-4348 ... Dashboard current tasks visual layout and backend [SCI-4348] [SCI-4355]	2020-02-28 12:11:31 +01:00
Mojca Lorber	3c09923d96	Refactoring current tasks backend	2020-02-28 11:51:08 +01:00
aignatov-bio	9e15d1ea42	Refactor experiment sidebar	2020-02-27 16:04:44 +01:00
Mojca Lorber	f29ce66bea	Refactor backend, add empty state and fix some small scc changes	2020-02-26 11:07:17 +01:00
aignatov-bio	8e05908753	Small fixes	2020-02-25 17:19:11 +01:00
aignatov-bio	32d6f9a43a	Split my_module create service to seperate services	2020-02-25 13:46:44 +01:00
aignatov-bio	a28d729aeb	Add end point	2020-02-24 17:09:10 +01:00
Oleksii Kriuchykhin	0cb9584a2b	Fix empty mime type for ActiveStorage local file service [SCI-4360]	2020-02-24 16:04:35 +01:00
aignatov-bio	0675b137ad	Add team and task status for calendars scope	2020-02-22 18:15:18 +01:00
Oleksii Kriuchykhin	63e557ea9e	Add global repositories limit [SCI-4383]	2020-02-21 14:40:17 +01:00
Mojca Lorber	9bd2e8bec4	Dashboard current tasks visual layout and backend	2020-02-21 10:41:42 +01:00
aignatov-bio	cf4dbd5ff4	Add calendar widget	2020-02-20 17:02:38 +01:00
Oleksii Kriuchykhin	9d0d75acc5	Add API endpoints for new column types [SCI-4276]	2020-02-18 15:13:46 +01:00
aignatov-bio	ff45b17b53	Fix localization and small markup fixes	2020-02-17 15:32:43 +01:00
aignatov-bio	a438f6b4f0	Finished filters	2020-02-17 10:47:10 +01:00
aignatov-bio	485597a9ef	Add front-end part	2020-02-14 12:07:40 +01:00
aignatov-bio	5c0a769f87	General dashboard layout	2020-02-13 13:50:29 +01:00
aignatov-bio	463b99195c	Remove shared inventories with view permission from dropdown list	2020-02-12 11:16:55 +01:00
Oleksii Kriuchykhin	5be4ffb139	Fix multiple file result creation [SCI-4346]	2020-02-11 20:08:36 +01:00
Alex Kriuchykhin	9c763f2111	Merge pull request #2383 from okriuchykhin/ok_SCI_4220 ... Extend inventory import to support new data types [SCI-4220]	2020-02-10 11:04:34 +01:00
Oleksii Kriuchykhin	5470bb9b9b	Fix file result only name update [SCI-4321]	2020-02-07 15:21:50 +01:00
Mojca Lorber	2727614603	Clean up controllers for manage repository columns	2020-02-04 16:05:16 +01:00
Oleksii Kriuchykhin	632b54cb98	Merge branch 'develop' into ok_SCI_4220	2020-02-03 15:50:06 +01:00
Oleksii Kriuchykhin	b0c785f4fb	Extend inventory import to support new data types [SCI-4220]	2020-02-03 15:20:01 +01:00
Urban Rotnik	3db48c44f7	Add ordered scope	2020-01-30 13:47:14 +01:00
Urban Rotnik	1bb54d20cf	Teams ordering fixed	2020-01-30 13:46:04 +01:00
Miha Mencin	81023f8c69	SCI-4300 sckip permission checking for list	2020-01-27 14:27:46 +01:00
Oleksii Kriuchykhin	8c2b1e5037	Fix global search for repositories and checklists update [SCI-4251]	2020-01-16 15:30:19 +01:00
Miha Mencin	b23c874f9e	Merge pull request #2310 from biosistemika/SCI-4199-selected-checklist-is-lost ... Sci 4199 selected checklist is lost	2020-01-15 15:28:34 +01:00
mlorb	e44903bae5	Merge branch 'develop' into ml-sci-4150-v2	2020-01-15 14:47:25 +01:00
Miha Mencin	5bfa5c7939	SCI-4199 disabling delimiter, adding warning	2020-01-15 13:59:28 +01:00
Oleksii Kriuchykhin	eed68a2590	Refactor repository cell clonning to support all data types [SCI-4204]	2020-01-14 16:55:10 +01:00
Mojca Lorber	9176301b7b	Refactor manage repository columns, move it from page into modal	2020-01-14 11:13:19 +01:00
Oleksii Kriuchykhin	01b8d2226d	Optimize repository table counters [SCI-4224]	2020-01-13 16:31:42 +01:00
Oleksii Kriuchykhin	7b82e33eb6	Fix repository filtering and improve speed [SCI-4224]	2020-01-13 16:09:07 +01:00
aignatov-bio	bdb970b8d4	Fix flash message for datetime column	2020-01-10 13:22:29 +01:00
Alex Kriuchykhin	f1babb2237	Merge pull request #2279 from okriuchykhin/ok_SCI_4000 ... Fix sidebar update for inline editing [SCI-4000]	2020-01-10 10:34:27 +01:00
Alex Kriuchykhin	d2e12e0683	Merge pull request #2265 from okriuchykhin/ok_SCI_4146 ... Restrict files to only images in RTE fields [SCI-4146]	2020-01-10 10:34:00 +01:00
Oleksii Kriuchykhin	1624f9d5ab	Disable comment edit mode if comment is not editable [SCI-4149]	2020-01-08 12:32:59 +01:00
Oleksii Kriuchykhin	d9b9243da7	Merge branch 'develop' into features/new-column-types	2020-01-07 16:03:33 +01:00
Oleksii Kriuchykhin	16b591b110	Fix sidebar update for inline editing [SCI-4000]	2020-01-06 16:07:23 +01:00
aignatov-bio	3bd44dc5ab	Merge pull request #2271 from aignatov-bio/ai-sci-4168-refactor-checklist-model ... Refactor checklist column data structure [SCI-4168]	2019-12-24 11:12:36 +01:00
Urban Rotnik	400c109592	Refactor StatusesJS for new dropdown	2019-12-23 14:34:11 +01:00
Miha Mencin	882ec711fe	Merge pull request #2276 from biosistemika/master ... Master	2019-12-20 17:39:46 +01:00
aignatov-bio	54800cb69b	Merge branch 'features/new-column-types' into ai-sci-4168-refactor-checklist-model	2019-12-20 15:46:39 +01:00
aignatov-bio	16c4879e56	Merge migrations and update sorting	2019-12-20 15:42:54 +01:00
Oleksii Kriuchykhin	b945171f2f	Fix creation of new tasks on canvas [SCI-4171]	2019-12-19 15:48:25 +01:00
Urban Rotnik	7153711570	Move delimiter from column to metadata	2019-12-18 10:22:52 +01:00
Miha Mencin	b67911c81a	Merge branch 'SCI-4058-disable-inventory-delition-for-normal-user' into release/1.17.9	2019-12-17 14:48:50 +01:00
Oleksii Kriuchykhin	403a3e0140	Restrict files to only images in RTE fields [SCI-4146]	2019-12-16 16:05:40 +01:00
Alex Kriuchykhin	792e6f2eb9	Merge pull request #2263 from okriuchykhin/ok_SCI_4142 ... Implement SSO with Azure AD [SCI-4142]	2019-12-12 16:12:40 +01:00
Oleksii Kriuchykhin	0094528a02	Improve connected accounts unlinking [SCI-4142]	2019-12-12 14:57:27 +01:00
aignatov-bio	eed56b59aa	Fix markup	2019-12-11 15:08:18 +01:00
aignatov-bio	7664f4be78	Add checklist and list edit mode	2019-12-11 14:49:14 +01:00
Oleksii Kriuchykhin	1aa334fdaa	Merge branch 'develop' into release-1-17-8	2019-12-11 10:55:00 +01:00
Oleksii Kriuchykhin	ff4ef818fb	Implement SSO with Azure AD [SCI-4142]	2019-12-10 17:24:53 +01:00
aignatov-bio	7fc9c0d1e4	Adding frontend for checklist edit mode	2019-12-10 15:58:59 +01:00
Urban Rotnik	5055490a23	Refactor asset value methods	2019-12-10 14:29:36 +01:00
Urban Rotnik	82b93bf9a4	Fix failing tests	2019-12-10 14:29:35 +01:00
Urban Rotnik	508a9b4e3e	RepositoryRows controller refactor	2019-12-10 14:29:35 +01:00
Urban Rotnik	0c990ef8cf	Add functions for creating new cells with values	2019-12-10 14:29:34 +01:00
Mojca Lorber	8503dd7007	Add numeric repository column type	2019-12-09 16:38:21 +01:00
aignatov-bio	09079fbcda	Fix naming and tests	2019-12-09 13:48:36 +01:00
aignatov-bio	d8676596f1	Add checklists column type	2019-12-09 13:48:36 +01:00
Urban Rotnik	7661a24a44	Remove scope for before_action	2019-12-06 11:15:17 +01:00
Urban Rotnik	2c0a6ed085	Remove current_user vars	2019-12-06 11:12:07 +01:00
Oleksii Kriuchykhin	03667f619f	Merge branch 'release-1-17-7' into develop	2019-12-05 13:03:39 +01:00
Urban Rotnik	ee5c2ac93d	Add edit renderer for Assets	2019-12-04 14:52:52 +01:00
aignatov-bio	d5f9604e1c	Fix file post process method	2019-12-03 10:17:47 +01:00
Urban Rotnik	3ab1967703	Add Edit renderer for Statuses	2019-12-02 11:03:05 +01:00
Alex Kriuchykhin	fbf1a5b6e2	Merge pull request #2239 from okriuchykhin/ok_SCI_4098 ... Refactor Azure configuration and connected accounts [SCI-4098]	2019-11-29 11:30:33 +01:00
Urban Rotnik	5f2407e3fb	Add view renders for DateTime column types	2019-11-29 10:50:14 +01:00
Urban Rotnik	65d8d0e35b	DateTime HTML and JS simplified	2019-11-29 10:19:57 +01:00
Urban Rotnik	5ae29d549e	Add manage modal for DateTime values	2019-11-29 10:19:55 +01:00
Urban Rotnik	fe4aa12ced	Add DateTime columns CRUD endpoints	2019-11-29 10:19:14 +01:00
Urban Rotnik	dc6cc3bc62	Show after create flash messages	2019-11-29 10:19:12 +01:00
Urban Rotnik	b2ce600820	Add delimiter column for repository_column	2019-11-29 10:19:10 +01:00
Urban Rotnik	b2b6296cb5	Improve update items action, JS and views	2019-11-29 10:19:10 +01:00
Urban Rotnik	24acf1f84b	Fix edit mode for File and Text	2019-11-29 10:19:08 +01:00
Urban Rotnik	1e8261ac2a	Update InventoryColumns API for new Status Type	2019-11-29 10:19:07 +01:00
Urban Rotnik	7ab12baef9	Add API endpoint for StatusItems	2019-11-29 10:19:07 +01:00
Mojca Lorber	bcb8cc1840	Remove byebug	2019-11-29 10:17:54 +01:00
Mojca Lorber	305104f639	Refactor text inventory type	2019-11-29 10:17:53 +01:00
Urban Rotnik	37b7d5aa64	Use values from extends	2019-11-29 10:17:52 +01:00
Urban Rotnik	f645ff52ab	Refactor ColumnServices	2019-11-29 10:17:52 +01:00
Urban Rotnik	28d7a4f284	Refactor FileColumnController	2019-11-29 10:17:51 +01:00
Urban Rotnik	1720623665	Refactor RepositoryListColumn controller	2019-11-29 10:17:50 +01:00
Mojca Lorber	482deafdd3	Rename partial	2019-11-29 10:17:49 +01:00
Mojca Lorber	fe8829b592	Fix multiple load of modal	2019-11-29 10:17:49 +01:00
Urban Rotnik	5923e8897a	Remove commented code	2019-11-29 10:16:46 +01:00
Urban Rotnik	4cb3d1b6f0	Add BaseColumnsController for column_types controllers	2019-11-29 10:16:45 +01:00
Urban Rotnik	14b43d516e	Add UpdateStatusColumnService service	2019-11-29 10:16:45 +01:00
Urban Rotnik	5930bdd794	Add StatusColumnsController	2019-11-29 10:16:44 +01:00
Oleksii Kriuchykhin	6c7f45fc20	Add simplified view for sign-in form [SCI-4098]	2019-11-28 17:00:43 +01:00
Miha Mencin	13191f1a72	Merge pull request #2223 from biosistemika/SCI-4058-disable-inventory-delition-for-normal-user ... Sci 4058 disable inventory delition for normal user	2019-11-28 14:31:32 +01:00
Oleksii Kriuchykhin	f5abb7c767	Add connected accounts section to settings [SCI-4106]	2019-11-27 23:16:25 +01:00
aignatov-bio	68284c10da	Add task description and task protocol description activities	2019-11-27 14:37:53 +01:00
Oleksii Kriuchykhin	6b20a10473	Refactor Azure configuration [SCI-4098]	2019-11-26 15:09:40 +01:00
Alex Kriuchykhin	111056a032	Merge pull request #2224 from okriuchykhin/ok_SCI_4112 ... Fix adding experiment contents to report [SCI-4112]	2019-11-26 09:50:28 +01:00
Miha Mencin	a328c4ad56	fix CR comments	2019-11-25 17:40:29 +01:00
aignatov-bio	d732b2f1a6	Merge pull request #2228 from aignatov-bio/ai-sci-4090-fix-task-tags ... Add strict order to module tags in modal [SCI-4090]	2019-11-25 13:55:33 +01:00
Miha Mencin	e65e344c39	fix styling	2019-11-25 10:45:21 +01:00
aignatov-bio	5100ab4d08	Add strict order to module tags in modal	2019-11-25 10:15:06 +01:00
Miha Mencin	bd34435b39	fixing style issues	2019-11-25 08:44:33 +01:00
aignatov-bio	7fa753ca81	Fix name update and path to team	2019-11-23 23:20:38 +01:00
Oleksii Kriuchykhin	8f94c85b7a	Fix adding experimaent contents to report [SCI-4112]	2019-11-22 14:57:59 +01:00
Miha Mencin	1bf6663196	check the permissions in before action	2019-11-22 13:23:02 +01:00
aignatov-bio	2e30f50ae8	Merge pull request #2221 from aignatov-bio/ai-sci-3976-add-autosave-other-fields ... Add autosave for protocol keywords, user preferences and due date [SCI-3976]	2019-11-21 13:13:10 +01:00
aignatov-bio	0b04ca4012	Fix markup	2019-11-21 12:19:47 +01:00
Miha Mencin	04a6645cfc	Separate view/edit/modify permissions SCI-4058	2019-11-20 17:12:47 +01:00
aignatov-bio	56ae32323c	Add autosave for protocol keywords and user preferences	2019-11-20 14:57:53 +01:00
Oleksii Kriuchykhin	46ee43ea8b	Improve handling of file links for local storage [SCI-4071]	2019-11-19 15:35:31 +01:00
aignatov-bio	264493a322	Finish removing Select2 library	2019-11-18 13:59:55 +01:00
aignatov-bio	e7ad7ae969	New tags drop down	2019-11-18 13:59:55 +01:00
Anton Ignatov	17e457c686	Finished global activities refactoring	2019-11-18 13:59:54 +01:00
Anton Ignatov	fc70ce24f8	Refactor side filters for global activities	2019-11-18 13:59:54 +01:00
Anton Ignatov	7b855f54ac	Finish main part of selectors	2019-11-18 13:59:54 +01:00
Urban Rotnik	5e97116c5a	Update results params	2019-11-18 11:11:39 +01:00
Urban Rotnik	8b5e346770	Remove file deletion manually	2019-11-18 11:11:39 +01:00
Urban Rotnik	cc9d987321	Add update result(file) and create result(file) API endpoint	2019-11-18 11:11:38 +01:00
Urban Rotnik	060125a1c4	Add file size validation	2019-11-18 11:11:38 +01:00
Urban Rotnik	1be88baab1	Add API endpoint for Attachments resource	2019-11-18 11:11:38 +01:00
Urban Rotnik	e7083e188c	Add API endpoint for Step resource ... [SCI-3835]	2019-11-18 11:11:37 +01:00
Urban Rotnik	24033bec7a	Add API endpoint for Task creation	2019-11-18 11:11:37 +01:00
aignatov-bio	3eb6f5695b	Merge pull request #2207 from aignatov-bio/mlorb-ml-sci-4004 ... Add auto-save feature to text fields [SCI-4004]	2019-11-18 09:11:10 +01:00
aignatov-bio	1488f75e26	Add activities	2019-11-13 13:57:04 +01:00
aignatov-bio	a9690482d1	Add autosave feature to text fields	2019-11-12 11:26:18 +01:00
Oleksii Kriuchykhin	b646295698	Fix service_url for local storage [SCI-4057]	2019-11-06 15:21:56 +01:00
Oleksii Kriuchykhin	ab691efdb2	Fix LinkedIn sign-up [SCI-4047]	2019-10-29 16:20:19 +01:00
Alex Kriuchykhin	5524598d53	Merge pull request #2172 from biosistemika/release_1_17_3 ... Merge release 1.17.3 to master	2019-10-22 12:45:02 +02:00
Oleksii Kriuchykhin	53402c9ce1	Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993]	2019-10-17 13:30:14 +02:00
Oleksii Kriuchykhin	f3a6c18a84	Improve permission checking for reports [SCI-3991]	2019-10-14 14:50:05 +02:00
aignatov-bio	54627faeb3	Fix tests	2019-10-11 11:46:51 +02:00
aignatov-bio	521a367960	Add predefined avatars	2019-10-11 11:46:51 +02:00
Alex Kriuchykhin	f6da6814b8	Merge pull request #2154 from okriuchykhin/ok_SCI_3977 ... Generate previews for newly created office files once asset is saved [SCI-3977]	2019-10-10 15:43:02 +02:00
Oleksii Kriuchykhin	07b037f05b	Generate previews for newly created office files once asset is saved [SCI-3977]	2019-10-10 15:40:50 +02:00
Alex Kriuchykhin	48171f7e02	Merge pull request #2153 from okriuchykhin/ok_SCI_3977 ... Fix previews for newly created office files [SCI-3977]	2019-10-10 15:11:24 +02:00
Oleksii Kriuchykhin	0b4f72e517	Fix previews for newly created office files [SCI-3977]	2019-10-10 14:25:19 +02:00
aignatov-bio	9d59d56818	Generate all preview for assets at same time	2019-10-10 14:17:02 +02:00
Miha Mencin	e2b5989c14	Revert "Handle missing experiment previews [SCI-3949]"	2019-10-09 16:42:15 +02:00
Alex Kriuchykhin	71aa8e646e	Merge pull request #2147 from okriuchykhin/ok_SCI_3949 ... Handle missing experiment previews [SCI-3949]	2019-10-09 16:27:16 +02:00
Oleksii Kriuchykhin	00921a5f6a	Hadle missing experiment previews [SCI-3949]	2019-10-09 16:24:21 +02:00
Oleksii Kriuchykhin	3d9c2282f3	Implement JPEG quality extraction for ActiveStorage [SCI-3959]	2019-10-08 10:42:55 +02:00
Urban Rotnik	c296760be8	Merge pull request #2125 from urbanrotnik/ur-sci-3962-step-is-not-saved-after-removing-file ... Add team_id when asset is creating [SCI-3962]	2019-10-04 14:46:18 +02:00
Alex Kriuchykhin	076d61d4d0	Merge pull request #2116 from okriuchykhin/ok_SCI_3908 ... Remove Paperclip from the codebase [SCI-3908]	2019-10-04 14:45:42 +02:00
Urban Rotnik	8f0c3bd2ce	Add team_id when asset is creating	2019-10-04 14:24:19 +02:00
Oleksii Kriuchykhin	9d2ac4179e	Fix failing tests [SCI-3908]	2019-10-04 13:02:18 +02:00
Urban Rotnik	09e6545f30	Merge pull request #2115 from urbanrotnik/ur-sci-3947-local-storage ... Fix for disk storage [SCI-3947]	2019-10-03 16:28:09 +02:00
aignatov-bio	a31c5ea1f5	Fix marvin JS preview	2019-10-03 11:54:26 +02:00
Urban Rotnik	9c88327a16	Rename ActiveStorage base controller	2019-10-03 11:00:59 +02:00
Urban Rotnik	e2a779ccfe	Activestorage fix for disk storage ... [SCI-3947]	2019-10-02 14:01:38 +02:00
Oleksii Kriuchykhin	dd7f2fe095	Fix large preview for documents [SCI-3938]	2019-10-01 16:14:28 +02:00
Oleksii Kriuchykhin	584f2d07c0	Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934]	2019-10-01 13:06:01 +02:00
Anton Ignatov	33497d11a3	Merge branch 'activestorage_migration'	2019-10-01 10:36:05 +02:00
Alex Kriuchykhin	53caaf647b	Merge pull request #2080 from okriuchykhin/ok_SCI_3891 ... Move file preview generation to delayed job [SCI-3891]	2019-09-27 10:50:21 +02:00
Anton Ignatov	93363da4e5	Fix preview for result	2019-09-26 16:49:56 +02:00
Oleksii Kriuchykhin	aabeeec95a	Move file preview generation to delayed job [SCI-3891]	2019-09-23 21:07:03 +02:00
Anton Ignatov	09e3b7c80b	Fix repository row import/export	2019-09-23 13:33:02 +02:00
Jure Grabnar	8780e5183b	Remove CSRF check in WopiController	2019-09-19 15:55:29 +02:00
Jure Grabnar	cc561d8ee5	Change wopi_controller using Paperclip for reading	2019-09-19 15:03:13 +02:00
aignatov-bio	11f6517d0a	Fix duplicate marvinjs save (#2057)	2019-09-18 11:18:44 +02:00
Mojca Lorber	47ccf38662	Redesign of sorting button for projects/experiments cards	2019-09-16 14:43:12 +02:00
Oleksii Kriuchykhin	3509543e7b	Merge branch 'master' into ok_SCI_3881	2019-09-16 11:56:49 +02:00
Oleksii Kriuchykhin	c068901b00	Upgrade Rails to 6.0 [SCI-3745]	2019-09-12 17:24:08 +02:00
mlorb	cf8c98dfa3	Merge pull request #2042 from biosistemika/hotfix-september ... Hotfix september	2019-09-10 13:53:28 +02:00
Mojca Lorber	e8f24b18e2	Fix missing icon on shared inventories in global search	2019-09-10 11:20:18 +02:00
Oleksii Kriuchykhin	265047caf3	Improve behaviour of inventory items export modal [SCI-3815]	2019-09-09 10:38:47 +02:00
Miha Mencin	d522b3807a	codestyle improvements	2019-09-06 14:59:30 +02:00
Miha Mencin	7fc5035d2d	PR fixes, codestyle fixes	2019-09-06 13:47:06 +02:00
Miha Mencin	2486bd0077	SCI3818-unshared-inventory-screen	2019-09-05 14:03:08 +02:00
Mojca Lorber	a312c0c4b8	fix bug on api endpoint when creating result	2019-09-04 13:41:06 +02:00
mlorb	ba5bebedb2	change inlane editing css, add shared inventory subtitle and add tooltips to shared inventories icons (#2022)	2019-09-02 10:30:29 +02:00
Oleksii Kriuchykhin	267c53c2d2	Refactor inventory sharing logic [SCI-3803]	2019-08-29 17:21:49 +02:00
aignatov-bio	d3ccdbd83e	Create copy permission (#2017)	2019-08-29 13:39:22 +02:00
aignatov-bio	96e132c62e	Hide share button for users with one team (#2005)	2019-08-23 11:29:03 +02:00
aignatov-bio	5515bac773	Add assigned items from shared inventories to report (#2002)	2019-08-23 11:28:09 +02:00
Luka Murn	5d3a0d7eea	Merge pull request #2003 from Ducz0r/lm-remove-legacy-projects-views ... Remove legacy projects archive HTML views	2019-08-21 17:08:27 +02:00
Luka Murn	701bdbd294	Remove archive controller action	2019-08-21 16:01:12 +02:00
aignatov-bio	d70b7e2272	Make share status icon dynamic (#2007)	2019-08-21 15:32:57 +02:00
aignatov-bio	5e3f1d59f5	Fix inventory rows import (#1997)	2019-08-21 15:32:45 +02:00
Oleksii Kriuchykhin	3918c893db	Fix new office file creation [SCI-3778]	2019-08-21 13:26:11 +02:00
Luka Murn	084cdcdd6b	Remove old archive endpoint, controller logic	2019-08-21 13:17:19 +02:00
Anton Ignatov	ed8ef7aa8f	Fix permission check;	2019-08-20 16:07:22 +02:00
Luka Murn	ebda2c832a	Merge pull request #1995 from biosistemika/release-1.16.8 ... Merge release-1.16.8 into master	2019-08-19 15:08:33 +02:00
aignatov-bio	b6661682ad	Fix shared inventory in task dropdown (#1993)	2019-08-19 13:56:02 +02:00
aignatov-bio	2cf7f52f15	Add inline editing for inventories [SCI-3763] (#1991) ... * Add inline editing for inventories * Remove old locals * Markup fix	2019-08-19 13:30:56 +02:00
aignatov-bio	d741e52427	Fix global search for inventories (#1988)	2019-08-19 09:23:59 +02:00
Anton Ignatov	d1e1da8580	Fix permission check for invite users	2019-08-14 14:47:02 +02:00
Urban Rotnik	89f289660b	Add share_with_all feature to service, add new activities	2019-08-14 11:03:15 +02:00
Alex Kriuchykhin	960e69eaa8	Fix wopi file download URL [SCI-3757] (#1975)	2019-08-14 09:06:00 +02:00
aignatov-bio	737f9e572c	Replace marvinJS logo and fix some merge issues [SCI-3731] (#1976) ... * Replace marvinJS logo and fix some merge issues * Fix tests	2019-08-13 11:04:19 +02:00
Urban Rotnik	dc4751e49a	Update scope 'accessible_by_teams' and fix load_vars method in controllers	2019-08-12 10:55:30 +02:00
Oleksii Kriuchykhin	32054c5516	Handle situation for assets without blob in list sorting [SCI-3757]	2019-08-09 15:17:19 +02:00
Oleksii Kriuchykhin	c352a73d79	ActiveStorage fixies after latest master merge [SCI-3757]	2019-08-09 14:56:00 +02:00
Urban Rotnik	7719b825e3	Update wording for sharing activities, rename button, add view-only paragraph	2019-08-09 14:15:51 +02:00
Urban Rotnik	32783576c1	Add controller action 'multiple_update' ... Add controller action, add update permission activity, add JS for handling ajax req	2019-08-09 14:15:50 +02:00
Urban Rotnik	2648521924	Invite modal with form	2019-08-09 14:15:49 +02:00
Mojca Lorber	4c7c7ccdf1	Add ability to browse through shared inventories to smart annotations	2019-08-09 14:13:03 +02:00
Mojca Lorber	7d4941015f	Update global search, so it will be able to search through shared inventories	2019-08-09 14:13:01 +02:00
Urban Rotnik	171cdb319b	Add ShareInventory activities	2019-08-09 14:13:01 +02:00
Mojca Lorber	7e9be932f3	Make scope for repositories accessible by teams and simplify read permission	2019-08-09 14:13:00 +02:00
Mojca Lorber	15432ac851	Make changes to inventory list in navigation based on new mockup	2019-08-09 14:13:00 +02:00
Mojca Lorber	cac7dab440	Show shared inventories in left navigation and fix read repository permission	2019-08-09 14:13:00 +02:00
Urban Rotnik	5456c1e38a	Add basic controller for TeamRepositories	2019-08-09 14:12:59 +02:00
Urban Rotnik	077369d960	Update permissions for Repositories	2019-08-09 14:12:59 +02:00
aignatov-bio	6e5f078dea	Add activities for marvinJS [SCI-3630] (#1950) ... * Add marvinJs activities to step and results * Add activities for TinyMCE marvinJS assets * Fix markup	2019-08-09 09:47:07 +02:00
Oleksii Kriuchykhin	973efa55e1	Merge branch 'master' into ok_SCI_3678	2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin	b4f632dba8	Remove dowload endpoint from assets controller [SCI-3680]	2019-08-07 15:21:41 +02:00
Oleksii Kriuchykhin	d942788581	Implement read permissions checks for ActiveStorage controllers [SCI-3680]	2019-08-07 15:21:41 +02:00
Alex Kriuchykhin	328f8dd8a0	Merge pull request #1966 from okriuchykhin/ok_SCI_3681 ... Enforce file size limits for direct uploads on S3 [SCI-3681]	2019-08-07 10:49:05 +02:00
aignatov-bio	aa5061a1af	Add custom context menu to TinyMCE images [SCI-3582] (#1944) ... * Add custom context menu to TinyMCE images * Fix permission check for unsaved objects * Fix markup	2019-08-07 10:28:42 +02:00
Oleksii Kriuchykhin	973fc775c0	Enforce file size limits for direct uploads on S3 [SCI-3681]	2019-08-06 17:09:00 +02:00
Oleksii Kriuchykhin	eaf9d59819	Merge branch 'activestorage_migration' into ok_SCI_3679	2019-08-06 15:27:31 +02:00
Jure Grabnar	bbdc5ce6c3	Remove couple of Samples related logic/comments	2019-08-05 14:09:13 +02:00
Luka Murn	83bb89fdf5	Cherry-picked commit from ZZ (and LM)'s various changes	2019-07-26 10:13:14 +02:00
Oleksii Kriuchykhin	5e65b07bdc	Implement DirectUpload for Steps, Results and Inventories [SCI-3679]	2019-07-25 18:00:24 +02:00
Urban Rotnik	1b9db2f61e	Fix for file annotating on Safari	2019-07-24 14:16:29 +02:00
Anton Ignatov	0702dacc5b	Security fixes	2019-07-19 14:10:38 +02:00
Anton Ignatov	ad7130d3b2	Simplify TinyMCE assets for MarvinJS	2019-07-19 09:27:03 +02:00
Anton Ignatov	d79fec3345	Move TinyMCE logic to correspond controller	2019-07-16 15:51:44 +02:00
Anton Ignatov	1e8663548e	Add MarvinJS assets to TinyMCE	2019-07-16 13:40:54 +02:00
Anton Ignatov	3339c1fbbf	Add MarvinJS to Result and TinyMce MarvinJS refactor	2019-07-15 17:17:14 +02:00
Alex Kriuchykhin	313d2d27b9	Update repository_rows_controller.rb	2019-07-12 17:03:09 +02:00
Oleksii Kriuchykhin	1c235aafe5	Improve permissions checks for reports [SCI-3700]	2019-07-12 16:44:15 +02:00
mlorb	5bc8eb7392	Merge pull request #1921 from mlorb/ml-sci-3641 ... Fix page redirect and add success flash msg after protocols.io import [SCI-3641]	2019-07-12 15:52:40 +02:00
Anton Ignatov	ba1d6d45ca	Fix merging issues	2019-07-12 15:47:15 +02:00
Anton Ignatov	ffd415d409	Inital refactor for Assets model	2019-07-12 15:02:06 +02:00
Oleksii Kriuchykhin	6166a0dbb0	Fix file result update method [SCI-3695]	2019-07-12 14:42:04 +02:00
Anton Ignatov	57a273d5d0	Merge branch 'activestorage_migration' into features/marvinjs-integration	2019-07-12 11:34:41 +02:00
Mojca Lorber	f8afc92606	Fix page redirect and add success flash msg after protocols.io import action	2019-07-11 09:50:39 +02:00
Jure Grabnar	5eb197127f	Fix relative links in protocolsio iframe ... Closes SCI-3660	2019-07-10 19:20:40 +02:00
Oleksii Kriuchykhin	a1941a21dc	Futher refactoring of old Paperclip methods [SCI-3539]	2019-07-09 10:28:15 +02:00
mlorb	7272d838b6	Merge pull request #1875 from mlorb/ml-sci-3618 ... Remove unassign_user_from_project notification…[SCI-3618]	2019-07-08 15:23:06 +02:00
Jure Grabnar	bdd1ca2a65	Merge pull request #1908 from jbargu/jg_sci_3587 ... [SCI-3587] Endless spinner at file preview	2019-07-08 13:06:39 +02:00
Jure Grabnar	0ee0b1c834	Fix file preview not showing in modal when processing is done ... Close SCI-3587	2019-07-08 12:45:22 +02:00
Oleksii Kriuchykhin	9d926dc956	Refactor TinyMce assets, user avatars, zip files [SCI-3539]	2019-07-05 16:56:05 +02:00
Jure Grabnar	dc7fee51fa	Add Show more protocols functionality to external protocols ... Closes SCI-3646	2019-07-04 15:35:18 +02:00
Oleksii Kriuchykhin	c0c8e0e1a3	Refactor Experiment workflow images [SCI-3539]	2019-07-04 09:33:12 +02:00
Jure Grabnar	20134c9f8a	Features/protocolsio integration (#1893) ... Features/protocolsio integration	2019-07-03 17:32:20 +02:00
aignatov-bio	09dacf3be2	Fix infinite update for image annotation (#1889)	2019-07-03 15:35:49 +02:00
Miha Mencin	37cc526ac9	fix CR comments	2019-07-03 10:22:59 +02:00
Miha Mencin	74b4e0d774	SCI-3644 hide the import button and show it only on hover & when appropriate user	2019-07-02 18:24:07 +02:00
Oleksii Kriuchykhin	4ea6b56582	Fix Step and Result file previews [SCI-3539]	2019-07-01 23:30:20 +02:00
Mojca Lorber	41935a9471	Remove unassign_user_from_project notification and change code to use helper method for assignment notification generation	2019-07-01 13:44:27 +02:00
Anton Ignatov	c9ae9f056e	Merge branch 'okriuchykhin-ok_SCI_3539' into features/marvinjs-integration	2019-07-01 10:44:29 +02:00
aignatov-bio	2793777463	Features/docx report (#1873) ... * Initial setup for docx report * Add render for project, experiment, my_module * Implement converter for RTE fields * Add all report elements * fix markup * Change headers, remove empty blocks, refactored repository draw * Add smart annotations support * Fix justify fields * Prepare for addons integration * Fix markup * Add comments to GemFile * Fix TinyMCE error * Change UI for new report download selector * Fix file error in inventory cell for docx * Fix i18n object for header	2019-07-01 10:14:16 +02:00
Anton Ignatov	390002f40f	Merge branch 'ok_SCI_3539' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_3539	2019-07-01 10:12:26 +02:00
Anton Ignatov	6be227b2d3	Merge branch 'master' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration	2019-06-28 10:47:38 +02:00
Oleksii Kriuchykhin	5acb16d43e	Update Asset helper methods [SCI-3539]	2019-06-28 08:17:09 +02:00
Jure Grabnar	bc4b07cc0f	Refactor hardcoded protocol_source in SearchService	2019-06-28 02:26:31 +02:00
Jure Grabnar	d3afcbed50	Style card view on external protocols ... Closes SCI-3535	2019-06-28 00:43:05 +02:00
Urban Rotnik	9cb4454537	New implementation for attachments creation	2019-06-27 17:02:06 +02:00
Urban Rotnik	1fd0ca6795	Add steps preview	2019-06-27 16:46:02 +02:00
Urban Rotnik	2761079479	Add modal for import	2019-06-27 16:46:02 +02:00
Jure Grabnar	86bc69e510	Simplify V3 errors structure	2019-06-27 09:42:21 +02:00
Mojca Lorber	9fd83d54a0	Put network error handeling into api and refactor errors	2019-06-26 14:04:03 +02:00
aignatov-bio	83bc9eb22f	Merge pull request #1839 from aignatov-bio/ai-sci-3369-activity-for-edited-image-annotation ... Adding new activities for image editing [SCI-3369]	2019-06-24 10:31:39 +02:00
Anton Ignatov	7e5c39d3e4	Merge branch 'master' into features/marvinjs-integration	2019-06-21 14:51:45 +02:00
Alex Kriuchykhin	db7c6435b3	Merge pull request #1851 from okriuchykhin/ok_SCI_3436 ... Implement saving of attachments ordering on steps [SCI-3436]	2019-06-20 11:31:15 +02:00
Anton Ignatov	3069ec8dd2	Add check for edit permission	2019-06-20 09:43:23 +02:00
Anton Ignatov	a843a016a0	Fix markup and naming	2019-06-19 15:19:47 +02:00
Mojca Lorber	ebcaa4b014	Implement protocols.io error handling for api client and normalizer	2019-06-18 14:01:57 +02:00
Urban Rotnik	88d96c0938	Use service in controller	2019-06-17 12:24:15 +02:00
Jure Grabnar	4f6397b5b9	Add form to external_sources#new action ... Closes SCI-3532	2019-06-17 12:24:15 +02:00
Jure Grabnar	c8b8bcffdb	Add external_protocols#show action	2019-06-17 12:24:14 +02:00
Jure Grabnar	f7c6f78925	Add external_protocols#index action	2019-06-17 12:24:14 +02:00
Jure Grabnar	2a61075156	Add ExternalProtocols#create action and tests	2019-06-17 12:24:14 +02:00
Jure Grabnar	9baa66c998	Refactor OnlineSources -> ExternalProtocols	2019-06-17 12:24:13 +02:00
Jure Grabnar	eb0d677a36	Refactor pio_protocol -> built_protocol	2019-06-17 12:24:13 +02:00
Jure Grabnar	94e7fe1e6c	OnlineSourcesController skeleton and #new action tested	2019-06-17 12:24:13 +02:00
Anton Ignatov	f480c0eb8d	Adding new activtiies for image editing	2019-06-14 16:15:30 +02:00
aignatov-bio	52a2f5cd0e	Add recent protocols dropdown to task page [SCI-3417] (#1800) ... * Add recent protocols dropdown to task page	2019-06-13 15:47:29 +02:00
Alex Kriuchykhin	bc94771828	Merge pull request #1791 from okriuchykhin/ok_SCI_3461 ... Refactor the async thumbnail reloading (spinner) [SCI-3461]	2019-06-12 15:35:15 +02:00
Alex Kriuchykhin	4f851b0995	Merge pull request #1816 from aignatov-bio/ai-sci-3525-fix-nil-error-in-module-tag-controller ... Fix nil issue in tags_my_module controller [SCI-3525]	2019-06-12 13:11:40 +02:00
Oleksii Kriuchykhin	a855eade4c	Merge branch 'master' into ok_SCI_3461	2019-06-11 17:48:02 +02:00
Oleksii Kriuchykhin	6e1a7a3392	Implement saving of attachments ordering on steps [SCI-3436]	2019-06-11 10:08:33 +02:00
Alex Kriuchykhin	36255f82ed	Merge pull request #1817 from okriuchykhin/ok_SCI_3522 ... Add system notifications service to health check endpoint [SCI-3522]	2019-06-04 14:41:43 +02:00
aignatov-bio	d207cf5dce	Refactored comments over SciNote [SCI-3505] (#1808) ... * Preparing helpers for comments * Refactored comments over scinote * Update events	2019-06-04 14:40:21 +02:00
Anton Ignatov	5df55d39be	Fix nil issue in module controller	2019-05-31 16:02:21 +02:00
Oleksii Kriuchykhin	552f69b9b1	Add system notifications service to health check endpoint [SCI-3522]	2019-05-31 15:52:47 +02:00
Anton Ignatov	c9a29b12ba	Merge branch 'master' into features/marvinjs-integration	2019-05-31 10:27:14 +02:00
aignatov-bio	94b220172d	Fix empty result name issue (#1812)	2019-05-31 09:48:58 +02:00
Oleksii Kriuchykhin	5a9640c5d1	Add aditional checks for inventory state objects [SCI-3412]	2019-05-27 17:32:21 +02:00
aignatov-bio	8f2d873130	Fix error when editing office document (#1793)	2019-05-22 10:34:16 +02:00
Oleksii Kriuchykhin	84a2ad4487	Refactor the async thumbnail reloading (spinner) [SCI-3461]	2019-05-21 17:29:33 +02:00
aignatov-bio	59e824ef9e	Fix nil handling in different places [SCI-2840] (#1777) ... * Fix nil handling in different places	2019-05-21 15:53:34 +02:00
mlorb	be0393e642	Merge pull request #1785 from biosistemika/lm-ml-sci-3193 ... Update protocol status bar upon protocol changing [SCI-3193]	2019-05-21 15:28:58 +02:00
aignatov-bio	2de2ead723	Refactor avatar image appearance across Scinote [SCI-3482] (#1787) ... * Refactor avatar appearance across Scinote	2019-05-21 15:19:44 +02:00
Mojca Lorber	b479a6a145	Cover all use cases for updating protocol status bar	2019-05-20 16:09:43 +02:00
Oleksii Kriuchykhin	1128fedc51	Refactor title inline editing permission checking [SCI-3471]	2019-05-20 13:13:31 +02:00
Alex Kriuchykhin	df59c54bd4	Merge pull request #1776 from okriuchykhin/ok_SCI_3477 ... Fix protocol metadata editing in repository [SCI-3477]	2019-05-17 09:42:13 +02:00
Oleksii Kriuchykhin	488fc99dae	Fix protocol metadata editing in repository [SCI-3477]	2019-05-16 17:11:17 +02:00
Anton Ignatov	259b75a6ba	Merge branch 'master' into features/marvinjs-integration	2019-05-16 09:28:48 +02:00
aignatov-bio	24e30867da	Add smart annotation to comments [SCI-3458] (#1768) ... * Add smart annotation to comments	2019-05-15 14:59:15 +02:00
Oleksii Kriuchykhin	5b0e9872c3	Improve handling of CSRF token errors [SCI-2841]	2019-05-14 17:02:56 +02:00
Alex Kriuchykhin	e544edeaf7	Merge pull request #1758 from okriuchykhin/ok_SCI_3381 ... Fix handling of processing step attachments [SCI-3381]	2019-05-14 09:26:30 +02:00
Oleksii Kriuchykhin	4b1c4bd140	Fix handling of proccessing step attachments [SCI-3381]	2019-05-13 17:12:06 +02:00
Luka Murn	bd9ffe4bd2	Refactor WOPI filename length validation onto the model	2019-05-13 15:41:39 +02:00
Anton Ignatov	652fba0e23	Merge branch 'master-with-note-section'	2019-05-13 11:08:11 +02:00
Miha Mencin	5ff344c208	Merge pull request #1746 from biosistemika/lm-sci-3426 ... Changes to create new office file button [SCI-3426]	2019-05-13 10:55:58 +02:00
aignatov-bio	d3aa6371cd	Fix report saving [SCI-3443] (#1753) ... * Fix report saving * Fix the report saving by using the reports' structures * Remove uneccesary yarn.lock (mistake)	2019-05-13 10:55:08 +02:00
aignatov-bio	da5b24ef57	Fix attachment appearence after update (#1745)	2019-05-13 10:54:16 +02:00
Anton Ignatov	e5b4adcc25	Merge branch 'master-with-note-section' into features/marvinjs-integration	2019-05-11 20:51:01 +02:00
Luka Murn	890df8803e	Add file name validation to create new Office file modal window	2019-05-10 18:19:32 +02:00
Luka Murn	5135922254	Move the WOPI controls partial to /wopi folder, fix typo	2019-05-10 16:51:54 +02:00
Luka Murn	b78caef915	Fix the file preview modal so it supports WOPI_ENABLED == false	2019-05-10 16:41:11 +02:00
Alex Kriuchykhin	2a7f70929a	Merge pull request #1717 from okriuchykhin/ok_SCI_3368 ... Improve clean up of Export All files [SCI-3368]	2019-05-09 13:37:56 +02:00
Anton Ignatov	2e6bab4638	Fix smart anottation to protocols in repository	2019-05-09 09:40:40 +02:00
Oleksii Kriuchykhin	40550f92c9	Improve HTML data escaping in JSON endpoints [SCI-3403]	2019-05-08 17:38:24 +02:00
Anton Ignatov	565a4959b4	small fixes and improvments	2019-05-03 15:24:28 +02:00
Anton Ignatov	88e67a16c2	Merge branch 'master-with-note-section' into feature/marvinjs-integration	2019-05-02 16:16:03 +02:00
Anton Ignatov	fef691d30f	Add error handling and secutiry checks	2019-05-02 16:12:25 +02:00
Anton Ignatov	f73dd38780	Add image editor to tinymce drawings	2019-04-30 18:32:59 +02:00
Anton Ignatov	4d0d5aa014	Adding team sketches selector	2019-04-30 17:32:55 +02:00
Anton Ignatov	7c55fcf0cf	Merge branch 'master' into master-with-note-section	2019-04-30 12:07:59 +02:00
aignatov-bio	687b53feb1	Add new tag activtiies [SCI-3341] (#1712) ... * Add new tag activtiies	2019-04-30 10:23:09 +02:00
Jure Grabnar	b37349624a	Merge pull request #1714 from biosistemika/jg_sci_3380 ... Add editnew action for editing new office files [SCI-3380]	2019-04-30 09:57:07 +02:00
Jure Grabnar	ed003aca13	Add editnew action for editing new office files ... Closes SCI-3380	2019-04-30 08:19:52 +02:00
Oleksii Kriuchykhin	1b792e2b7e	Improve clean up of Export All files [SCI-3368]	2019-04-30 00:43:34 +02:00
Anton Ignatov	f80d881847	Fix markup	2019-04-28 19:11:41 +02:00
Anton Ignatov	260810fff8	Add editing mode for tinymce images	2019-04-28 16:16:31 +02:00
Anton Ignatov	193edfbc35	Add marvin js support to TinyMCE	2019-04-27 22:54:59 +02:00
Anton Ignatov	54731856f0	Finish step chemical attachments	2019-04-27 19:08:40 +02:00
Anton Ignatov	cf4ff41ec6	Add delete feature	2019-04-27 13:51:35 +02:00
Anton Ignatov	fe620c4a63	Add marvin model and controller	2019-04-26 22:59:38 +02:00
Mojca Lorber	9e04eb8ea1	Fixes upon Urbans request	2019-04-26 11:34:53 +02:00
aignatov-bio	1a860037f7	Update reports for new RTE [SCI-3263] (#1691) ... * Update reports for new RTE	2019-04-25 16:16:43 +02:00
Urban Rotnik	0cf688be39	Merge pull request #1692 from urbanrotnik/ur-sci-3135-comments-section-changes ... Comments section changes [SCI-3135]	2019-04-25 14:18:05 +02:00
aignatov-bio	84993ea3ef	Update protocol repository for new description format [SCI-3371] (#1689) ... * Update protocol repository for new description format * move image clone method to concerns	2019-04-24 13:34:56 +02:00
Urban Rotnik	774521df7a	Changes to comments section in Task Steps	2019-04-23 15:02:58 +02:00
Urban Rotnik	11a7a975af	Merge branch 'features/scinote-improvements' into master-with-note-section	2019-04-23 14:50:03 +02:00
Anton Ignatov	7d60eb5572	Fix migration issues	2019-04-23 11:11:22 +02:00
Anton Ignatov	aa2dab2014	Merge branch 'features/note-section' into master-with-note-section	2019-04-23 10:31:37 +02:00
aignatov-bio	6b45dcd475	Update eln export for new tinyMCE image format (#1680)	2019-04-19 14:44:40 +02:00
aignatov-bio	a75c4c2f91	Update Result API for new tiny mce image format (#1674)	2019-04-19 14:44:16 +02:00
Mojca Lorber	b00cf07684	Add activity for importing inventory items	2019-04-18 15:18:10 +02:00
Oleksii Kriuchykhin	f9832013b0	Improve experiment preview image generation [SCI-3177]	2019-04-17 12:06:46 +02:00
Urban Rotnik	782d1dfc2d	Merge pull request #1677 from urbanrotnik/ur-sci-3345-export-all-counter-fix-2 ... Exports left after export [SCI-3345]	2019-04-16 14:44:48 +02:00
Urban Rotnik	4f8faba84e	Exports left after export fix	2019-04-16 14:21:47 +02:00
Urban Rotnik	0ba0dccd57	Merge pull request #1675 from urbanrotnik/ur-sci-3345-export-all-counter-fix ... Fix for exports_left, fix for some edge cases [SCI-3345]	2019-04-16 10:32:31 +02:00
Urban Rotnik	22af36dd2d	Fix for exports_left, fix for some edge cases	2019-04-16 09:59:02 +02:00
Urban Rotnik	7eeba0e57e	Merge pull request #1670 from urbanrotnik/ur-sci-3343-dynamic-filtering-default-fix ... Dynamic filtering default fix [SCI-3343]	2019-04-15 11:40:16 +02:00
Urban Rotnik	83f2a5c961	Dynamic filtering default fix	2019-04-15 11:20:43 +02:00
Alex Kriuchykhin	a61d637e6d	Merge pull request #1669 from okriuchykhin/ok_SCI_3340 ... Fix crash when no activities present [SCI-3340]	2019-04-15 11:13:25 +02:00
Oleksii Kriuchykhin	a43e42fdb3	Fix crash when no activities present [SCI-3340]	2019-04-15 10:51:59 +02:00
aignatov-bio	063f02dc56	Add ability to select filters with keyboard [SCI-3200] (#1649) ... * Add ability to select fitlers with keyboard	2019-04-15 10:30:08 +02:00
aignatov-bio	8d7cc57da1	Add zoom to image annotation and check jpeg file quality before save [SCI-3300] (#1654) ... * Add zoom to image annotation and check jpeg file quality before save * Move compression to front end * Move quality extractor to paperclip processor	2019-04-15 09:49:44 +02:00
Alex Kriuchykhin	3250ab70f4	Merge pull request #1668 from okriuchykhin/ok_SCI_3292_v2 ... Switch to kaminari pagination in global activities [SCI-3292]	2019-04-12 16:04:48 +02:00
Oleksii Kriuchykhin	231106e131	Switch to kaminari pagination in global activities [SCI-3292]	2019-04-12 15:37:45 +02:00
Jure Grabnar	be90881849	Merge pull request #1665 from jbargu/jg_sci_2949_3318 ... Disable editing of office file in view mode when module is locked [SCI-2949, 3318]	2019-04-12 13:00:18 +02:00
Jure Grabnar	1e5721ce95	Disable editing of office file in view mode when module is locked ... Closes SCI-2949	2019-04-11 17:21:07 +02:00
Alex Kriuchykhin	7f20b7fa20	Merge pull request #1661 from okriuchykhin/ok_SCI_3292 ... Improve global activities pagination and fetching [SCI-3292]	2019-04-11 16:23:37 +02:00
aignatov-bio	9377628f5e	Release team space after update image [SCI-3299] (#1656) ... * Release team space after update image	2019-04-11 09:20:05 +02:00
Oleksii Kriuchykhin	d378e33038	Improve global activities pagination and fetching [SCI-3292]	2019-04-10 15:45:17 +02:00
aignatov-bio	cfbb2a83a6	Merge pull request #1650 from aignatov-bio/ai-sci-3295-update-api-endpoints-new-activities ... Update API endpoints for new activities [SCI-3295]	2019-04-10 13:46:30 +02:00
Urban Rotnik	caccf8d9f0	Reset counter for export in last 24 hours ... Fix for check if user has avaiable exports, bit refactored increas_counter method.	2019-04-10 10:56:33 +02:00
aignatov-bio	e2e299b424	Add dynamic generating filters for global activities [SCI-3228] (#1644) ... * Add dynamic generating filters * Add url methods	2019-04-09 09:08:27 +02:00
Anton Ignatov	811f07a62c	Update API endpoints for new activities	2019-04-08 15:07:45 +02:00
Jure Grabnar	d60cc2cd1c	Refactor create_wopi_file	2019-04-04 17:05:25 +02:00
Jure Grabnar	20446fb39d	Hound formatting fixes	2019-04-04 17:05:25 +02:00
Jure Grabnar	983f90ddf6	Add file name presence check	2019-04-04 17:05:25 +02:00
Jure Grabnar	b12916b828	Add main functionality	2019-04-04 17:05:25 +02:00
Jure Grabnar	613843d095	Temp commit	2019-04-04 16:58:55 +02:00
Jure Grabnar	9a4cd4fda2	Add file_present true	2019-04-04 16:57:36 +02:00
Jure Grabnar	3b8e6fa47c	Test office online	2019-04-04 16:57:36 +02:00
aignatov-bio	a1047f4597	Fix activities wording [SCI-3287] (#1635) ... * Fix activities wording * Adding project to export protocol	2019-04-04 10:45:35 +02:00
Alex Kriuchykhin	c86b535a25	Merge pull request #1638 from okriuchykhin/ok_SCI_3289 ... Improve large image saving after editing [SCI-3289]	2019-04-03 16:44:08 +02:00
Oleksii Kriuchykhin	9e91e9e59d	Improve large image saving after editing [SCI-3289]	2019-04-03 16:31:56 +02:00
Jure Grabnar	f00f4d39af	Refactor step activities using position_plus_one ... Closes SCI-3273	2019-04-03 13:10:45 +02:00
Jure Grabnar	26848ecaef	Refactor step position + 1 into a method	2019-04-03 13:07:30 +02:00
Alex Kriuchykhin	bfd275c313	Merge pull request #1632 from okriuchykhin/ok_SCI_3281 ... Fix permission checks for file editing and make protocol preview files read only [SCI-3281]	2019-04-03 11:39:59 +02:00
Jure Grabnar	6a9ef8b98d	Merge pull request #1633 from jbargu/jg_sci_3276 ... Wrap user sign_in into rescue block [SCI-3276]	2019-04-03 10:56:56 +02:00
aignatov-bio	e034a0c055	Fix bug with update protocol from repository and modal disable button [SCI-3284] (#1631) ... * Fix bug with update protocol from repository and modal disable button	2019-04-03 09:18:18 +02:00
Jure Grabnar	91820ed9c1	Wrap sign_in user into begin/rescue block ... Closes SCI-3276	2019-04-03 09:09:20 +02:00
Oleksii Kriuchykhin	c47d243b1f	Disable WOPI edit button in read only mode [SCI-3281]	2019-04-02 17:45:26 +02:00
Oleksii Kriuchykhin	ffa7c5ecb2	Fix permition checks for file editing and make protocol preview files read only [SCI-3281]	2019-04-02 16:38:53 +02:00
Anton Ignatov	94efd2e649	Fix tests	2019-04-02 16:04:50 +02:00
Urban Rotnik	86ddbc68b6	fixup! Show date actual value without link	2019-04-02 14:21:06 +02:00
Anton Ignatov	c9f9523210	Remove src when save description and rename token tag	2019-04-02 13:41:32 +02:00
Urban Rotnik	8eaeeee9f8	Show date actual value without link	2019-04-02 13:15:34 +02:00
aignatov-bio	e6102c72c7	Adding missed activities [SCI-3253] (#1614) ... * Adding missed activties * Adding test for activities	2019-04-02 11:50:37 +02:00
aignatov-bio	e93b0c3109	Adding preload filters for global activities [SCI-3254] (#1619) ... * Adding preload filter for global activities * Adding link to task activities	2019-04-02 11:14:36 +02:00
Jure Grabnar	e165459ef5	Merge pull request #1574 from jbargu/jg_sci_3149_3163 ... Valid smart annotation links of smart annotation imported within protocol [SCI-3149, 3163]	2019-04-01 14:32:54 +02:00
Mojca Lorber	3c69225d6b	Change activities for task protocols	2019-03-29 15:09:20 +01:00
Oleksii Kriuchykhin	7d4fbcb32e	Fix unconfirmed users clean-up issues [SCI-3172]	2019-03-29 11:11:53 +01:00
Alex Kriuchykhin	913bdd91be	Merge pull request #1610 from okriuchykhin/ok_SCI_3251 ... Make subject search more precise in global activities [SCI-3251]	2019-03-29 09:28:13 +01:00
aignatov-bio	b51dcc9d75	Adding children selector to global activities subjects [SCI-3247] (#1605) ... * Adding children selector to global activities subjects * Fix naming, add seperate check for project id	2019-03-29 09:26:27 +01:00
Alex Kriuchykhin	88b4ca0798	Merge pull request #1609 from okriuchykhin/ok_SCI_3213 ... Fix role name in change user role in team activity [SCI-3213]	2019-03-28 17:32:51 +01:00
Alex Kriuchykhin	9137740266	Merge pull request #1607 from okriuchykhin/ok_SCI_3229 ... Fix links for archived objects in global activities [SCI-3229][SCI-3241]	2019-03-28 17:32:24 +01:00
Oleksii Kriuchykhin	58af23e9b5	Make subject search more precise in global activities [SCI-3251]	2019-03-28 17:03:05 +01:00
Oleksii Kriuchykhin	6bc944fcc7	Fix role name in change user role in team activity [SCI-3213]	2019-03-28 16:26:07 +01:00
Oleksii Kriuchykhin	d7d45bec70	Fix links for archived objects in global activities [SCI-3229]	2019-03-28 13:43:50 +01:00
mlorb	5f663b3c74	Merge pull request #1600 from mlorb/ml-sci-3215 ... Implement missing tests for global activities [SCI-3215][SCI-3219]	2019-03-28 11:10:38 +01:00
aignatov-bio	08263ab64e	adding filters for task activities [SCI-3076] (#1553) ... * update task activity screen	2019-03-28 10:55:48 +01:00
aignatov-bio	8416d1ab1c	Merge branch 'master' into ai-sci-3239-add-localization-team-for-objects	2019-03-28 09:13:34 +01:00
Jure Grabnar	07609d34c8	User/teams are now alphabetically listed	2019-03-27 15:34:01 +01:00
Anton Ignatov	3676aeb83c	Adding localization to subjects group name in filters	2019-03-27 15:30:04 +01:00
Mojca Lorber	f06358b2ae	Implement missing tests for global activities (task and protocol activities)	2019-03-27 11:24:44 +01:00
Oleksii Kriuchykhin	dab75d5aec	Fix duplicated projects in new report modal [SCI-3173]	2019-03-26 17:24:30 +01:00
Oleksii Kriuchykhin	2ff43a3320	Change filtering logic when no filters are selected [SCI-3223]	2019-03-26 16:04:03 +01:00
Alex Kriuchykhin	935e3a65cf	Merge pull request #1586 from okriuchykhin/ok_SCI_3199 ... Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][SCI-3225]	2019-03-26 16:02:44 +01:00
Miha Mencin	9a30d7be9d	SCI-3232 renaming the attribute name so it doesnt get 'constantized'	2019-03-26 11:39:54 +01:00
Oleksii Kriuchykhin	e3a3ec4491	Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][3225]	2019-03-25 17:38:13 +01:00
Miha Mencin	4a87216a3d	Merge branch 'master' into features/global-activities	2019-03-25 14:35:24 +01:00
aignatov-bio	9fff93ab0e	Merge pull request #1576 from biosistemika/image-editor-prototype ... Feature/Image annotation	2019-03-22 16:31:00 +01:00
Anton Ignatov	65521533b4	change js.erb to js	2019-03-22 13:35:11 +01:00
Anton Ignatov	4ec0a3c871	Update TinyMCE image loader for new fields	2019-03-22 10:52:26 +01:00
Anton Ignatov	bc58f0aecd	Merge branch 'features/note-section' into ai-sci-3131-improve-image-file-upload	2019-03-21 11:48:51 +01:00
Mojca Lorber	c55e314ed5	Refactor upon the review requests	2019-03-20 21:34:47 +01:00
Anton Ignatov	55c93922ea	markup fixes	2019-03-20 14:46:54 +01:00
Anton Ignatov	07c2819163	refactoring tinymce image uploading	2019-03-20 14:46:54 +01:00
Oleksii Kriuchykhin	0c2b7959b6	Fix smart annotations in RTE [SCI-3111]	2019-03-20 11:41:36 +01:00
Mojca Lorber	4f9814b884	Merge branch 'features/global-activities' of github.com:biosistemika/scinote-web into ml-sci-3021	2019-03-20 11:03:00 +01:00
Jure Grabnar	cf5505d95f	Add missing inventory name in notification ... Closes SCI-3149	2019-03-20 10:52:58 +01:00
Anton Ignatov	29b67be127	Fix team selection in global activities and add link from navbar	2019-03-20 10:33:22 +01:00
Mojca Lorber	cd7a87348f	Protocol activities refactoring, without tests	2019-03-19 16:12:07 +01:00
Mojca Lorber	c476816359	Task activities refactoring, without tests	2019-03-19 15:33:57 +01:00
Mojca Lorber	7757096693	Results activities refactoring	2019-03-19 15:33:57 +01:00
Mojca Lorber	1418abc8d7	Reports activities refactoring	2019-03-19 15:33:57 +01:00
Mojca Lorber	d1e38e5bc9	Project activities refactoring	2019-03-19 15:33:57 +01:00
Mojca Lorber	70eebca5ee	experiment activities refactoring	2019-03-19 15:33:57 +01:00
aignatov-bio	6eae12efab	Updating permission check for image editing [SCI - 3153, 3159] (#1568) ... *Add permission check for assets editing * Add check for image format	2019-03-19 13:52:57 +01:00
Anton Ignatov	f606210652	Rubocop fix	2019-03-19 13:52:03 +01:00
Anton Ignatov	87280f083a	[SCI-3166] Finalize global activities front end	2019-03-19 13:50:55 +01:00
aignatov-bio	a0a3c4b97f	Fix file format bug (#1569)	2019-03-19 11:06:36 +01:00
Oleksii Kriuchykhin	0c71493fdb	Add viewing permissions for global activities [SCI-2997]	2019-03-18 15:38:19 +01:00
Urban Rotnik	5dccdbab17	fixup! Fix failing tests	2019-03-15 11:12:10 +01:00
Urban Rotnik	2ea2700837	fixup! Fix failing tests	2019-03-15 10:30:51 +01:00
Oleksii Kriuchykhin	a822227383	Add rich text editor to task and protocol description [SCI-3062][SCI-3071]	2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin	645930b8d7	Merge branch 'master' into features/note-section	2019-03-14 16:25:51 +01:00
Urban Rotnik	b6a8556601	Add activities for exporting Projects, Inventory items	2019-03-12 09:15:06 +01:00
Urban Rotnik	e7b57aa4f7	Add creating activities for Team actions	2019-03-12 09:15:06 +01:00
Urban Rotnik	3f18166320	Add Task and TaskTags activities	2019-03-12 09:15:06 +01:00
Urban Rotnik	7a05e817ef	Add new Protocol steps activities	2019-03-12 09:15:06 +01:00
Urban Rotnik	b33e95e18a	New Protocols actions logging	2019-03-12 09:14:53 +01:00
Urban Rotnik	cfe2888bea	Repository columns actions loggin	2019-03-12 09:11:00 +01:00
Urban Rotnik	32422c00eb	RepositoryRows actions loggin	2019-03-12 09:11:00 +01:00
Urban Rotnik	2a7bbac733	Repository actions logging	2019-03-12 09:11:00 +01:00
Urban Rotnik	976831e7d3	Edit and Archive experiment activity logging	2019-03-12 09:11:00 +01:00
Oleksii Kriuchykhin	feb75f62e1	Add workaround for image caching in fabric js [SCI-2855]	2019-03-11 15:10:32 +01:00
Oleksii Kriuchykhin	80e525fd97	Improve image editor behaviour [SCI-2855]	2019-03-11 15:09:49 +01:00
Oleksii Kriuchykhin	89e968c410	Add tui.image-editor [SCI-2815]	2019-03-11 15:08:15 +01:00
Urban Rotnik	9ed3313f0f	Create project activity refactored	2019-03-11 08:36:15 +01:00
Jure Grabnar	eceda4909f	Move edit_file permission for wopi file in a special function ... Used for overwritting it in addons. Closes SCI-2949	2019-03-08 12:22:35 +01:00
aignatov-bio	ec2dbb897f	Adding side pane filter and top pane tags [SCI - 3008, 3009, 3010, 3011, 3012, 3018, 3019, 3020] (#1521) ... * Adding side pane filtering and top pane	2019-03-06 10:34:04 +01:00
aignatov-bio	125d2a3b9b	New inline tags editing in task [SCI 3093] (#1529) ... * Adding inline tags selection	2019-03-06 09:18:45 +01:00
aignatov-bio	b1df8c9aa7	Adding inline editing to experiment title, project title and task title [SCI-3059] (#1524) ... * Adding inline editing to experiment title, project title and task title	2019-03-06 09:17:34 +01:00
Miha Mencin	9807c80286	move the create action to the tope section of controller	2019-03-05 10:49:36 +01:00
Miha Mencin	67fe486874	put the scheduling logic into session create action	2019-03-05 10:43:39 +01:00
Miha Mencin	fa7bba9de7	scheduling creation of demo project at the sign in time ... remove wrong schema, fix comment, add migration	2019-03-04 18:26:15 +01:00
Miha Mencin	844303ae7c	SCI-3119 schedule the creaton of template	2019-03-01 17:47:04 +01:00
Oleksii Kriuchykhin	61147b480c	Add main global activities bussiness logic [SCI-3014]	2019-02-26 11:01:15 +01:00
Urban Rotnik	3ad6cee766	Fix tests, remove nullable field	2019-02-25 16:50:38 +01:00
Miha Mencin	76c3db0b11	added layout, added css, added select2 lib, WIP	2019-02-25 16:50:38 +01:00
Miha Mencin	bcd0b433b6	Merge pull request #1514 from biosistemika/features/system-notifications ... Features/system notifications	2019-02-21 16:38:58 +01:00
aignatov-bio	5f78d83f9c	Changing status from unread to read system notification is not correct one [SCI-3077 and SCI-3075] (#1513) ... * fix dropdown apperance * Remove search and fix duplicate bug * Fix specs for new method	2019-02-21 16:15:13 +01:00
aignatov-bio	fcdb4e7a92	Merge pull request #1500 from biosistemika/features/system-notifications ... Features/system notifications	2019-02-19 13:51:18 +01:00
aignatov-bio	8e905b67b2	System notification navbar menu drop down [SCI 2955] (#1498) ... * Add dropdown menu and icon for system notifications * Finish system notification dropdown menu and add tests	2019-02-19 11:08:59 +01:00
aignatov-bio	c598541e09	System notification modal window [SCI-2957 and SCI-2958] (#1484) ... * Added new system notification modal * Adding loading system notification on sign in	2019-02-15 13:07:29 +01:00
mlorb	71e4cc4dbd	Merge branch 'master' into ml-sci-2940	2019-02-13 14:35:03 +01:00
aignatov-bio	5c85595ab4	System Notifications - View All Page [SCI-2956 and SCI-3001] (#1482) ... * System notification view and notification partial (SCI 2956 and SCI 3001)	2019-02-13 13:06:14 +01:00
Oleksii Kriuchykhin	3376fd012c	Improve error loggin in protocol import [SCI-3023]	2019-02-07 14:00:24 +01:00
Urban Rotnik	6f7fcb0831	Refactor method clone_experiment_as_template into service object ... [SCI-2925]	2019-01-31 07:13:40 +01:00
mz3944	2ae56eb13f	Merge pull request #1448 from mz3944/mz-SCI-2929 ... Can not switch team [SCI-2929]	2019-01-31 04:43:39 +01:00
Urban Rotnik	4cf12d12d1	Refactor 'move_experiment' method into service object ... Jira Ticket: SCI-2926	2019-01-28 11:45:36 +01:00
Urban Rotnik	16e9a56874	Add recaptcha to invitation modal ... SCI-2935	2019-01-25 11:27:01 +01:00
Urban Rotnik	247bae8a9f	Refactor export_all_counter increasing/reseting logic ... - Remove daily task - Add method to user Model	2019-01-25 11:16:31 +01:00
Mojca Lorber	fa1dff6352	refactor Demo project generation	2019-01-24 13:40:53 +01:00
mz3944	f6c8af105d	Merge pull request #1434 from mz3944/mz-SCI-2903 ... Fix (unite) Date and Time display formats [SCI-2903]	2019-01-21 09:50:34 +01:00
Miha Mencin	0766ee96a7	Merge pull request #1447 from okriuchykhin/ok_SCI_2875_v2 ... Fix task tags update on canvas cards [SCI-2875]	2019-01-16 12:44:50 +01:00
Oleksii Kriuchykhin	3a4b992f4e	Code style fixies []SCI-2875]	2019-01-14 16:31:23 +01:00
Matej Zrimšek	a5c1cf4450	Switch user's team if he's no longer a member of the currently selected one	2019-01-12 23:39:31 +01:00
Oleksii Kriuchykhin	89240659a7	Fix task tags update on canvas cards [SCI-2875]	2019-01-11 17:20:39 +01:00
Alex Kriuchykhin	b530cea771	Merge pull request #1438 from okriuchykhin/ok_SCI_2776 ... Add counters to task inventories dropdown [SCI-2776]	2019-01-11 16:27:22 +01:00
Oleksii Kriuchykhin	132f46b136	Improve error handling in task inventories dropdown [SCI-2776]	2019-01-10 21:11:20 +01:00
Matej Zrimšek	8070b7f8b5	Fix Date and Time display formats on JS side	2019-01-08 08:07:24 +01:00
Oleksii Kriuchykhin	534866467b	Add counters to task inventories dropdown [SCI-2776]	2019-01-03 14:11:00 +01:00
Oleksii Kriuchykhin	2769add4d9	Disable edit button for unsupported WOPI formats [SCI-2904]	2018-12-31 18:10:12 +01:00
Alex Kriuchykhin	8a348b8504	Merge pull request #1422 from okriuchykhin/ok_SCI_2910 ... Improve rendering speed of inventory table [SCI-2910]	2018-12-16 19:45:29 +01:00
Oleksii Kriuchykhin	d5c07fd22a	Improve rendering speed of inventory table [SCI-2910]	2018-12-13 16:17:22 +01:00
Oleksii Kriuchykhin	311189a2e9	Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894]	2018-12-13 11:18:09 +01:00
Alex Kriuchykhin	4e416fe81b	Merge pull request #1404 from okriuchykhin/ok_SCI_2822 ... Return task inputs/outputs as references [SCI-2822]	2018-12-12 11:36:39 +01:00
mlorb	3f79cc5f93	Merge pull request #1418 from mlorb/ml-sci-2905 ... Fix due date can not be set [SCI-2905]	2018-12-12 11:27:57 +01:00
mlorb	426fadc10a	Fix due date can not be set	2018-12-11 10:31:13 +01:00
mlorb	4040b31143	Fix behavior when user has no teams	2018-12-10 15:42:05 +01:00
Alex Kriuchykhin	37db41e18e	Merge pull request #1405 from okriuchykhin/ok_SCI_2881 ... Refresh sidebar when project is archived/restored [SCI-2881]	2018-12-10 14:11:34 +01:00
Oleksii Kriuchykhin	2c96f08b98	Refresh sidebar when project is archived/restored [SCI-2881]	2018-11-29 14:20:20 +01:00
Oleksii Kriuchykhin	5b566b48ae	Improve error messages and fix task users/items endpoints [SCI-2886]	2018-11-28 14:14:45 +01:00
Oleksii Kriuchykhin	b3a377f949	Return task inputs/outputs as references [SCI-2822]	2018-11-28 11:33:00 +01:00
Alex Kriuchykhin	20e2cbf0ca	Merge pull request #1391 from okriuchykhin/ok_SCI_2880 ... Fix smart annotations rendering issues [SCI-2880]	2018-11-28 09:47:20 +01:00
mlorb	398c2f0576	Merge pull request #1392 from mlorb/ml-sci-2676 ... Hide sign-in with third party applications (e.g. LinkedIn) in Oauth… [SCI-2676]	2018-11-27 11:06:45 +01:00
mlorb	0b6b3b3609	code simplify	2018-11-27 10:58:51 +01:00
Oleksii Kriuchykhin	d67abfda2c	Additional fixies for smart annotations [SCI-2880]	2018-11-26 15:17:18 +01:00
Jure Grabnar	7812f70c2f	Merge pull request #1393 from jbargu/jg_2790_protocolsio_fix ... Protocols - import from protocols.io doesn't work	2018-11-26 14:56:25 +01:00
mlorb	18d9ab5888	fixes upon @Ducz0r request	2018-11-26 14:23:26 +01:00
Jure Grabnar	6ec2c99a28	Hound styling	2018-11-26 13:52:01 +01:00
Jure Grabnar	0086e4dcf3	Catch some of templates error when import protocols.io	2018-11-26 13:43:05 +01:00
Jure Grabnar	1c7a051551	Catch all errors on PIO import and show message	2018-11-23 20:47:48 +01:00
mlorb	f61187dd18	Hide sign-in with third party applications (e.g. LinkedIn) in Oauth flows	2018-11-23 15:44:04 +01:00
Oleksii Kriuchykhin	5deaf25fd9	Prevent user being added to project/task multiple times [SCI-2869]	2018-11-20 14:29:33 +01:00
Alex Kriuchykhin	a6bc02a2cb	Merge pull request #1369 from okriuchykhin/ok_SCI_2830 ... Refactor result and step comments [SCI-2830]	2018-11-20 00:13:15 +01:00
mlorb	3b96a60938	Merge pull request #1374 from mlorb/ml-sci-2842 ... Update the Export all confirmation modal and export interaction [SCI-2842]	2018-11-19 11:36:08 +01:00
Alex Kriuchykhin	d524a1d508	Merge pull request #1364 from okriuchykhin/ok_SCI_2778 ... Add time format selection to settings [SCI-2778]	2018-11-19 10:17:09 +01:00
mlorb	4b540958bd	change close/cancel button and refactor export_project_modal endpoint	2018-11-16 13:37:32 +01:00
mlorb	6453ab6fb1	update the Export all confirmation modal and export interaction	2018-11-15 15:53:58 +01:00
Luka Murn	e9c0b34662	Merge branch 'core-api' into 'master' ... Conflicts: Gemfile app/services/api.rb config/initializers/api.rb config/initializers/extends.rb config/routes.rb db/schema.rb spec/controllers/api/api_controller_spec.rb	2018-11-14 16:59:04 +01:00
Oleksii Kriuchykhin	3fd687161f	Remove unused variables from activities controller [SCI-2778]	2018-11-14 13:17:38 +01:00
Oleksii Kriuchykhin	537de596a7	Merge latest master [SCI-2778]	2018-11-14 13:05:57 +01:00
Luka Murn	c0940b143a	Fix root page bug introduced with merge features/core-api -> master	2018-11-13 21:24:20 +01:00
Oleksii Kriuchykhin	fb309a12b9	Refactor result and step comments initialization [SCI-2830]	2018-11-13 16:57:42 +01:00
Luka Murn	84df2c81f9	Merge branch 'features/export-all' ... Conflicts: app/controllers/experiments_controller.rb app/controllers/my_modules_controller.rb db/schema.rb	2018-11-13 09:14:02 +01:00
Oleksii Kriuchykhin	e89d60785f	Fix dates on activities and experiments [SCI-2778]	2018-11-12 10:26:48 +01:00
Oleksii Kriuchykhin	8d0dbc7076	Add time format selection to settings [SCI-2778]	2018-11-09 16:19:40 +01:00
mlorb	75875e5421	fix user_project manage permission	2018-11-09 11:36:44 +01:00
mlorb	a56d22a329	change count to size	2018-11-08 09:43:32 +01:00
Oleksii Kriuchykhin	23ee4760ae	Fix failing tests [SCI-2773]	2018-11-07 16:39:00 +01:00
Oleksii Kriuchykhin	30885e060d	Merge latest core-api branch [SCI-2773]	2018-11-07 15:53:21 +01:00
Oleksii Kriuchykhin	60e78fa868	Improve code style for error handling [SCI-2773]	2018-11-07 15:43:44 +01:00
mlorb	4d156080ac	fix empty projects page bug and projects tree bug	2018-11-07 13:45:46 +01:00
mlorb	ad5f4c2ebb	Merge pull request #1356 from mlorb/ml-sci-remove-protocol-show-endpoint ... Remove show protocol api endpoint	2018-10-30 14:04:17 +01:00
Alex Kriuchykhin	2f466383a5	Merge pull request #1333 from okriuchykhin/ok_SCI_2742 ... RESTful API for Object Querying (READ) - unit tests [SCI-2742]	2018-10-29 16:26:58 +01:00
Alex Kriuchykhin	126fa03305	Merge pull request #1349 from okriuchykhin/ok_SCI_2818 ... Fix project index endpoint permission bug [SCI-2818]	2018-10-29 14:59:22 +01:00
Alex Kriuchykhin	1083ce61fb	Merge pull request #1352 from okriuchykhin/ok_SCI_2814 ... Rename user_id to sub in JWT [SCI-2814]	2018-10-29 14:54:00 +01:00
mlorb	0f8c80172e	remove show protocol api endpoint	2018-10-29 11:21:48 +01:00
mz3944	d733f4e357	Merge pull request #1346 from mz3944/mz-SCI-2787 ... In project list table table is not updated when archiving/restoring project [SCI-2787]	2018-10-28 14:36:17 +01:00
Oleksii Kriuchykhin	04ff5870af	Rename user_id to sub in JWT [SCI-2814]	2018-10-28 14:34:51 +01:00
Jure Grabnar	0977f5251d	Merge pull request #1351 from jbargu/jg_add_zero_limit_to_export ... Fix zero limit config on export all	2018-10-28 13:38:21 +01:00
Jure Grabnar	cab0b78afa	Fix zero limit config on export all	2018-10-28 09:43:34 +01:00
Oleksii Kriuchykhin	9ad2718f32	Fix project index endpoint permission bug [SCI-2818]	2018-10-26 16:46:01 +02:00
Oleksii Kriuchykhin	93e7c3f390	Fix inventory column creation permission check [SCI-2782]	2018-10-26 14:38:47 +02:00
Jure Grabnar	7d2f2c3b5f	Merge pull request #1337 from jbargu/jg_bug_sci_2805 ... Add can_export_project? permission to allow archived projects to be exported [SCI-2805]	2018-10-26 11:23:57 +02:00
Matej Zrimšek	18e52e2c6f	Fix fetching all user projects [SCI-2787]	2018-10-24 00:29:30 +02:00
Oleksii Kriuchykhin	b53f2c8347	Improve error messages in API [SCI-2773]	2018-10-23 17:52:48 +02:00
Jure Grabnar	bd5a2a43fd	Add can_export_project? permission ... Closes [SCI-2805].	2018-10-19 08:41:39 +02:00
Alex Kriuchykhin	18b1cad8a4	Merge pull request #1334 from okriuchykhin/ok_SCI_2772 ... Implement inventory column data type name mappings [SCI-2772]	2018-10-17 10:37:23 +02:00
Oleksii Kriuchykhin	e4e66d3e5d	Merge branch 'core-api' into ok_SCI_2742	2018-10-16 17:38:30 +02:00
Oleksii Kriuchykhin	02f536cd08	Merge latest features/export-all [SCI-2733]	2018-10-16 17:20:19 +02:00
Oleksii Kriuchykhin	ed46115b3f	Implement inventory column data type name mappings [SCI-2772]	2018-10-16 15:35:02 +02:00
Oleksii Kriuchykhin	f6b039d54e	Merge latest core-api branch [SCI-2765]	2018-10-16 12:07:47 +02:00
Jure Grabnar	ed16e8d479	Fix reviewers errors	2018-10-16 11:00:38 +02:00
Jure Grabnar	26df1e5a98	Add export project modal ... Closes [SCI-2645]	2018-10-16 11:00:38 +02:00
Oleksii Kriuchykhin	0db9ef44e2	Add experiment, task, result READ endpoints tests [SCI-2742]	2018-10-15 16:27:22 +02:00
Luka Murn	1093ea11f4	Merge branch 'lm-api-fixes' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-api-fixes ... Conflicts: app/serializers/api/v1/activity_serializer.rb app/serializers/api/v1/inventory_column_serializer.rb app/serializers/api/v1/project_serializer.rb	2018-10-15 15:20:26 +02:00
Oleksii Kriuchykhin	f221d71bbc	Fix datatables state restore [SCI-2733]	2018-10-12 15:15:43 +02:00
Luka Murn	a217b11bba	Merge pull request #1298 from Zanz2/zz_projects_api_task_2539 ... Created read endpoint for projects and related models [SCI-2539]	2018-10-11 09:03:18 +02:00
Luka Murn	dd4f7b5d02	Fix project users, activities, comments, reports endpoints	2018-10-10 17:35:09 +02:00
Oleksii Kriuchykhin	af02f29fb5	Implement user state saving for projects overview [SCI-2733]	2018-10-10 16:15:31 +02:00
Alex Kriuchykhin	16b29b50a5	Merge pull request #1321 from okriuchykhin/ok_SCI_2731 ... Add Projects view - list/table view [SCI-2731]	2018-10-08 17:53:35 +02:00
Oleksii Kriuchykhin	77e2371091	Add tests for inventory cell endpoints [SCI-2765]	2018-10-08 13:25:03 +02:00
Luka Murn	a8d56d32e2	Hound is love, Hound is life	2018-10-07 13:28:29 +02:00
Luka Murn	7527dc7352	Fix READ index, READ show, POST create /tasks/:id/results endpoints	2018-10-07 12:58:17 +02:00
Luka Murn	fc5cf33614	Fix GET /tasks/:id/activities endpoint	2018-10-07 11:54:11 +02:00
Luka Murn	fca580face	Fix GET /tasks/:id/inputs, GET /tasks/:id/outputs endpoints	2018-10-07 11:35:12 +02:00
Luka Murn	239b974fa0	Fix GET /tasks/:tid/protocols, GET /tasks/:tid/protocols/:id endpts	2018-10-07 11:29:56 +02:00
Luka Murn	24299ef4c0	Fix GET /tasks/:task_id/tags, GET /tasks/:task_id/tags/:id endpts	2018-10-07 11:10:41 +02:00
Luka Murn	98544f00e8	Fix GET /tasks/:task_id/users, GET /tasks/:task_id/users/1 endpts	2018-10-07 10:20:01 +02:00
Luka Murn	94e80edc9b	Minor variable rename in task_groups_controller.rb	2018-10-07 10:16:00 +02:00
Luka Murn	f56e5b1e5a	Update GET /task/:task_id/items, GET /task/:task_id/items/:id endpts	2018-10-07 10:07:37 +02:00
Luka Murn	0de3c7eb4e	Update GET /tasks, GET /tasks/:id endpoints, refactor routes.rb	2018-10-07 09:45:24 +02:00
Luka Murn	0643ba216e	Fix GET /connections, /connections/:id endpoints	2018-10-07 00:53:39 +02:00
Luka Murn	c9a15db85f	Fix GET /task_groups endpoints	2018-10-06 20:11:01 +02:00
Luka Murn	d235dd7807	Update GET /inventory_items, GET /inventory_items/:id endpoints	2018-10-06 18:37:40 +02:00
Luka Murn	9e78de6ef2	Update CREATE, PATCH, DELETE inventory_column endpoints	2018-10-06 17:11:59 +02:00
Luka Murn	6625b4019e	Update GET /inventory_columns, GET /inventory_columns/:id endpts	2018-10-06 13:47:41 +02:00
Luka Murn	eaa8a627a8	Update GET /inventories, GET /inventories/:inventory_id endpoints	2018-10-06 12:39:44 +02:00
Luka Murn	6faaff550b	Update GET /teams, GET teams/:team_id endpoints slightly	2018-10-06 12:18:57 +02:00
Jure Grabnar	d7c875135e	Merge pull request #1304 from jbargu/jg_zipfile_structure ... Create zipfile structure for export all, implement inventory CSV for export [SCI-2640] [SCI-2642] [SCI-2643] [SCI-2644]	2018-10-05 15:36:56 +02:00
Oleksii Kriuchykhin	0c452f519d	Add CRUD endpoints for inventory cells [SCI-2765]	2018-10-05 00:18:42 +02:00
Oleksii Kriuchykhin	363c1e4a34	Add endpoints for managing inventory list items [SCI-2741]	2018-10-03 13:54:52 +02:00
Oleksii Kriuchykhin	492a5de19e	Add Projects view - list/table view [SCI-2731]	2018-10-01 15:39:42 +02:00
Oleksii Kriuchykhin	2508394924	Refactor Projects view - cards view [SCI-2730]	2018-09-27 10:43:44 +02:00
Zanz2	2e0c40ed45	fixed merge	2018-09-26 12:20:13 +02:00
Zanz2	c8ed808920	merged with core-api	2018-09-26 12:17:49 +02:00
Zanz2	1a512698e8	Merge pull request #1286 from Zanz2/zz_search_page_update_bug_sci2684_v2 ... ( better solution ) Search page results from different teams than active not switching active team on click [SCI-2684]	2018-09-26 12:04:09 +02:00
Alex Kriuchykhin	112343e65d	Merge pull request #1311 from okriuchykhin/ok_SCI_2738 ... Improve delayed jobs for TempFile deletion and Asset text extraction [SCI-2738]	2018-09-25 11:49:19 +02:00
Oleksii Kriuchykhin	e06684b7cf	Few fixes after review [SCI-2718]	2018-09-24 18:10:37 +02:00
Oleksii Kriuchykhin	ab3aeac26b	Merge latest core-api branch [SCI-2718]	2018-09-24 16:49:27 +02:00
Luka Murn	2396149c57	Merge pull request #1273 from Zanz2/zz_tooltip_settings_enable_sci2663 ... Added toggle checkbox for tooltips help in prefferences [SCI-2663]	2018-09-24 16:23:28 +02:00
Zanz2	8699761389	Merge pull request #1297 from Zanz2/zz_tasks_api_task_2667 ... Created read endpoint for tasks, results and related data [SCI-2667] [SCI-2669]	2018-09-24 15:31:47 +02:00
Zanz2	e5b7d68031	this should fix travis ci	2018-09-24 13:33:44 +02:00
Zanz2	1e8442e22e	fixed pull request review, forgot some small thing	2018-09-24 12:50:11 +02:00
Zanz2	1a9890ee0f	fixed pull request review	2018-09-24 12:48:53 +02:00
Alex Kriuchykhin	b38e85c282	Merge pull request #1301 from okriuchykhin/ok_SCI_2693_v2 ... Fix CREATE inventory endpoint [SCI-2693]	2018-09-24 10:51:13 +02:00
Jure Grabnar	872a1211bb	Format according to Houndbot #3	2018-09-23 18:58:56 +02:00
Jure Grabnar	d6f7ec2604	Format according to houndbot #2	2018-09-23 18:53:43 +02:00
Jure Grabnar	869967361c	Fix according to Houndbot	2018-09-23 18:48:44 +02:00
Jure Grabnar	59169f882d	Add permission check for every project	2018-09-23 14:34:21 +02:00
Jure Grabnar	90b220ddda	Format according to Houndbot #4	2018-09-23 12:06:06 +02:00
Oleksii Kriuchykhin	7f7ece2be0	Improve delayed jobs for TempFile deletion and Asset text extraction [SCI-2738]	2018-09-21 17:46:18 +02:00
Oleksii Kriuchykhin	84428b37c2	Add project view JSON endpoints [SCI-2728]	2018-09-21 10:39:20 +02:00
Luka Murn	5d6881bae1	Merge pull request #1309 from biosistemika/release-1.14.5 ... Merge release-1.14.5 into master	2018-09-20 08:53:51 +02:00
Oleksii Kriuchykhin	872a48082a	Remove Samples from search controller [SCI-2739]	2018-09-18 15:03:19 +02:00
Jure Grabnar	449aa12070	Refactor TeamZipExport code (move it into special file)	2018-09-16 20:28:26 +02:00
Oleksii Kriuchykhin	49e788a9ad	Mergre latest core-api [SCI-2515]	2018-09-14 10:24:05 +02:00
Oleksii Kriuchykhin	acc00ff3b9	Add CREATE Result endpoint: Create Text result [SCI-2718]	2018-09-13 13:38:11 +02:00
Zanz2	8ac1445ace	Fixed hound	2018-09-13 11:37:07 +02:00
Zanz2	7f704c07e3	Created base endpoints for projects and related models	2018-09-13 11:37:07 +02:00
Zanz2	dace81f724	created base projects endpoint	2018-09-13 11:37:07 +02:00
Zanz2	bd49ea56c5	Added results endpoint	2018-09-13 11:16:34 +02:00
Zanz2	426bd129cc	Added task inputs and outputs functionality	2018-09-13 11:14:22 +02:00
Oleksii Kriuchykhin	9d9a5d07d8	Fix CREATE inventory endpoint [SCI-2693]	2018-09-13 11:08:58 +02:00
Zanz2	2519a010f6	Created new controllers and serializers for nested task related attributes	2018-09-13 11:04:52 +02:00
Zanz2	765ee25853	Merge pull request #1292 from Zanz2/zz_experiments_api_task_2666 ... Created API endpoints for experiments and related data [SCI-2666]	2018-09-13 10:49:49 +02:00
Zanz2	1159ce519c	Review changes	2018-09-13 09:25:16 +02:00
Luka Murn	0b68a670c2	Fix the inventory_columns_controller#create action ... Based on unit tests, fix the create inventory columns endpoint to work as intended. Also add another unit test case.	2018-09-12 13:44:10 +02:00
Zanz2	4c2c92445c	fixed oversight, added paging to connections	2018-09-11 13:07:28 +02:00
Zanz2	7cb50145a0	Merge pull request #1275 from Zanz2/zz_adding_removing_table_sci2621 ... Fixed table add and remove crash [SCI-2621]	2018-09-11 09:37:07 +02:00
Zanz2	e64aee5db0	Completed the functionality for experiments and related endpoints	2018-09-07 11:58:02 +02:00
Zanz2	1589cfb1b2	saving work	2018-09-06 15:38:48 +02:00
Luka Murn	586a442abc	Refactor the settings page, rename setting to tooltips_enabled	2018-09-05 16:36:32 +02:00
Zanz2	f9d55f913a	trying to fix display of my modules data	2018-09-05 12:54:08 +02:00
Zanz2	5ada21725f	inital experiments api functionality	2018-09-05 09:55:04 +02:00
Zanz2	1bed2c2a3c	Partially fixed according to pull request review, added comments to code review	2018-08-31 12:11:51 +02:00
Zanz2	d4aa5e60a2	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zz_tooltip_settings_enable_sci2663 ... Merging to update db, so i dont have to docker-clean my whole environment 2 times to switch between this branch and up to date ones	2018-08-31 11:42:26 +02:00
Zanz2	728b1fe491	Reverted deleted lines by accident	2018-08-28 14:51:05 +02:00
Zanz2	b26530a02f	Found a new, and more elegant fix inside controller with Luka	2018-08-28 14:48:23 +02:00
Alex Kriuchykhin	18dfeb537b	Merge pull request #1269 from okriuchykhin/ok_SCI_2604 ... Improve health check endpoint [SCI-2604]	2018-08-24 16:55:47 +02:00
Oleksii Kriuchykhin	4d49671ae8	Add CRUD for inventories and columns [SCI-2690][SCI-2691][SCI-2692][SCI-2693][SCI-2694][SCI-2695]	2018-08-24 16:41:26 +02:00
Oleksii Kriuchykhin	c8efa4bffc	Add SHOW, UPDATE and DELETE inventory item endpoints [SCI-2688][SCI-2689]	2018-08-24 15:48:49 +02:00
Oleksii Kriuchykhin	5488fc66fc	Refactor JSON API mime type registration [SCI-2687]	2018-08-24 15:37:23 +02:00
Oleksii Kriuchykhin	490376513b	Add inventory item CREATE endpoint [SCI-2687]	2018-08-24 15:36:19 +02:00
Oleksii Kriuchykhin	c8abb3d9b8	Add user_identities CRUD endpoints, make API V1 togglable [SCI-2664][SCI-2686]	2018-08-24 15:27:59 +02:00
Alex Kriuchykhin	eb2d3e7951	Merge pull request #1276 from okriuchykhin/ok_SCI_2613 ... Add READ user endpoint [SCI-2613]	2018-08-24 15:23:05 +02:00
Alex Kriuchykhin	427ab5fb41	Merge pull request #1264 from okriuchykhin/ok_SCI_2615 ... Add GET inventory columns API endpoint [SCI-2615]	2018-08-24 15:22:35 +02:00
Alex Kriuchykhin	1832c0e806	Merge pull request #1262 from okriuchykhin/ok_SCI_2614 ... Add read inventories and inventory items endpoints [SCI-2614][SCI-2616][SCI-2617]	2018-08-24 15:22:13 +02:00
Alex Kriuchykhin	0ca9972905	Merge pull request #1271 from okriuchykhin/ok_SCI_2628 ... Fix error on activities page when user doesn't have any [SCI-2628]	2018-08-22 14:21:18 +02:00
Jure Grabnar	295c6a9432	Add export all functionality (basic skeleton)	2018-08-21 21:07:45 +02:00
Luka Murn	92eab25a07	Merge pull request #1261 from mlorb/ml-sci-2634 ... fix editing of inventory items of hidden columns [SCI-2634]	2018-08-21 16:59:37 +02:00
Luka Murn	92a4a54ae7	Slighty change the parameter parsing of removed file cells	2018-08-21 16:46:47 +02:00
Oleksii Kriuchykhin	a8013118d4	Add READ user endpoint [SCI-2613]	2018-08-21 13:56:14 +02:00
Zanz2	ab3b15e13e	Found the bug and fixed it	2018-08-21 13:26:16 +02:00
Zanz2	817d09ad5f	fixed hound	2018-08-21 11:29:38 +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	3a5238f6f3	Fix error on activities page when user doesn't have any [SCI-2628]	2018-08-20 14:26:42 +02:00
Oleksii Kriuchykhin	1a57289009	Improve health check endpoint [SCI-2604]	2018-08-17 16:13:21 +02:00
Oleksii Kriuchykhin	ecde634a2c	Add OAuth2 provider [SCI-2515]	2018-08-17 13:17:59 +02:00
Oleksii Kriuchykhin	ef7e0ac489	Add GET inventory columns API endpoint [SCI-2615]	2018-08-08 17:31:37 +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
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
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	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	22e12d8fc3	Add GET teams and team API endpoints [SCI-2611][SCI-2612]	2018-07-31 13:40:27 +02:00
Oleksii Kriuchykhin	26b0bd9e11	Refactor tasks tree API endpoint [SCI-2609]	2018-07-30 14:48:11 +02:00
Oleksii Kriuchykhin	0e372af729	Adds API authentication with Azure AD [SCI-2608]	2018-07-24 14:21:33 +02:00
zmagod	29e0ecbc89	move FirstTimeDataGenerator helper from applictaion controller	2018-07-11 11:19:39 +02:00
zmagod	8b86891177	fixes file destroy button [fixes SCI-2546]	2018-07-03 15:25:37 +02:00
zmagod	28bac14667	first working version of the edit form object	2018-07-03 12:57:39 +02:00
ZmagoD	23de3abd61	Fixes repository items edit action, adds additional event listener for file upload	2018-06-29 16:59:26 +02:00
zmagod	db1944cc90	move maximum file size limit to an ENV variable [fixes SCI-2415]	2018-06-19 14:15:14 +02:00
zmagod	6a6ff534c0	fixes import flash message [fixes SCI-2398]	2018-06-15 11:12:11 +02:00
zmagod	f8ac083d39	adds an additional check if some other user has added/removed repository columns [fixes SCI-2408]	2018-06-12 15:28:03 +02:00
Zmago Devetak	6ba5c587f7	Merge pull request #1189 from ZmagoD/zd_SCI_2211 ... add data-hook, refactor add user to project modal to support addons	2018-06-08 15:23:26 +02:00
zmagod	f769215468	fixes assign items flash message [fixes SCI-2487]	2018-06-08 10:02:57 +02:00
Zmago Devetak	fad67d7730	Merge pull request #1185 from ZmagoD/zd_SCI_2468 ... Limits the max. amount of rows when importing into inventories [fixes…	2018-06-04 16:29:33 +02:00
zmagod	84170f6de0	add data-hook, refactor add user to project modal to support addons	2018-06-01 16:13:22 +02:00
Oleksii Kriuchykhin	58d8414f92	Code fixes for sidebar [SCI-2478]	2018-06-01 15:05:12 +02:00
Oleksii Kriuchykhin	2ddc0fb561	Improve sidebar rendering performance [SCI-2478]	2018-06-01 13:49:02 +02:00
zmagod	9abf50e7c5	Limits the max. amount of rows when importing into inventories [fixes SCI-2468]	2018-05-31 10:45:31 +02:00
Oleksii Kriuchykhin	6cf9149baa	Add user id tracking when discarding repository [SCI-2462]	2018-05-29 15:33:02 +02:00
zmagod	89046e9787	fixes items assign flash message [fixes SCI-2395]	2018-05-29 12:54:41 +02:00
okriuchykhin	6deaa7235b	Merge pull request #1136 from okriuchykhin/ok_SCI_2396 ... Handle situation with smart annotations and zero inventories [SCI-2396]	2018-05-28 17:23:29 +02:00
Zmago Devetak	147e74b4a5	Merge pull request #1164 from ZmagoD/zd_SCI_2448 ... adds discard gem, move deletion of repositories in a rake task to run…	2018-05-28 15:04:54 +02:00
Zmago Devetak	ad5114090f	Merge pull request #1165 from ZmagoD/zd_SCI_2433 ... fixes tast description/due-date modal [fixes SCI-2433]	2018-05-28 13:10:15 +02:00
okriuchykhin	0e6c89c3de	Merge pull request #1166 from okriuchykhin/ok_SCI_2342 ... Fix WOPI controller to support repositories [SCI-2342]	2018-05-28 13:07:17 +02:00
zmagod	c683cfdbd7	triggers the delayed job in the controller action, fixes smart annotations	2018-05-25 11:41:43 +02:00
Oleksii Kriuchykhin	46d6accf78	Fix search in repositories [SCI-2428]	2018-05-24 17:14:40 +02:00
Oleksii Kriuchykhin	b019ab8f61	Fix WOPI controller to support repositories [SCI-2342]	2018-05-24 16:51:25 +02:00
zmagod	10351bbf83	fixes tast description/due-date modal [fixes SCI-2433]	2018-05-24 16:44:10 +02:00
zmagod	1f8db7bc49	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2340	2018-05-24 15:00:59 +02:00
okriuchykhin	7b08529e39	Merge pull request #1156 from okriuchykhin/ok_SCI_2342 ... Enable editing office online files in inventories [SCI-2342]	2018-05-23 12:59:12 +02:00
Luka Murn	31a1641b42	Merge pull request #1155 from Ducz0r/lm-sci-2436-fix ... Update new repository row code so file columns work again [SCI-2436]	2018-05-22 09:27:32 +02:00
Oleksii Kriuchykhin	5c41527b92	Enable editing office online files in inventories [SCI-2342]	2018-05-21 15:48:48 +02:00
Luka Murn	6135081a71	Update new repository row code so file columns work again ... Also fix backend code a bit (so update & create of repository rows are more similar in their behavior), and fix line in JS: _initSelectPicker() was called a reduntant amount of times when editing repository row. Closes SCI-2436.	2018-05-21 14:46:30 +02:00
zmagod	ba2aafae39	fix access to public reports [fixes SCI-2340]	2018-05-21 14:45:18 +02:00
zmagod	5514683f96	shorten project name [fixes SCI-2344]	2018-05-18 14:12:12 +02:00
zmagod	38b0cb742c	removes empty space	2018-05-17 15:21:45 +02:00
zmagod	e019767e90	refactor save_pdf_to_inventory_item service	2018-05-17 13:17:19 +02:00
zmagod	b125863baf	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371	2018-05-17 11:25:33 +02:00
zmagod	ca0c8cbb71	fixes typos, fixes pdf rendering	2018-05-17 11:21:34 +02:00
Zmago Devetak	9d2303c777	Merge pull request #1115 from ZmagoD/zd_SCI_2321 ... fixes images preview in repository/library [fixes SCI-2321]	2018-05-16 12:05:33 +02:00
okriuchykhin	19ed711ce2	Merge pull request #1142 from okriuchykhin/ok_SCI_2411 ... Fix pagination in global search inside repositories [SCI-2411]	2018-05-16 10:19:05 +02:00
okriuchykhin	3e2b455d2c	Merge pull request #1139 from okriuchykhin/ok_SCI_2385 ... Fix task resore permissions [SCI-2385]	2018-05-16 10:17:51 +02:00