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
|
309178344e
|
Merge pull request #2723 from urbanrotnik/ur-sci-4721-v2
Fix counter in assign dropdown menu on task [SCI-4721]
|
2020-07-09 15:43:34 +02:00 |
|
Urban Rotnik
|
4003608c7d
|
Fix style
|
2020-07-09 15:43:08 +02:00 |
|
Oleksii Kriuchykhin
|
7efe5c32eb
|
Fix missing unshared and unassigned inventories with snapshots in reports [SCI-4845]
|
2020-07-09 15:38:38 +02:00 |
|
mlorb
|
0f43f6a479
|
Merge pull request #2721 from mlorb/ml-sci-4788-v2
Fix bug with not hidden navigation on inventory page [SCI-4788]
|
2020-07-09 15:12:44 +02:00 |
|
Urban Rotnik
|
d2415c3b1d
|
Show assigned users modal also for view
|
2020-07-09 15:11:53 +02:00 |
|
mlorb
|
3f44f44cbe
|
Merge pull request #2711 from mlorb/ml-sci-4810
Hide inventory buttons and fix css of disabled button [SCI-4810]
|
2020-07-09 15:11:02 +02:00 |
|
Urban Rotnik
|
d8d0f7ef8e
|
Fix counter in assign dropdown menu on task
|
2020-07-09 14:50:37 +02:00 |
|
Miha Mencin
|
2cb3720602
|
Merge pull request #2720 from aignatov-bio/ai-sci-4842-snapshot-archived-label-wrong-position
Add archived label to correct column [SCI-4842]
|
2020-07-09 14:49:54 +02:00 |
|
Mojca Lorber
|
cb8070c012
|
Fix pointer event
|
2020-07-09 14:25:54 +02:00 |
|
Mojca Lorber
|
1a2b321523
|
Fix bug with not hidden navigation on inventory page
|
2020-07-09 14:09:55 +02:00 |
|
aignatov-bio
|
c240474f76
|
Add archived label to correct column
|
2020-07-09 13:39:26 +02:00 |
|
Urban Rotnik
|
b11f166c38
|
Fix cucumber tests
|
2020-07-09 13:14:07 +02:00 |
|
Urban Rotnik
|
d92bcee3f6
|
Helpers for first elements
|
2020-07-09 13:14:06 +02:00 |
|
Miha Mencin
|
b357d7c0e6
|
Merge pull request #2719 from urbanrotnik/ur-sci-4806-missing-icon
Add icon before archived items [SCI-4806]
|
2020-07-09 12:58:06 +02:00 |
|
aignatov-bio
|
6245e19069
|
Merge pull request #2718 from biosistemika/master
Merge master to develop
|
2020-07-09 12:56:31 +02:00 |
|
mlorb
|
73e2654d78
|
Merge pull request #2701 from mlorb/ml-sci-4793
Add empty states to inventories datatable and fix filtering bug [SCI-4793]
|
2020-07-09 11:49:16 +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
|
d9038e6f7f
|
Merge branch 'develop' into ml-sci-4810
|
2020-07-09 11:46:54 +02:00 |
|
Mojca Lorber
|
19c5b7e5a2
|
Remove redundant css class
|
2020-07-09 11:44:36 +02:00 |
|
Urban Rotnik
|
7661cea379
|
Add icon before archived items
|
2020-07-09 11:34:09 +02:00 |
|
Miha Mencin
|
c68aa5c875
|
Merge pull request #2716 from mlorb/ml-sci-4567
Change title size to h1 [SCI-4567]
|
2020-07-09 11:19:02 +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
|
f64172f787
|
Revert repository archived items title
|
2020-07-09 09:17:02 +02:00 |
|
aignatov-bio
|
b2a42c182b
|
Merge pull request #2717 from aignatov-bio/ai-sci-4844-fix-dropdown-options-for-active-repository
Small archived repositories fixes [SCI-4844]
|
2020-07-09 08:56:21 +02:00 |
|
Alex Kriuchykhin
|
3534d0c60f
|
Merge pull request #2712 from okriuchykhin/ok_SCI_4840
Fix assigned counter on inventory items assigning modal [SCI-4840]
|
2020-07-08 13:53:57 +02:00 |
|
aignatov-bio
|
135ac487d0
|
Small archived repositories fixes
|
2020-07-08 13:42:27 +02:00 |
|
Mojca Lorber
|
de9df7f1b0
|
Add NotImplementedError
|
2020-07-08 13:28:12 +02:00 |
|
Mojca Lorber
|
00b668a4ba
|
Change title size to h1
|
2020-07-08 13:02:47 +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
|
33aa1d3641
|
Merge pull request #2709 from urbanrotnik/ur-sci-4804
Fix Repository rows count & table header adjustmen [SCI-4804]
|
2020-07-08 11:39:44 +02:00 |
|
Urban Rotnik
|
2e1d1cc210
|
Clean styles
|
2020-07-08 11:35:25 +02:00 |
|
Urban Rotnik
|
5d067077b1
|
Add logo and timestamp to PDF and Doc reports
|
2020-07-08 10:48:29 +02:00 |
|
aignatov-bio
|
b85985afc3
|
Merge pull request #2707 from aignatov-bio/ai-sci-4839-fix-smart-annotation-name-on-archived-items
Fix smart annotation for archived items [SCI-4839]
|
2020-07-08 09:30:54 +02:00 |
|
aignatov-bio
|
8c91181abc
|
Merge pull request #2702 from aignatov-bio/ai-sci-4800-keep-table-page-after-item-update
Keep table page after repository item update [SCI-4800]
|
2020-07-08 09:30:26 +02:00 |
|
aignatov-bio
|
a994c75885
|
Merge pull request #2700 from aignatov-bio/ai-sci-4801-inventory-list-sorting-date-issue
Fix date columns sorting in repositories list [SCI-4801]
|
2020-07-08 09:30:10 +02:00 |
|
aignatov-bio
|
65c28d641f
|
Merge pull request #2698 from aignatov-bio/ai-sci-4807-disable-column-reordering-repositories-list
Disable column reordering in repositories list [SCI-4807]
|
2020-07-08 09:29:51 +02:00 |
|
aignatov-bio
|
716319354b
|
Merge pull request #2706 from aignatov-bio/ai-sci-4820-fix-sidebar-inventory-refresh
Improve active/archive switcher [SCI-4820]
|
2020-07-08 09:29:16 +02:00 |
|
aignatov-bio
|
004a7e3943
|
Merge pull request #2705 from aignatov-bio/ai-sci-4808-update-css-for-inventory-modals
Update inventory modals CSS [SCI-4808]
|
2020-07-08 09:29:02 +02:00 |
|
aignatov-bio
|
88c092dc98
|
Add i18n and constants
|
2020-07-07 15:59:02 +02:00 |
|
Oleksii Kriuchykhin
|
482765e942
|
Fix assigned counter on inventory items assigning modal [SCI-4840]
|
2020-07-07 14:40:19 +02:00 |
|
Mojca Lorber
|
9642e92fdc
|
Hide inventory buttons and fix css of disabled button
|
2020-07-07 13:53:31 +02:00 |
|
aignatov-bio
|
7a9a25e6a9
|
Add 2fa wizzard tabs
|
2020-07-07 13:17:17 +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
|
b347fcf5c9
|
Merge pull request #2699 from urbanrotnik/ur-sci-4809-hide-buttons-when-no-permissions
Hide checkbox column when user is not an admin [SCI-4809]
|
2020-07-07 11:29:54 +02:00 |
|
Urban Rotnik
|
ceddfdd978
|
Remove flash message for redirects from root url
|
2020-07-07 11:13:36 +02:00 |
|
Urban Rotnik
|
d16a2ed9c9
|
Fix Datatable header adjustments on repositories index
|
2020-07-07 09:49:05 +02:00 |
|
Urban Rotnik
|
79ef4ece28
|
Fix repository rows count
|
2020-07-07 09:48:18 +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
|
784788e9f3
|
Fix smart annotation for archived items
|
2020-07-06 14:22:45 +02:00 |
|
aignatov-bio
|
b127d8c754
|
Improve active/archive switcher
|
2020-07-06 14:03:55 +02:00 |
|
aignatov-bio
|
6352a4ba9b
|
Update inventory modals
|
2020-07-06 12:47:42 +02:00 |
|
Oleksii Kriuchykhin
|
3af20c96c7
|
Fix tests and checklist item validation [SCI-4776]
|
2020-07-03 16:48:32 +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
|
cc1b75644d
|
Keep table page after repository item update
|
2020-07-03 13:45:02 +02:00 |
|
Mojca Lorber
|
db8c7cd97c
|
Add empty states to inventories datatable and fix filtering bug
|
2020-07-02 15:51:07 +02:00 |
|
Miha Mencin
|
6726a19cbe
|
Merge pull request #2695 from okriuchykhin/ok_SCI_4738
Add repository snapshots to export all [SCI-4738]
|
2020-07-02 15:18:47 +02:00 |
|
aignatov-bio
|
d226bb5622
|
Fix date columns sorting in repositories list
|
2020-07-02 14:35:48 +02:00 |
|
Urban Rotnik
|
1bf8198129
|
Hide checkbox column when user is not admin
|
2020-07-02 14:29:18 +02:00 |
|
aignatov-bio
|
9340148b41
|
Disable column reordering in repositories list
|
2020-07-02 11:50:40 +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
|
1a5f32bd94
|
Merge pull request #2692 from aignatov-bio/ai-sci-4754-enable-2fa-button-in-settings
Add enable 2fa button to user settings [SCI-4754]
|
2020-06-29 15:11:45 +02:00 |
|
aignatov-bio
|
630bef1adf
|
Add special characters to smart annotation
|
2020-06-29 14:47:35 +02:00 |
|
Oleksii Kriuchykhin
|
166a0ddd34
|
Improve code styling [SCI-4738]
|
2020-06-29 11:43:23 +02:00 |
|
aignatov-bio
|
fe79fa4788
|
Fix markup
|
2020-06-29 10:57:41 +02:00 |
|
aignatov-bio
|
6fa97d3639
|
Add enable 2fa button to user settings
|
2020-06-29 10:56:06 +02:00 |
|
Urban Rotnik
|
de8aca9dbd
|
Rename column
|
2020-06-29 10:42:19 +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 |
|
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 |
|
Miha Mencin
|
76c2e032dc
|
Merge pull request #2666 from aignatov-bio/ai-sci-4747-fix-long-inventory-name
Fix long inventory name issue on task page [SCI-4747]
|
2020-06-29 09:44:21 +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 |
|
Miha Mencin
|
bfdf53c514
|
Merge pull request #2673 from urbanrotnik/ur-sci-4749
Fix valdiation for snapshot selection [SCI-4749]
|
2020-06-29 09:42:37 +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 |
|
Urban Rotnik
|
88f54b16d7
|
Add 2fa fields to user
|
2020-06-24 17:58:58 +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 |
|
Alex Kriuchykhin
|
4793843977
|
Merge pull request #2684 from urbanrotnik/ur-sci-4678-disable-checkbox
Disable checkbox for shared inventories [SCI-4781]
|
2020-06-24 13:57:27 +02:00 |
|
Alex Kriuchykhin
|
2125c8bf83
|
Merge pull request #2683 from mlorb/ml-sci-4742
Hide archived and not assigned items … [SCI-4742]
|
2020-06-24 13:47:22 +02:00 |
|
Urban Rotnik
|
193375818e
|
Disable checkboxes for shared inventories
|
2020-06-24 13:41:00 +02:00 |
|
Mojca Lorber
|
7e645eade4
|
Add active scope to repository_rows in assigning servise
|
2020-06-24 13:22:09 +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 |
|
Mojca Lorber
|
bdf959db1f
|
Hide archived and not assigned items from the assigning screen on the task
|
2020-06-24 12:06:53 +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 |
|
Urban Rotnik
|
8dc48e9f95
|
Remove archiving rows from RepositoryArchiveService
|
2020-06-24 10:35:24 +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
|
91af7135c1
|
Update scopes for repository items
|
2020-06-23 18:24:46 +02:00 |
|
Urban Rotnik
|
6de322498b
|
Delegate archived methods to parent repository
|
2020-06-23 17:16:02 +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 |
|
Urban Rotnik
|
c565cbe579
|
Filter out non active repositories and rows
|
2020-06-23 10:23:22 +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
|
e89bf58e1c
|
Refactory restore inventory service
|
2020-06-23 08:24:52 +02:00 |
|
Urban Rotnik
|
d874b6f732
|
Refactory archive inventory service
|
2020-06-22 22:45:34 +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
|
22a45237be
|
Remove doubled code
|
2020-06-22 15:41:24 +02:00 |
|
Mojca Lorber
|
be19190ff1
|
Revert default_scope for active repositories
|
2020-06-22 14:57:35 +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
|
b64b6ed326
|
Remove hack for activities
|
2020-06-22 10:24:58 +02:00 |
|
Urban Rotnik
|
07ca1de737
|
Fix valdiation for snapshot selection
|
2020-06-22 07:30:49 +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
|
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 |
|
aignatov-bio
|
e9830ebfee
|
Add view switcher
|
2020-06-18 14:08:24 +02:00 |
|
aignatov-bio
|
8b10d49118
|
Clean up CSS
|
2020-06-18 14:08:24 +02:00 |
|
Urban Rotnik
|
b498aa54d3
|
Merge pull request #2661 from urbanrotnik/ur-sci-4740-default-scope
Update default scope [SCI-4740] [SCI-4687][SCI-4746]
|
2020-06-18 14:07:10 +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 |
|
Urban Rotnik
|
06fab7d01c
|
Update smart anotation preview for archived items
|
2020-06-18 13:45:08 +02:00 |
|
aignatov-bio
|
7f9af06f78
|
Fix dropdown position for full screen modals
|
2020-06-18 13:29:28 +02:00 |
|
Urban Rotnik
|
123375f494
|
Update scopes in reports
|
2020-06-18 09:33:12 +02:00 |
|
Urban Rotnik
|
d5b82f857e
|
Add tag for DOCX
|
2020-06-18 08:52:59 +02:00 |
|
Oleksii Kriuchykhin
|
86b2eea383
|
Add repository snapshots to export all [SCI-4738]
|
2020-06-17 23:21:56 +02:00 |
|
aignatov-bio
|
e8ea8b5b3f
|
Fix long inventory name issue on task page
|
2020-06-17 15:08:07 +02:00 |
|
aignatov-bio
|
d0f0baf6b2
|
Merge pull request #2664 from urbanrotnik/ur-sci-4762-v2
Canvas fix [SCI-4762] -v2
|
2020-06-17 13:01:40 +02:00 |
|
Urban Rotnik
|
41c1230db1
|
Remove position check from contorller
|
2020-06-17 11:55:43 +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 |
|
Urban Rotnik
|
c0a2d4709c
|
Merge pull request #2662 from urbanrotnik/ai-sci-4770
Fix MarvinJS modal header [SCI-4770] - HotFix
|
2020-06-16 11:44:04 +02:00 |
|
aignatov-bio
|
95ae8215a7
|
Fix MarvinJS modal header
|
2020-06-16 10:28: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 |
|
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
|
481516260f
|
Merge pull request #2658 from urbanrotnik/ur-sci-4762-canvas-errors
Fix update_canvas [SCI-4762]
|
2020-06-15 11:59:26 +02:00 |
|
Urban Rotnik
|
15342cd8f2
|
Fix update_canvas
|
2020-06-15 10:52:35 +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 |
|
Urban Rotnik
|
39eb8145c2
|
Rename params method
|
2020-06-11 16:11:23 +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 |
|