aignatov-bio
|
9340148b41
|
Disable column reordering in repositories list
|
2020-07-02 11:50:40 +02:00 |
|
aignatov-bio
|
4b9881e31e
|
Add 2fa to user settings page
|
2020-07-01 13:25:06 +02:00 |
|
aignatov-bio
|
630bef1adf
|
Add special characters to smart annotation
|
2020-06-29 14:47:35 +02:00 |
|
aignatov-bio
|
6fa97d3639
|
Add enable 2fa button to user settings
|
2020-06-29 10:56:06 +02:00 |
|
Oleksii Kriuchykhin
|
405d5b31bb
|
Remove spinner in repository table after error caused by provisioning snapshot [SCI-4665]
|
2020-06-29 10:04:31 +02:00 |
|
Miha Mencin
|
6db1401759
|
Merge pull request #2670 from aignatov-bio/ai-sci-4745-fix-manage-column-dropdown-position
Fix dropdown position for full-screen modals [SCI-4745]
|
2020-06-29 09:43:13 +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 |
|
Oleksii Kriuchykhin
|
64b66f0d73
|
Remove obsolete attribute in repository_datatable.js after feature branch merge
|
2020-06-24 16:25:42 +02:00 |
|
aignatov-bio
|
6a41290d9d
|
Add tables to TinyMce and small table improvments
|
2020-06-24 15:51:59 +02:00 |
|
aignatov-bio
|
4f8a612106
|
add new line
|
2020-06-24 15:25:34 +02:00 |
|
aignatov-bio
|
a3ea0927c9
|
Revert helper JS to es5
|
2020-06-24 15:12:13 +02:00 |
|
aignatov-bio
|
80970b6448
|
Remove hashes from datatable helper
|
2020-06-24 14:39:33 +02:00 |
|
Oleksii Kriuchykhin
|
7ea577d8d4
|
Merge branch 'features/inventory-archiving' into develop
|
2020-06-24 14:04:54 +02:00 |
|
Urban Rotnik
|
193375818e
|
Disable checkboxes for shared inventories
|
2020-06-24 13:41:00 +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 |
|
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
|
efbc05e00e
|
Merge pull request #2675 from urbanrotnik/ur-sci-4782
Include archived columns to inventories export [SCI-4782]
|
2020-06-23 16:51:50 +02:00 |
|
aignatov-bio
|
414429afcd
|
Merge pull request #2674 from aignatov-bio/ai-sci-4784-update-manage-columns-for-archived-repository
Add archived_by and archived_on column to columns manage modal [SCI-4784]
|
2020-06-23 09:10:28 +02:00 |
|
Urban Rotnik
|
d1b1b5f268
|
Include archived columns to inventories export
|
2020-06-22 14:28:49 +02:00 |
|
aignatov-bio
|
dc50e7f1fd
|
Add archived_by and archived_on column to columns manage modal
|
2020-06-22 14:00:44 +02:00 |
|
aignatov-bio
|
6f2d5b359e
|
Add action buttons to repository index
|
2020-06-19 15:54:45 +02:00 |
|
Mojca Lorber
|
8d43603789
|
Fix acivities and error handeling
|
2020-06-19 09:04:42 +02:00 |
|
Mojca Lorber
|
6e8062179c
|
Implement archiving and restoring of whole inventories
|
2020-06-18 18:07:23 +02:00 |
|
aignatov-bio
|
323929b270
|
Add restore/delete buttons
|
2020-06-18 14:09:29 +02:00 |
|
aignatov-bio
|
e9830ebfee
|
Add view switcher
|
2020-06-18 14:08:24 +02:00 |
|
Urban Rotnik
|
a05be67d3a
|
Merge pull request #2652 from urbanrotnik/ur-sci-4703-archived-tag
Add archived tags to assigned repository rows [SCI-4703]
|
2020-06-18 13:47:57 +02:00 |
|
aignatov-bio
|
7f9af06f78
|
Fix dropdown position for full screen modals
|
2020-06-18 13:29:28 +02:00 |
|
Oleksii Kriuchykhin
|
8280d2a41e
|
Allow HTML in inline editor, needed for handling smart annotations [SCI-4707]
|
2020-06-16 13:55:27 +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 |
|
aignatov-bio
|
a6ff5b1ed8
|
Merge pull request #2653 from aignatov-bio/ai-sci-4692-add-archiving-columns-to-datable-helper
Add archiving column to datatable helper [SCI-4692]
|
2020-06-15 15:35:19 +02:00 |
|
Urban Rotnik
|
868c1c1fa0
|
Improve row state passing
|
2020-06-15 13:42:16 +02:00 |
|
Urban Rotnik
|
ec14cf9fef
|
Merge pull request #2657 from urbanrotnik/ai-sci-4765-v2
Fix smart annotation in inventory on edit [SCI-4765] (HotFix branch)
|
2020-06-12 11:41:02 +02:00 |
|
Urban Rotnik
|
800465f9a9
|
Merge pull request #2648 from aignatov-bio/ai-sci-4733-disable-marvinjs-if-not-using
Not include marvinJS library, if marvinJS disabled [SCI-4733]
|
2020-06-12 11:40:41 +02:00 |
|
aignatov-bio
|
97f5a7e9fc
|
Fix smart annotation in inventory on edit
|
2020-06-12 11:17:50 +02:00 |
|
mlorb
|
0a7c9aeb1a
|
Merge pull request #2651 from urbanrotnik/ur-sci-4706-archiving-restoring-rows
Archiving & restoring rows [SCI-4706]
|
2020-06-11 16:41:53 +02:00 |
|
Mojca Lorber
|
cfeb4b4d3d
|
Fix protocol duplication at saving protocol from task to repository
|
2020-06-11 13:19:21 +02:00 |
|
aignatov-bio
|
db35da0cee
|
Add archiving column to datatable helper
|
2020-06-11 12:48:31 +02:00 |
|
Urban Rotnik
|
9bac0fb867
|
Add archived tags to assigned repository rows
|
2020-06-10 14:48:03 +02:00 |
|
Urban Rotnik
|
c7d6c4d60e
|
Add repository_rows restoring and archiving actions on FE
|
2020-06-09 22:16:55 +02:00 |
|
aignatov-bio
|
2b9062ac92
|
Add checkbox selector to datatable
|
2020-06-09 13:16:50 +02:00 |
|
Mojca Lorber
|
c0c93772ff
|
Fix protocol duplication at saving protocol from task to repository
|
2020-06-09 11:45:03 +02:00 |
|
aignatov-bio
|
15de84ff2f
|
Not include marvinJS library, if marvinJS disabled
|
2020-06-08 09:59:26 +02:00 |
|
Oleksii Kriuchykhin
|
85ce72e5ff
|
Remove obsolete JS functions from repositories datatable [SCI-4571]
|
2020-06-05 11:15:58 +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 |
|
aignatov-bio
|
012b7b3d23
|
Add switch for active/archive repository view
|
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 |
|
Urban Rotnik
|
9d96baf008
|
Escape special chars for FE and BE
|
2020-06-02 15:16:01 +02:00 |
|
Urban Rotnik
|
9b0f215187
|
Fix status dropdown rendering
|
2020-06-02 06:15:34 +02:00 |
|
Urban Rotnik
|
4fc37e12a0
|
Fix dropdown render for columns manage modal
|
2020-06-01 18:41:58 +02:00 |
|
aignatov-bio
|
3294840611
|
Fix sidebar event
|
2020-06-01 14:45:03 +02:00 |
|
aignatov-bio
|
aee75a2f83
|
Add repository list view
|
2020-06-01 10:24:03 +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 |
|
aignatov-bio
|
368ee8a689
|
Show selected snapshot in sidebar
|
2020-05-28 15:18:26 +02:00 |
|
aignatov-bio
|
f7a215c953
|
Fix escape issue in dropdowns
|
2020-05-28 10:55:36 +02:00 |
|
aignatov-bio
|
7b36392a19
|
Merge pull request #2606 from aignatov-bio/ai-sci-4621-resize-simple-table-header-size-on-sidebar-colapse
Resize simple table header on sidebar collapse [SCI-4621]
|
2020-05-27 09:35:40 +02:00 |
|
aignatov-bio
|
f86b71144d
|
Resize simple table header on sidebar collapse
|
2020-05-25 16:21:28 +02:00 |
|
Mojca Lorber
|
76a1f73989
|
Change order of snapshots versions
|
2020-05-25 12:15:24 +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 |
|
aignatov-bio
|
9973151278
|
Merge pull request #2598 from aignatov-bio/ai-sci-4662-fix-new-comment-field
Fix new comment field [SCI-4662]
|
2020-05-25 09:09:33 +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 |
|
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
|
8161bbb31c
|
Fix new comment field
|
2020-05-22 16:51:11 +02:00 |
|
aignatov-bio
|
cbc578f84b
|
Fix snapshot name column id
|
2020-05-22 15:10: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
|
0aa1c32813
|
Fix ordering in simple table view
|
2020-05-21 16:51:07 +02:00 |
|
Mojca Lorber
|
e2959fec32
|
Merge branch 'develop' into ml-sci-4582
|
2020-05-20 10:37:33 +02:00 |
|
aignatov-bio
|
40b266ee0d
|
Clear full view repository modal before open
|
2020-05-19 16:44:47 +02:00 |
|
aignatov-bio
|
2dcada4bc5
|
Merge pull request #2580 from aignatov-bio/ai-sci-4647-add-custom-tinymce-plugins-to-asset-pipeline
Add custom tinymce plugins to assets pipeline [SCI-4647]
|
2020-05-19 10:31:51 +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 |
|
Urban Rotnik
|
1dc0e2b40b
|
Merge pull request #2581 from urbanrotnik/ur-sci-4640-wrong-snapshot-displayed
Hide sidebar Versions by default [SCI-4640]
|
2020-05-19 10:27:57 +02:00 |
|
Alex Kriuchykhin
|
49a35f43c5
|
Merge pull request #2578 from okriuchykhin/ok_SCI_4645
Fix error message for file upload limit on steps [SCI-4645]
|
2020-05-19 10:27:12 +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 |
|
Urban Rotnik
|
ea0e97d046
|
Hide sidebar on modal close
|
2020-05-19 09:46:38 +02:00 |
|
aignatov-bio
|
3047af759f
|
Add custom tinymce plugins to assets pipeline
|
2020-05-18 18:06:52 +02:00 |
|
Oleksii Kriuchykhin
|
bc1ee1bd8d
|
Fix error message for file upload limit on steps [SCI-4645]
|
2020-05-18 16:16:39 +02:00 |
|
aignatov-bio
|
9f4457642d
|
Fix collapse animation for task sections
|
2020-05-18 16:01:26 +02:00 |
|
Alex Kriuchykhin
|
e9a05d2e3d
|
Merge pull request #2575 from okriuchykhin/ok_SCI_4637
Fix selection of the default snapshot on tasks [SCI-4637]
|
2020-05-18 14:25:26 +02:00 |
|
Oleksii Kriuchykhin
|
d77930af61
|
Fix failing tests for repository rows controller [SCI-4629]
|
2020-05-18 14:12:06 +02:00 |
|
aignatov-bio
|
1f24adddf9
|
Merge pull request #2562 from aignatov-bio/ai-sci-4627-remove-search-word-from-task-table-state
Remove search from state load in task repository [SCI-4627]
|
2020-05-18 11:16:27 +02:00 |
|
aignatov-bio
|
343356cab7
|
Merge pull request #2571 from aignatov-bio/ai-sci-4639-select-correct-button-for-assign-modal
Select correct button name for assign modal [SCI-4639]
|
2020-05-18 11:16:07 +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 |
|
aignatov-bio
|
2b3dda8ce0
|
Merge pull request #2569 from aignatov-bio/ai-sci-4613-add-title-for-assign-modal
Add a title for full view assign modal [SCI-4613]
|
2020-05-18 11:15:36 +02:00 |
|
Oleksii Kriuchykhin
|
8b968f6f67
|
Fix selection of the default snapshot on tasks [SCI-4637]
|
2020-05-18 11:06:42 +02:00 |
|
aignatov-bio
|
820514789d
|
Update tinymce gem version
|
2020-05-17 17:36:26 +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
|
f921ac75d8
|
Select correct button name for assign modal
|
2020-05-15 15:37:48 +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 |
|
aignatov-bio
|
69abccbbd6
|
Add title for full view assign modal
|
2020-05-15 14:22:20 +02:00 |
|
Mojca Lorber
|
4c15c89cf5
|
Add New Task layout Collapsed/Expanded States saving
|
2020-05-15 00:49:23 +02:00 |
|
aignatov-bio
|
c9a9cd2e75
|
Remove search from state load in task repository
|
2020-05-14 21:49:01 +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
|
af4ac7c53b
|
Add const to dropdown library
|
2020-05-14 16:29:50 +02:00 |
|
aignatov-bio
|
309f8c1a3d
|
Small snapshots CSS corrections
|
2020-05-14 16:29:50 +02:00 |
|