Commit graph

657 commits

Author SHA1 Message Date
Alex Kriuchykhin
79c32e30ad
Add support of repository snapshots to assigned items section [SCI-6439] (#3828) 2022-02-11 10:46:19 +01:00
aignatov-bio
8604319c1b
Add front-end validation for comments field [SCI-6464] (#3829)
Co-authored-by: Anton <anton@scinote.net>
2022-02-10 10:55:58 +01:00
Martin Artnik
b22fde2334 Handle stock management in full table views [SCI-6440] 2022-01-28 17:53:56 +01:00
aignatov-bio
2c88843924
Task stock consumption modal[SCI-6444][SCI-6445] (#3798)
Add main logic for consumption on task [SCI-6444]

Co-authored-by: Anton <anton@scinote.net>
2022-01-28 11:10:56 +01:00
Alex Kriuchykhin
d2b5db13e9
Add stock and consumption to assigned items section [SCI-6434] (#3793) 2022-01-25 12:12:55 +01:00
Martin Artnik
711005425f Merge branch 'features/bmt-search' of github.com:biosistemika/scinote-web into features/repository-filters 2022-01-20 13:30:33 +01:00
Martin Artnik
abac837cd4 Merge branch 'develop' of github.com:biosistemika/scinote-web into features/repository-filters 2022-01-20 13:26:08 +01:00
aignatov-bio
5512db18f0
Fix state for bmt repository [SCI-6089] (#3758)
Co-authored-by: Anton <anton@scinote.net>
2022-01-03 12:34:06 +01:00
aignatov-bio
75f7e67602
Fix task navigation for archived experiments [SCI-6333] (#3753)
Co-authored-by: Anton <anton@scinote.net>
2022-01-03 10:48:17 +01:00
Martin Artnik
c9e4a9bab7 Merge branch 'master' into features/bmt-search 2021-12-20 13:08:20 +01:00
artoscinote
3f7f576b29
Print protocol fixes [SCI-6318] (#3717)
* Fix smart annotations [SCI-6318]

* Fix asset rendering [SCI-6316, SCI-6417]

* Copy fix [SCI-6315]

* Fix print protocol name handling [SCI-6318]

* CSS linter fixes

* Add support for handson tables [SCI-6318]

* Use partial for handsontable formulas [SCI-6318]
2021-12-03 13:44:18 +01:00
artoscinote
9937d1d913
Add print feature to protocols [SCI-6028] (#3700)
* Add print feature to protocols [SCI-6028]

* Close tab after closing print dialog [SCI-6028]

* CSS linter fixes [SCI-6028]
2021-12-01 11:16:45 +01:00
Miha Mencin
c63ae86e4b SCI-6302 change snapshot permission helper name 2021-11-24 15:21:42 +01:00
Anton
a44dd8c915 Merge branch 'features/bmt-search' into features/repository-filters 2021-11-22 14:24:28 +01:00
artoscinote
9b06a24288
Added granular task permissions, permission check fixes [SCI-6278] (#3683) 2021-11-19 13:24:57 +01:00
aignatov-bio
d3e178e5a2
Small CSS fixes for permissions [SCI-6207] (#3638)
Co-authored-by: Anton <anton@scinote.net>
2021-11-09 09:26:22 +01:00
Oleksii Kriuchykhin
a99599efea Merge branch 'features/new_permissions' into develop 2021-10-29 15:16:30 +02:00
artoscinote
98be1ae0ff
Added link to task access to task screen [SCI-6157] (#3615) 2021-10-28 10:45:34 +02:00
aignatov-bio
1a05c3a40c
Update canvas task cards [SCI-5021] (#3608)
Co-authored-by: Anton <anton@scinote.net>
2021-10-26 12:06:26 +02:00
aignatov-bio
aa4b765407
Update assign/unassign rows to task [SCI-6150] (#3604)
Co-authored-by: Anton <anton@scinote.net>
2021-10-26 11:41:08 +02:00
Zmago Devetak
4a4c344a3a
Task UX: Update assigning a Task to user(s) (#3429)
* add dynmic select for user assignment on task

* update the user assignment so it looks like tags picker

* fix code style

* Code style fixes [SCI-5871]

* Code style fixes [SCI-5871]

* Destroy and search action fixes [SCI-5871]

Co-authored-by: Martin Artnik <martin@scinote.net>
2021-10-14 11:49:27 +02:00
aignatov-bio
60b261feb8 Small fixes [SCI-6050] 2021-09-23 12:31:40 +02:00
Martin Artnik
e8f57e9e99 Reworked MyModule permissions [SCI-6056] 2021-09-14 11:08:35 +02:00
aignatov-bio
6a1223c498 Fix sidebar navigation for archived task [SCI-6050] 2021-09-10 12:05:40 +02:00
Oleksii Kriuchykhin
0b74f34de7 Add external IDs to repositories [SCI-5990] 2021-08-30 10:49:14 +02:00
artoscinote
f839cb5256
Merge pull request #3464 from biosistemika/features/bioeddie-integration
Features/bioeddie integration
2021-08-03 13:32:53 +02:00
Martin Artnik
42ed28676d Added pdf viewer js pack to my_module archive view [SCI-5870] 2021-07-07 11:34:28 +02:00
aignatov-bio
786e74e4de
Add BioEddie integration [SCI-5654][SCI-5657][SCI-5658][SCI-5670] (#3391)
* Add backend for bioeddie [SCI-5654]

* Add modal for bioeddie [SCI-5654]

* Add bio eddie editor to steps and results [SCI-5654]

* Fix markup and code styling
2021-06-23 19:48:44 +02:00
Martin Artnik
b6588c2334 Reworked task view sidebar [SCI-5701] 2021-06-18 16:52:19 +02:00
Oleksii Kriuchykhin
29c83ffbb1 Merge branch 'develop' into features/new-reports 2021-05-21 11:04:17 +02:00
Oleksii Kriuchykhin
a307a16033 Fix handsontable assets inclusion in report templates [SCI-5692] 2021-05-04 16:05:19 +02:00
Oleksii Kriuchykhin
2f6194a99f Remove canvas-to-blob library [SCI-5595] 2021-03-29 14:02:30 +02:00
Urban Rotnik
e1db291729
Merge pull request #3200 from urbanrotnik/ur-sci-5525
Add breadcrumbs on Experiments and Tasks pages [SCI-5525]
2021-03-08 14:13:44 +01:00
aignatov-bio
df4297f6f7 Merge branch 'develop' into features/local_file_previews 2021-03-08 11:30:47 +01:00
Urban Rotnik
401224ae11 Add breadcrumbs on Experiments and Tasks pages 2021-03-04 09:00:58 +01:00
Urban Rotnik
33b68b8aa7 Fix permissions for result deletion 2021-01-20 09:00:45 +01:00
aignatov-bio
8099c4ed4c
Fix error on task page without due date [SCI-5375] (#3066) 2021-01-12 11:11:40 +01:00
aignatov-bio
b3faa170fb
PDF preview to file preview and inline view [SCI-5299][SCI-5298] (#3018)
* Add PDF Preview [SCI-5299]
2020-12-22 15:25:30 +01:00
Mojca Lorber
21c0ea4f8d [SCI-5293] Remove Archived results tab on archived Task 2020-12-21 11:56:33 +01:00
Oleksii Kriuchykhin
67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +01:00
Miha Mencin
f284ef1592
Merge pull request #3009 from okriuchykhin/ok_SCI_5276
Archiving: update archived TASK screen layout [SCI-5276]
2020-12-17 13:46:35 +01:00
Oleksii Kriuchykhin
7bb334e737 Archiving: update archived TASK screen layout [SCI-5276] 2020-12-17 13:26:44 +01:00
Mojca Lorber
5cdab422df Update layout of the navigation for experiments, tasks list and task page 2020-12-10 15:15:36 +01:00
Oleksii Kriuchykhin
dc15accc86 Update sidebar usages in partials [SCI-5177] 2020-12-03 10:21:53 +01:00
aignatov-bio
d162fb6d35
Merge pull request #2980 from aignatov-bio/ai-sci-5241-add-confirmation-for-file-delete
Add delete asset confirmation modal [SCI-5241]
2020-11-26 15:35:40 +01:00
aignatov-bio
3078e60867 Small css fixes 2020-11-25 16:25:17 +01:00
aignatov-bio
1979883004 Add delete asset confirmation modal 2020-11-25 12:50:34 +01:00
Mojca Lorber
2a8c98b7ec Implement ESC button to exit full-screen modals 2020-11-24 23:20:53 +01:00
aignatov-bio
483ff8f1f2
Merge pull request #2964 from biosistemika/features/office-file-previews
Features/office file previews merge branch
2020-11-19 11:11:39 +01:00
Mojca Lorber
8ee8f7b4d2 Expose the new step button on task 2020-11-05 16:14:40 +01:00
Urban Rotnik
2c347af7bf Add data attribute to change status dropdown 2020-11-05 13:19:45 +01:00
aignatov-bio
12fdea8d89 Add context menu to attahcments 2020-11-04 13:08:40 +01:00
Mojca Lorber
8aed48d1ae Merge branch 'develop' into features/office-file-previews 2020-11-02 13:45:06 +01:00
aignatov-bio
c56f7912ef Update file preview 2020-10-29 14:23:32 +01:00
Mojca Lorber
ec41bdd414 Move open mobile app button to main navigation 2020-10-26 09:28:44 +01:00
Mojca Lorber
2639810e1a Fix no step bug 2020-10-22 13:21:05 +02:00
Mojca Lorber
6d7b55301f Fix pwa url and change when banner is displayed 2020-10-21 14:56:20 +02:00
Mojca Lorber
23f01ac6a9 Add 'Open in APP' button to the task 2020-10-19 12:17:03 +02:00
aignatov-bio
016fc8a632 Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into features/office-file-previews 2020-10-15 15:25:54 +02:00
aignatov-bio
1ed65eddfa Move ordering to front-end 2020-09-25 15:06:09 +02:00
Mojca Lorber
94fea75fda Fix at long inventory name snapshot in title is not visible 2020-09-24 17:19:41 +02:00
Mojca Lorber
affae15ccf Simplification 2020-09-22 17:19:15 +02:00
Mojca Lorber
fe779f9146 Add info of the locked task to the View status flow modal 2020-09-22 10:21:55 +02:00
aignatov-bio
c26f8e7193 Add before send condition for status change 2020-09-16 15:23:53 +02:00
aignatov-bio
c10e2d231e Update frontend permission check 2020-09-14 15:59:09 +02:00
Oleksii Kriuchykhin
a7c6ab9d89 Move some consequence executon into background process [SCI-4978] 2020-09-11 16:18:39 +02:00
aignatov-bio
5a063f070d Clone module before condition validation 2020-09-10 16:53:07 +02:00
aignatov-bio
18426b90be Disable button when condition not fullfield 2020-09-10 13:40:52 +02:00
aignatov-bio
946b961b1a
Merge pull request #2819 from aignatov-bio/ai-sci-4975-add-permission-checks-for-statuses
Add front-end checks for statuses [SCI-4975]
2020-09-09 13:21:04 +02:00
aignatov-bio
5d9d7d6a12
Merge pull request #2829 from aignatov-bio/ai-sci-4983-add-descriptions-for-conditions
Add description for conditions [SCI-4983]
2020-09-09 11:33:48 +02:00
aignatov-bio
7763d11634 Fix markup 2020-09-09 11:24:54 +02:00
aignatov-bio
84682c6346
Merge pull request #2823 from mlorb/ml-sci-4575
Replace old arrow with new one [SCI-4575]
2020-09-09 09:05:39 +02:00
aignatov-bio
bdb3caf5cf Add i18n 2020-09-09 08:50:24 +02:00
aignatov-bio
bd1d6a772b Add completed/uncompleted methods to my_module 2020-09-08 09:45:09 +02:00
aignatov-bio
492d25f9b3 Add description for conditions 2020-09-07 15:12:09 +02:00
Mojca Lorber
9dac4079f8 Replace old arrow with new one and remove redundant javascript for arrow collapsing 2020-09-04 14:43:30 +02:00
aignatov-bio
d85703113a Add front-end checks 2020-09-03 14:34:34 +02:00
aignatov-bio
257329ce80 Fix css for status flows 2020-09-02 15:41:07 +02:00
Urban Rotnik
5923a4c014 Merge branch 'develop' into features/task-flows 2020-08-25 15:30:22 +02:00
Alex Kriuchykhin
121644decf
Merge pull request #2770 from okriuchykhin/ok_SCI_4881
Create new activities for exporting assigned items (live & snapshots) [SCI-4881]
2020-08-21 11:01:49 +02:00
Mojca Lorber
faf2d4c533 Fix export icon 2020-08-14 17:02:03 +02:00
Mojca Lorber
a91aa6ce46 Fix Collapse and expand buttons position 2020-08-13 13:18:50 +02:00
Oleksii Kriuchykhin
ce8d12e1c4 Create new activities for exporting assigned items (live & snapshots) [SCI-4881] 2020-08-05 09:59:58 +02:00
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
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
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
968249c6d8 Fix tests 2020-07-27 13:48: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
Urban Rotnik
025378cd0e Fix translations and JS 2020-07-23 15:53:46 +02:00
Urban Rotnik
512d6f3229 Add actions for update status, clean old complete actions 2020-07-22 16:12:34 +02:00
Urban Rotnik
aacee14fc6 Add Status button 2020-07-22 15:30:47 +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
Mojca Lorber
22b71bc9cb Merge branch 'develop' into ml-sci-4261 2020-06-30 13:47:32 +02:00
Oleksii Kriuchykhin
7ea577d8d4 Merge branch 'features/inventory-archiving' into develop 2020-06-24 14:04:54 +02:00
aignatov-bio
5fc3146174 Update my module repositories dropdown list 2020-06-24 11:23:17 +02:00
aignatov-bio
323929b270 Add restore/delete buttons 2020-06-18 14:09:29 +02:00
aignatov-bio
db35da0cee Add archiving column to datatable helper 2020-06-11 12:48:31 +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
Oleksii Kriuchykhin
6afebdc5da Remove inventory links of unshared inventory [SCI-4715] 2020-06-01 17:50:31 +02:00
Alex Kriuchykhin
be8c7e01e2
Merge pull request #2622 from aignatov-bio/ai-sci-4699-show-selected-snapshot-in-sidebar
Show selected snapshot in sidebar [SCI-4699]
2020-05-29 11:14:52 +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
368ee8a689 Show selected snapshot in sidebar 2020-05-28 15:18:26 +02:00
Mojca Lorber
285280827a Refactor repository column base controller 2020-05-28 12:18:46 +02:00
aignatov-bio
15f58be1c2 Fix snapshot date creation 2020-05-26 15:59:49 +02:00
Miha Mencin
55aac63fba Fix a typo 2020-05-25 17:28:36 +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
mlorb
384ec40c4e
Merge pull request #2542 from mlorb/ml-sci-4582
Task details description corrections and some changes of locales [SCI-4582]
2020-05-25 09:10:37 +02:00
Oleksii Kriuchykhin
c98b042585 Improve handling of unassigned inventories with existing snapshots [SCI-4661] 2020-05-22 17:36:04 +02:00
aignatov-bio
230ec487ba Make snapshots versions buttons full size clickable 2020-05-22 17:16:20 +02:00
aignatov-bio
ce53235cb9
Merge pull request #2592 from aignatov-bio/ai-sci-4621-fix-order-icon-position-in-simple-view
Fix ordering in simple table view [SCI-4621]
2020-05-22 16:52:45 +02:00
aignatov-bio
cbc578f84b Fix snapshot name column id 2020-05-22 15:10:21 +02:00
Urban Rotnik
a1fa0b4e05 Add check for button visibility 2020-05-22 12:02:38 +02:00
aignatov-bio
0aa1c32813 Fix ordering in simple table view 2020-05-21 16:51:07 +02:00
Mojca Lorber
12982260b7 Fix css hover effects 2020-05-21 08:37:40 +02:00
Oleksii Kriuchykhin
f2043f111b Change display of the live version for a deleted inventory [SCI-4659] 2020-05-20 21:50:39 +02:00
Mojca Lorber
e2959fec32 Merge branch 'develop' into ml-sci-4582 2020-05-20 10:37:33 +02:00
Urban Rotnik
431bd0c53b
Merge pull request #2582 from urbanrotnik/ur-sci-4650-font-size-fix
Fonts size update [SCI-4650]
2020-05-19 14:55:22 +02:00
mlorb
7cbbcff86a
Merge pull request #2576 from mlorb/ml-sci-4619
Fix manage permissions on views [SCI-4619]
2020-05-19 14:29:11 +02:00
Urban Rotnik
ac4532eea3 Update fonts 2020-05-19 14:14:58 +02:00
aignatov-bio
c00b96ff7e
Merge pull request #2577 from aignatov-bio/ai-sci-4646-fix-task-sections-collapse-animation
Fix collapse animation for task sections [SCI-4646]
2020-05-19 10:31:36 +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
aignatov-bio
9f4457642d Fix collapse animation for task sections 2020-05-18 16:01:26 +02:00
Mojca Lorber
6b6fba591e Fix manage permissions on views 2020-05-18 15:54:32 +02:00
aignatov-bio
f2d81cb199
Merge pull request #2570 from aignatov-bio/ai-sci-4617-make-snapshot-creation-text-switchable
Make snapshot creation info text switchable [SCI-4617]
2020-05-18 11:15:46 +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
aignatov-bio
bc81a48b00 Make snapshot creation info text switchable 2020-05-15 14:44:26 +02:00
Urban Rotnik
a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +02:00
Mojca Lorber
4c15c89cf5 Add New Task layout Collapsed/Expanded States saving 2020-05-15 00:49:23 +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
aignatov-bio
8f946c45c3
Merge pull request #2553 from aignatov-bio/ai-sci-4518-optimize-task-mobile-view
Small CSS improvments for mobile [SCI-4518]
2020-05-14 14:20:40 +02:00
aignatov-bio
9b685fdaa6
Merge pull request #2554 from aignatov-bio/ai-sci-4613-add-icon-to-cancel-button
Add icon to cancel button [SCI-4613]
2020-05-14 13:19:20 +02:00
aignatov-bio
445f55acc7
Merge pull request #2555 from aignatov-bio/ai-sci-4598-change-task-details-to-onclick
Replace bootstrap popover with bootstrap dropdown [SCI-4598]
2020-05-14 13:19:08 +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
8447a13afd Replace bootstrap popover with bootstrap dropdown 2020-05-13 12:20:25 +02:00
aignatov-bio
f6b239c144 Add icon to cancel button 2020-05-13 11:09:19 +02:00
aignatov-bio
bd742d388d Small CSS improvments for mobile 2020-05-13 10:58:40 +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
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
dad5ac7a27 Fix snapshot button place 2020-05-07 19:36:30 +02:00
Mojca Lorber
b3bce933e5 Task details description corrections and some changes of locales 2020-05-07 16:11:22 +02:00
aignatov-bio
fe658a9b23
Merge pull request #2534 from aignatov-bio/ai-sci-4594-refactor-css-for-full-view-repository-view
Update CSS for full view assigned rows modal [SCI-4594]
2020-05-07 15:22:06 +02:00
aignatov-bio
912b01d34b
Merge pull request #2539 from aignatov-bio/ai-sci-4573-small-css-fixes-for-protocols
Fix css for comments and fix modal title size [SCI-4573]
2020-05-07 12:59:56 +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
aignatov-bio
5972c3fdf6 Fix css for comments and fix modal title size 2020-05-06 13:54:39 +02:00
aignatov-bio
4e5ebd01b5 Fix I18n 2020-05-06 12:20:20 +02:00
aignatov-bio
a29db548f8 Update CSS for full view assigned rows modal 2020-05-05 18:17:14 +02:00
Alex Kriuchykhin
7e9054e6d2
Merge pull request #2519 from aignatov-bio/ai-sci-4523-add-assign-items-to-task
Add assign items modal and update modal for task inventories [SCI-4523][SCI-4524]
2020-05-05 13:20:01 +02:00
aignatov-bio
c556fd2478
Merge pull request #2530 from aignatov-bio/ai-sci-4574-fix-css-for-results-page
Fix CSS for results [SCI-4574]
2020-05-05 12:58:35 +02:00
aignatov-bio
cf2508c5d0
Merge pull request #2522 from aignatov-bio/ai-sci-4508-small-protocol-layout-fixes
Small layout changes for protocol [SCI-4508]
2020-05-05 12:57:40 +02:00
aignatov-bio
1b57040c37 Fix deepscan issues 2020-05-05 09:44:38 +02:00
aignatov-bio
8c57ed3109 Fix css for results 2020-05-02 22:37:02 +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
046c9662d1 Fix markup 2020-04-28 19:16:04 +02:00
aignatov-bio
61bbca6bcf Fix path names and markup 2020-04-28 19:12:17 +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
0a87bd3dcf Fix markup 2020-04-24 15:48:40 +02:00
aignatov-bio
ad705a740c Add new protocol template dropdown 2020-04-24 15:48:40 +02:00
Mojca Lorber
008ab8ab86 Remove redundant data-hook from protocol options dropdown 2020-04-24 15:10:42 +02:00
aignatov-bio
4f941610b2 Small layout changes for protocol 2020-04-24 11:50:03 +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
aignatov-bio
f65b50c6ff Fix rebase conflicts 2020-04-23 16:36:22 +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
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
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
Mojca Lorber
e9959747d6 small refactor 2020-04-14 17:25:36 +02:00
aignatov-bio
338f3a0192 Fix css 2020-04-14 13:08:07 +02:00
aignatov-bio
15b291347b Fix I18n 2020-04-14 12:10:17 +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
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
e4b65aaf6f Finish full view repository 2020-04-08 15:13:21 +02:00
aignatov-bio
087f71a82f Add full view for my-module repository 2020-04-07 21:02:16 +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
9a64ebdfd0 Update sql and add accordion effect 2020-04-03 13:15:56 +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
Mojca Lorber
cb554e815a Add new task layout details section 2020-04-01 13:05:35 +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
mlorb
ea6eb0cace
Merge branch 'features/new-task-layout' into ml-sci-4483-sci-4486 2020-03-30 14:27:35 +02:00
aignatov-bio
10bd1d425d Fix placeholder for tinymce description fields 2020-03-30 13:22:34 +02:00
Mojca Lorber
7006036626 Add new task general layout and add notes section 2020-03-30 12:51:35 +02:00
Alex Kriuchykhin
4fe3d9f3a7
Merge pull request #2414 from aignatov-bio/ai-sci-4134-auto-open-tiny-mce-if-unsaved-data
Open unsaved TinyMce editor [SCI-4134]
2020-03-30 09:50:32 +02:00
Miha Mencin
be8e18110d
Merge pull request #2481 from mlorb/ml-sci-4344
Fix tooltips appear wrongly [SCI-4344]
2020-03-24 19:43:34 +01:00
Oleksii Kriuchykhin
f9a7d58157 Fix due dates on task cards in the canvas [SCI-4487] 2020-03-24 10:30:29 +01:00
Mojca Lorber
9045d1a8de Fix tooltips appear wrongly 2020-03-22 17:47:13 +01:00
aignatov-bio
b188b0511b Refactor TinyMCE autosave check 2020-03-19 15:45:14 +01:00
Oleksii Kriuchykhin
a518bfe023 Enable time fraction for task due date [SCI-4408] 2020-03-16 17:55:35 +01:00
Mojca Lorber
9068c20588 Redesign clear buttons on global activities page 2020-02-07 11:33:25 +01:00
Mojca Lorber
e70bc67146 Implement missing style guide changes 2020-01-31 14:11:37 +01:00
aignatov-bio
79d71f1e9b
Merge pull request #2346 from aignatov-bio/ai-sci-4268-new-emoji-picker
Add new emoji picker [SCI-4268]
2020-01-21 16:33:05 +01:00
Mojca Lorber
981f8678df Fix alerts style 2020-01-21 15:21:40 +01:00
Urban Rotnik
1ecea5216e Add webpack libs for emojis and assets 2020-01-21 11:43:04 +01:00
mlorb
9747a72567
Merge pull request #2338 from mlorb/ml-sci-4132-v2
Change html structure for flash msg, change columns buttons [SCI-4132]
2020-01-20 14:36:33 +01:00
Mojca Lorber
772118d246 change html structure for flash msg, change columns buttons 2020-01-20 14:02:42 +01:00
Urban Rotnik
fc29641c2b Hide manage column action buttons on Task page 2020-01-17 17:29:26 +01:00
aignatov-bio
b116c3720c Fix general css issue for repositories 2020-01-15 16:46:01 +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
68646276f5 Replace bootstrap styles for button 2020-01-07 16:13:34 +01:00
aignatov-bio
464d03558a Fix markup, replace buttons and add new logo 2020-01-06 10:40:20 +01:00
aignatov-bio
a281f09e7f Add reports and missed modals 2020-01-06 10:40:20 +01:00
aignatov-bio
ef3814ccec Add new buttons to protocols, tasks, experiments, projects 2020-01-06 10:40:20 +01:00
aignatov-bio
010a44650c Fix task activity page 2019-12-02 16:04:50 +01:00
aignatov-bio
75f29d7b04 Fix tag edit mode 2019-11-27 12:34:54 +01:00
aignatov-bio
e76b4ca26f Fix permission check and due date clear 2019-11-24 21:06:34 +01:00
aignatov-bio
96523ae131 Update CSS for team preferences and enable autosave 2019-11-22 10:46:44 +01:00
aignatov-bio
c712e4e48c Fix due date moda 2019-11-21 13:05:36 +01:00
aignatov-bio
f2ed3198d5 Add due date autosave field 2019-11-21 12:14:43 +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
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
Anton Ignatov
fc70ce24f8 Refactor side filters for global activities 2019-11-18 13:59:54 +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
19f5f9de67 Disable autocomplete for textarea field 2019-11-12 14:44:33 +01:00
aignatov-bio
a9690482d1 Add autosave feature to text fields 2019-11-12 11:26:18 +01:00
Anton Ignatov
33497d11a3 Merge branch 'activestorage_migration' 2019-10-01 10:36:05 +02:00
Urban Rotnik
dfafd4767c Fix Protocol buttons group
[SCI-3929]
2019-09-30 11:51:37 +02:00
Jure Grabnar
b3cafcec7c Add restore draft notification to all models
Close SCI-3751
2019-09-30 11:34:39 +02:00
Jure Grabnar
6e33baa995 Add skeleton restore-draft notification for module description 2019-09-30 11:32:38 +02:00
Anton Ignatov
93363da4e5 Fix preview for result 2019-09-26 16:49:56 +02:00
Oleksii Kriuchykhin
3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +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
aignatov-bio
1f12a63a25
Fix counter on task inventory and failing test (#2043) 2019-09-10 13:51:37 +02:00
Miha Mencin
01628e1efc adding missing file 2019-09-09 16:46:51 +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
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
Miha Mencin
b850efbceb Code review remarks, added tooltip for unshared inventory 2019-08-26 10:45:40 +02:00