Commit graph

962 commits

Author SHA1 Message Date
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
69abccbbd6 Add title for full view assign modal 2020-05-15 14:22:20 +02:00
aignatov-bio
e49d2dfbae
Merge pull request #2546 from aignatov-bio/ai-sci-4605-some-inventories-task-corrections
Small task inventories corrections [SCI-4605]
2020-05-14 16:45:45 +02:00
aignatov-bio
ce1540aaa9 Small task inventories corrections 2020-05-14 16:41:02 +02:00
aignatov-bio
309f8c1a3d Small snapshots CSS corrections 2020-05-14 16:29:50 +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
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
c9545ddb19 Merge branch 'features/new-task-layout' into ai-sci-4509-add-recent-protocols-tab 2020-05-08 10:28:33 +02:00
Mojca Lorber
b3bce933e5 Task details description corrections and some changes of locales 2020-05-07 16:11:22 +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
8b5872347a
Merge pull request #2514 from aignatov-bio/ai-sci-4538-new-protocol-template-dropdown
Add new protocol template dropdown [SCI-4538]
2020-05-07 08:32:54 +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
Urban Rotnik
8ff7c33431 Fix start date activity message 2020-05-06 12:34:45 +02:00
aignatov-bio
4e5ebd01b5 Fix I18n 2020-05-06 12:20:20 +02:00
aignatov-bio
1ed62c4a49 Fix I18n and save to repository button 2020-05-01 20:45:09 +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
be8ef5a310 Add I18n 2020-04-28 12:49:19 +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
Urban Rotnik
8fa024ed10 Remove all tooltips from HTML 2020-04-28 12:30:43 +02:00
Oleksii Kriuchykhin
e6ad5047e0 Implement background processing of repository snapshots [SCI-4552] 2020-04-28 12:09:36 +02:00
aignatov-bio
ad705a740c Add new protocol template dropdown 2020-04-24 15:48:40 +02:00
mlorb
1cea6116b5
Merge pull request #2515 from mlorb/ml-sci-4493
Add protocol options dropdown [SCI-4493]
2020-04-23 17:21:26 +02:00
Mojca Lorber
ac709be364 Small fixes 2020-04-23 16:50:16 +02:00
Urban Rotnik
de4e4ca967 Add before_action for team switch 2020-04-23 16:20:01 +02:00
aignatov-bio
5b375168c0 Add I18n 2020-04-23 15:24:40 +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
Alex Kriuchykhin
1802d7cb59
Merge pull request #2516 from okriuchykhin/ok_SCI_4525
Add versions sidebar to assigned repository rows full view modal [SCI-4525]
2020-04-23 13:18:23 +02:00
Oleksii Kriuchykhin
06b6907d13 Handle situation when task creator or modifier is not present [SCI-4503] 2020-04-23 12:40:27 +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
608ee23ec4 Add task details popover [SCI-4503] 2020-04-21 15:11:57 +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
Mojca Lorber
6fecee8c0c Add protocol options dropdown 2020-04-21 10:03:53 +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
aignatov-bio
15b291347b Fix I18n 2020-04-14 12:10:17 +02:00
aignatov-bio
fe718349da Add recent protocol tab to load protocal from repository 2020-04-09 17:29:39 +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
Oleksii Kriuchykhin
a9c3102835 Add repository snapshots with service, refactor item assigning [SCI-4516] 2020-04-07 18:26:39 +02:00
Alex Kriuchykhin
80bf5123ec
Merge pull request #2497 from aignatov-bio/ai-sci-4472-change-due-date-wording-on-dashboard
Change i18n for due date on current task widget [SCI-4472]
2020-04-06 10:27:21 +02:00
Oleksii Kriuchykhin
3c53be1f9a Add start date to the task [SCI-4504] 2020-03-31 14:17:14 +02:00
Mojca Lorber
bd177f4f2f Renaming fixes 2020-03-31 11:22:53 +02:00
aignatov-bio
230099ac82 Change i18n for due date on current task widget 2020-03-30 15:30:52 +02:00
Mojca Lorber
7006036626 Add new task general layout and add notes section 2020-03-30 12:51:35 +02:00
aignatov-bio
b9e81f208d Fix i18n 2020-03-27 10:34:06 +01:00
aignatov-bio
8ff4b540e2 Update css for login screen 2020-03-27 09:43:49 +01:00
aignatov-bio
8164b0d0c6 Change placeholders for dashboards 2020-03-12 15:00:14 +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
Miha Mencin
26b687f2e6
Merge pull request #2460 from biosistemika/features/dashboard
Features/dashboard
2020-03-10 18:06:23 +01:00
mlorb
bea7a6172b
Merge pull request #2456 from mlorb/ml-sci-4412
Remove academy link from navigation and move about modal to support menu [SCI-4412]
2020-03-10 17:08:22 +01:00
Mojca Lorber
6bf191d124 Remove academy link from navigation and move about modal to support menu 2020-03-06 14:36:22 +01:00
aignatov-bio
e729aa043e Add recent work widget 2020-03-06 13:51:18 +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
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
d830fcec4a Remove locked task css and i18n 2020-03-04 14:56:06 +01:00
aignatov-bio
3bc1f0cbe2 Update current tasks widget filters localization 2020-03-04 13:34:12 +01:00
aignatov-bio
77d66b65b1 Refactor current task for addons integration 2020-03-04 13:21:52 +01:00
Oleksii Kriuchykhin
11a5536af5 Improve file upload checks [SCI-4382] 2020-03-03 15:26:40 +01:00
aignatov-bio
d9bfd8c28e Add search to current task widget 2020-03-03 09:50:44 +01:00
Oleksii Kriuchykhin
73623da02c Merge branch 'develop' into features/dashboard 2020-02-28 16:46:56 +01:00
aignatov-bio
6900d8384b
Merge pull request #2428 from aignatov-bio/ai-sci-4375-end-point-to-task-create
Service for task creating and quick start end point [SCI-4375]
2020-02-28 14:38:07 +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
95fca105eb Add quickstart layout and create task modal 2020-02-28 14:34:34 +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
f29ce66bea Refactor backend, add empty state and fix some small scc changes 2020-02-26 11:07:17 +01:00
aignatov-bio
a28d729aeb Add end point 2020-02-24 17:09:10 +01:00
aignatov-bio
5385a25665 Merge branch 'features/dashboard' into ai-sci-add-calendar-widget 2020-02-24 13:04:49 +01:00
Mojca Lorber
9bd2e8bec4 Dashboard current tasks visual layout and backend 2020-02-21 10:41:42 +01:00
aignatov-bio
2cbac634bf Add localization 2020-02-21 10:00:32 +01:00
aignatov-bio
01868fff23 Add calendar front-end 2020-02-19 15:57:06 +01:00
aignatov-bio
5545d7da1a Add progress bar for current tasks 2020-02-18 14:28:06 +01:00
aignatov-bio
5886f2cf90 New description to import items modal window 2020-02-18 12:13:52 +01:00
aignatov-bio
0117b577f4 Fix typo 2020-02-18 09:27:07 +01:00
aignatov-bio
ff45b17b53 Fix localization and small markup fixes 2020-02-17 15:32:43 +01:00
aignatov-bio
95c9479f54 Add page title 2020-02-13 14:54:58 +01:00
aignatov-bio
5c0a769f87 General dashboard layout 2020-02-13 13:50:29 +01:00
aignatov-bio
d0fd956600
Merge pull request #2406 from aignatov-bio/ai-sci-4347-error-caused-by-dot-number
Fix error in number column in repository [SCI-4347]
2020-02-12 14:16:46 +01:00
aignatov-bio
00531066f8 Fix error in number column in repository 2020-02-12 11:55:10 +01:00
aignatov-bio
eaf751bad6 Improve search input field in the flyouts 2020-02-11 15:01:52 +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
21bf59b943 Add unsaved data notification when navigating away from the inventory [SCI-4301] 2020-02-06 16:46: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
aignatov-bio
44eccaaa12
Merge pull request #2353 from aignatov-bio/ai-sci-4254-inventories-small-visual-fixes-part-1
Fix small visual bugs [SCI-4254]
2020-01-30 13:42:07 +01:00
Urban Rotnik
0effb3ee69 Add translation for read-only items 2020-01-25 08:52:33 +01:00
aignatov-bio
4395a7cc6b Fix small visual bugs 2020-01-23 13:12:58 +01:00
aignatov-bio
01cce84314
Merge pull request #2339 from aignatov-bio/ai-sci-4195-update-delimiter-dropdown
Update delimiter dropdown for manage column modal [SCI-4195]
2020-01-20 15:22:40 +01:00
aignatov-bio
cd471bfb25 Update delimiter dropdown for manage column modal 2020-01-20 14:26:17 +01:00
Urban Rotnik
2ecbd8f8c4 Update tooltip 2020-01-17 17:50:53 +01:00
Urban Rotnik
2e8db12ca5 Add error message for status item 2020-01-17 11:25:01 +01:00
Urban Rotnik
218316bea2 Update error handling for name and text 2020-01-16 13:30:05 +01:00
Urban Rotnik
0522b9b0a3 Update too many items error showing
Update too many items error showing
2020-01-16 11:40:59 +01:00
aignatov-bio
1ff0351a74 Merge branch 'develop' into ai-sci-4328-fix-general-css-issues-for-repositories 2020-01-16 11:36:00 +01:00
aignatov-bio
b116c3720c Fix general css issue for repositories 2020-01-15 16:46:01 +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
Mojca Lorber
c234b014cb fix locales 2020-01-15 14:18:08 +01:00
Miha Mencin
5bfa5c7939 SCI-4199 disabling delimiter, adding warning 2020-01-15 13:59:28 +01:00
Mojca Lorber
9176301b7b Refactor manage repository columns, move it from page into modal 2020-01-14 11:13:19 +01:00
aignatov-bio
751d34a078
Merge pull request #2288 from aignatov-bio/ai-sci-4192-empty-item-field-placeholders
Update placeholders for cells [SCI-4192]
2020-01-10 10:50:00 +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
aignatov-bio
13675dd2e7 Update placeholders for cells 2020-01-09 14:57:37 +01:00
Oleksii Kriuchykhin
d9b9243da7 Merge branch 'develop' into features/new-column-types 2020-01-07 16:03:33 +01:00
Urban Rotnik
181d637ff3 Update/refactor JS for handling Dates and Times 2019-12-20 14:59:27 +01:00
Oleksii Kriuchykhin
403a3e0140 Restrict files to only images in RTE fields [SCI-4146] 2019-12-16 16:05:40 +01:00
Oleksii Kriuchykhin
0094528a02 Improve connected accounts unlinking [SCI-4142] 2019-12-12 14:57:27 +01:00
Oleksii Kriuchykhin
ff4ef818fb Implement SSO with Azure AD [SCI-4142] 2019-12-10 17:24:53 +01:00
Mojca Lorber
8503dd7007 Add numeric repository column type 2019-12-09 16:38:21 +01:00
aignatov-bio
d8676596f1 Add checklists column type 2019-12-09 13:48:36 +01:00
Urban Rotnik
06d87cb4b6 Add I18n to serializers 2019-12-06 11:39:10 +01:00
Oleksii Kriuchykhin
03667f619f Merge branch 'release-1-17-7' into develop 2019-12-05 13:03:39 +01:00
Urban Rotnik
2ec99fa696 Add new renderer for File, Status and List 2019-12-05 09:19:19 +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
621f7da37b Add fields for StatusItem 2019-11-29 10:19:10 +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
6fbb99c8d2 Add List items partial and JS 2019-11-29 10:19:09 +01:00
Urban Rotnik
24acf1f84b Fix edit mode for File and Text 2019-11-29 10:19:08 +01:00
Mojca Lorber
467c80da52 Update basic modal layout for creating new column types 2019-11-29 10:16:47 +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
Anton Ignatov
7117b767f4 Fix commnets to PR 2019-11-18 13:59:54 +01:00
Anton Ignatov
17e457c686 Finished global activities refactoring 2019-11-18 13:59:54 +01:00
Urban Rotnik
43e3763ec8 Update x, y, experiment unqiue validation
[SCI-3887]
2019-11-18 11:11:40 +01:00
Urban Rotnik
060125a1c4 Add file size validation 2019-11-18 11:11:38 +01:00
Urban Rotnik
7802d5ee8b Add uniq validation for x and y position scoped to experiment 2019-11-18 11:11:36 +01:00
aignatov-bio
a9690482d1 Add autosave feature to text fields 2019-11-12 11:26:18 +01:00
aignatov-bio
b6292a029e Fix localization 2019-11-05 10:46:05 +01:00
aignatov-bio
ae0db3a7bc Update avatars and small CSS fixes 2019-11-05 10:43:02 +01:00
aignatov-bio
198697ff23 Fix avatar localization 2019-10-11 12:22:09 +02:00
aignatov-bio
521a367960 Add predefined avatars 2019-10-11 11:46:51 +02:00
Anton Ignatov
33497d11a3 Merge branch 'activestorage_migration' 2019-10-01 10:36:05 +02:00
Jure Grabnar
477e41a96d Refactor I18n strings for tiny_mce 2019-09-30 11:34:39 +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
aignatov-bio
07b9091e23
Fix html escape in unshared warning (#2048) 2019-09-11 16:33:31 +02:00
aignatov-bio
27104a495c
Fix styling for unshared warning message (#2044) 2019-09-11 11:50:02 +02:00
Oleksii Kriuchykhin
265047caf3 Improve behaviour of inventory items export modal [SCI-3815] 2019-09-09 10:38:47 +02:00
Miha Mencin
2486bd0077 SCI3818-unshared-inventory-screen 2019-09-05 14:03:08 +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