Urban Rotnik
|
7aa40a284e
|
Merge pull request #2724 from urbanrotnik/ur-sci-4771-improve-report-layout
Text wrap for page numbers [SCI-4771]
|
2020-07-09 16:52:41 +02:00 |
|
Urban Rotnik
|
1f220f70ee
|
Text wrap for page numbers
|
2020-07-09 16:24:14 +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
|
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 |
|
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 |
|
Urban Rotnik
|
fabfd7ddaf
|
Add controller action for Archive&Restore
|
2020-06-09 19:18:30 +02:00 |
|
Urban Rotnik
|
26db4f3515
|
Add Archive and Restore service
|
2020-06-09 18:50:36 +02:00 |
|
Urban Rotnik
|
ebbce8d09e
|
Add restore columns to migrations
|
2020-06-09 18:43:22 +02:00 |
|
aignatov-bio
|
9dd5996122
|
Merge pull request #2650 from aignatov-bio/ai-sci-4739-checkbox-component-for-datatable
Add checkbox selector to DataTable [SCI-4739]
|
2020-06-09 14:39:33 +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 |
|
mlorb
|
75f2a49cc4
|
Merge branch 'features/inventory-archiving' into ml-sci-4689
|
2020-06-08 16:30:24 +02:00 |
|
Mojca Lorber
|
a9a278409c
|
Fix test
|
2020-06-08 16:22:37 +02:00 |
|
aignatov-bio
|
15de84ff2f
|
Not include marvinJS library, if marvinJS disabled
|
2020-06-08 09:59:26 +02:00 |
|
Alex Kriuchykhin
|
f521531fd5
|
Merge pull request #2638 from okriuchykhin/ok_SCI_4571
Clear the obsolete code for assigning inventory items to the task [SCI-4571]
|
2020-06-08 09:47:56 +02:00 |
|
Urban Rotnik
|
9b114a50c3
|
Merge pull request #2642 from urbanrotnik/ur-sci-4721-counter-fix
Fix assigned items counter [SCI-4721]
|
2020-06-08 09:10:44 +02:00 |
|
Urban Rotnik
|
17620e3e86
|
Merge pull request #2631 from urbanrotnik/ur-sci-4534-not-visible-checklist
Export and import checklist items with delimiter [SCI-4534]
|
2020-06-08 09:10:26 +02:00 |
|
Oleksii Kriuchykhin
|
85ce72e5ff
|
Remove obsolete JS functions from repositories datatable [SCI-4571]
|
2020-06-05 11:15:58 +02:00 |
|
Mojca Lorber
|
42d6d727b9
|
Add archive to repository rows
|
2020-06-04 23:29:37 +02:00 |
|
aignatov-bio
|
4a6d7d0e12
|
Add archived inventories
|
2020-06-04 19:07:10 +02:00 |
|
aignatov-bio
|
dd58fc4199
|
Fix i18n
|
2020-06-04 18:41:45 +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 |
|
Mojca Lorber
|
d3806e53a5
|
Add archive to repository
|
2020-06-04 15:44:47 +02:00 |
|
Urban Rotnik
|
c2ecc1749e
|
Fix assigned items counter
|
2020-06-04 15:36:31 +02:00 |
|
Oleksii Kriuchykhin
|
f1f26587c0
|
Fix appearence of snapshots from another my_module in report [SCI-4728]
|
2020-06-04 09:42:22 +02:00 |
|
Miha Mencin
|
38877aad26
|
Merge pull request #2639 from urbanrotnik/ur-sci-4728
Scope snapshots to project [SCI-4728]
|
2020-06-03 23:40:14 +02:00 |
|
Urban Rotnik
|
a93e2a5d6f
|
Remove select
|
2020-06-03 23:18:22 +02:00 |
|
Urban Rotnik
|
69d086ba32
|
Scope snapshots to project
|
2020-06-03 22:58:22 +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 |
|
aignatov-bio
|
4886d95ad5
|
Fix variable naming
|
2020-06-03 17:07:11 +02:00 |
|
aignatov-bio
|
503d19fb90
|
Add snapshots to team export/import
|
2020-06-03 17:02:33 +02:00 |
|
Urban Rotnik
|
50bc313853
|
Fix for default snapshot in report
|
2020-06-03 10:49:45 +02:00 |
|
Urban Rotnik
|
21e048c52e
|
Merge pull request #2633 from urbanrotnik/ur-sci-fix-manage-column-dropdown
Fix dropdown render for columns manage modal [SCI-4720]
|
2020-06-02 15:44:25 +02:00 |
|
Urban Rotnik
|
9d96baf008
|
Escape special chars for FE and BE
|
2020-06-02 15:16:01 +02:00 |
|
aignatov-bio
|
f986a0ed56
|
Fix owner team for snapshots
|
2020-06-02 11:40:30 +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 |
|
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 |
|
Oleksii Kriuchykhin
|
6afebdc5da
|
Remove inventory links of unshared inventory [SCI-4715]
|
2020-06-01 17:50:31 +02:00 |
|
Urban Rotnik
|
446a2db186
|
Export and import checklist items with delimiter
|
2020-06-01 17:19:33 +02:00 |
|
aignatov-bio
|
3294840611
|
Fix sidebar event
|
2020-06-01 14:45:03 +02:00 |
|
aignatov-bio
|
f963608996
|
Add I18n and tests
|
2020-06-01 14:34:04 +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
|
7c8460dcf5
|
Merge pull request #2628 from aignatov-bio/ai-sci-4699-change-line-thikness
Change selected line thickness [SCI-4699]
|
2020-06-01 10:43:46 +02:00 |
|
aignatov-bio
|
222e89ea8d
|
Change selected line thickness
|
2020-06-01 10:30:06 +02:00 |
|
aignatov-bio
|
8f3c7fa9aa
|
Merge pull request #2627 from aignatov-bio/ai-sci-4549-fix-shared-inventory-icon
Fix shared inventory icon [SCI-4549]
|
2020-06-01 10:28:07 +02:00 |
|
aignatov-bio
|
e67f345602
|
Merge pull request #2624 from aignatov-bio/ai-sci-4701-small-css-fixes
Small css fixes [SCI-4701]
|
2020-06-01 10:27:54 +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
|
b688b0c335
|
Merge pull request #2616 from okriuchykhin/ok_SCI_4698_v2
Fix handling of deleted repositories in reports [SCI-4698]
|
2020-05-29 16:51:17 +02:00 |
|
Oleksii Kriuchykhin
|
d774a82762
|
Fix handling of snapshots of deleted repositories in reports [SCI-4698]
|
2020-05-29 16:30:27 +02:00 |
|
aignatov-bio
|
1430ca5ae9
|
Fix shared inventory icon
|
2020-05-29 13:17:07 +02:00 |
|
Oleksii Kriuchykhin
|
7a95355e81
|
Add extra check for repository presence in report [SCI-4698]
|
2020-05-29 11:39:07 +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 |
|
Alex Kriuchykhin
|
4c50f75aa2
|
Merge pull request #2621 from aignatov-bio/ai-sci-4710-fix-escape-issue-in-dropdowns
Fix escape issue in dropdowns [SCI-4710]
|
2020-05-29 09:52:36 +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
|
7f0d43209e
|
Small css fixes
|
2020-05-28 16:04:21 +02:00 |
|
aignatov-bio
|
116747f261
|
Filter private assigned tasks
|
2020-05-28 15:35:19 +02:00 |
|
aignatov-bio
|
368ee8a689
|
Show selected snapshot in sidebar
|
2020-05-28 15:18:26 +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 |
|
Alex Kriuchykhin
|
5ce1311591
|
Merge pull request #2620 from okriuchykhin/ok_SCI_4673
Fix file download from MS Office online [SCI-4673]
|
2020-05-28 13:09:14 +02:00 |
|
Mojca Lorber
|
285280827a
|
Refactor repository column base controller
|
2020-05-28 12:18:46 +02:00 |
|
aignatov-bio
|
f7a215c953
|
Fix escape issue in dropdowns
|
2020-05-28 10:55:36 +02:00 |
|
Mojca Lorber
|
c673e27109
|
Merge branch 'develop' into ml-sci-4261
|
2020-05-28 08:18:24 +02:00 |
|
aignatov-bio
|
2950f4fe51
|
Merge pull request #2615 from aignatov-bio/ai-sci-4633-check-duplicate-protocol-name-during-import
Check duplicate protocol name during import [SCI-4633]
|
2020-05-27 17:15:44 +02:00 |
|
Oleksii Kriuchykhin
|
0465dba2cf
|
Fix file dowload from MS Office online [SCI-4673]
|
2020-05-27 16:59:28 +02:00 |
|
aignatov-bio
|
8f998ceee9
|
Fix counter
|
2020-05-27 16:11:10 +02:00 |
|
aignatov-bio
|
aaff5eb67f
|
Add name order for porject/experiment/task sidebar
|
2020-05-27 13:31:00 +02:00 |
|
aignatov-bio
|
32c1f4af84
|
Fix forgot password link margin
|
2020-05-27 12:55:15 +02:00 |
|
Oleksii Kriuchykhin
|
b430d507cf
|
Fix handling of deleted repositories in reports [SCI-4698]
|
2020-05-27 12:15:19 +02:00 |
|
aignatov-bio
|
40ad9fbf00
|
Check duplicate protocol name during import
|
2020-05-27 12:10:48 +02:00 |
|
Alex Kriuchykhin
|
8ed8f148a3
|
Revert "Fix handling of deleted repositories in reports [SCI-4698]"
|
2020-05-27 10:39:44 +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 |
|
Oleksii Kriuchykhin
|
6424bd23da
|
Fix handling of deleted repositories in reports [SCI-4698]
|
2020-05-27 08:21:55 +02:00 |
|
aignatov-bio
|
457b0a8137
|
Merge pull request #2610 from aignatov-bio/ai-sci-4697-fix-snapshot-date-creation
Fix snapshot date creation [SCI-4697]
|
2020-05-26 16:28:13 +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 |
|
aignatov-bio
|
73c7ff47a5
|
Fix z-index for full view modal
|
2020-05-26 12:41:07 +02:00 |
|
Miha Mencin
|
4b7b3a8622
|
Merge pull request #2607 from biosistemika/SCI-4674-tehnician-snapshots-permissions
[SCI-4674] Fix a typo
|
2020-05-25 17:30:19 +02:00 |
|
Miha Mencin
|
55aac63fba
|
Fix a typo
|
2020-05-25 17:28:36 +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
|
26f4f24cc6
|
SCI-4674 fix stupid
|
2020-05-25 16:30:22 +02:00 |
|
Miha Mencin
|
77e1feda97
|
SCI-4674 name permissions more properly
|
2020-05-25 16:29:00 +02:00 |
|
aignatov-bio
|
f86b71144d
|
Resize simple table header on sidebar collapse
|
2020-05-25 16:21:28 +02:00 |
|
Miha Mencin
|
5f195b3622
|
SCI-4674 check if experiment and projects are active during snapshot creation
|
2020-05-25 15:56:39 +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 |
|
Urban Rotnik
|
c7361332ab
|
Merge pull request #2567 from urbanrotnik/ur-sci-4622-snapshot-in-report
Show snapshot in report [SCI-4622]
|
2020-05-25 14:21:49 +02:00 |
|
Urban Rotnik
|
b264b86cba
|
Prepand callback
|
2020-05-25 14:00:41 +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 |
|
aignatov-bio
|
3a1280fead
|
Merge pull request #2602 from aignatov-bio/ai-sci-4675-fix-ordering-of-columns-to-snapshots
Fix snapshot column ordering by parent_id [SCI-4675]
|
2020-05-25 13:39:16 +02:00 |
|
Urban Rotnik
|
d9690115f8
|
Move refresh reference from controller to model
|
2020-05-25 13:19:34 +02:00 |
|
Urban Rotnik
|
df8fe20d03
|
Keep reportElements up to date with active snapshots and repositories
|
2020-05-25 13:19:33 +02:00 |
|
Urban Rotnik
|
359517eb17
|
Add deleted repositories to report
|
2020-05-25 13:19:30 +02:00 |
|
Urban Rotnik
|
2b493ce6f6
|
Refactor assigned rows
|
2020-05-25 13:19:29 +02:00 |
|
Urban Rotnik
|
9536939b3b
|
Show snapshot rows in report
|
2020-05-25 13:19:28 +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
|
f0bdae8b67
|
Fix snapshot column ordering by parent_id
|
2020-05-25 11:19:43 +02:00 |
|
Mojca Lorber
|
94dc314c73
|
Hide hamburger menu on login screen
|
2020-05-25 10:39:35 +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 |
|
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
|
8161bbb31c
|
Fix new comment field
|
2020-05-22 16:51:11 +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 |
|
Urban Rotnik
|
a754e5765d
|
Merge pull request #2595 from urbanrotnik/ur-sci-4670-missing-button
New step missing button [SCI-4670]
|
2020-05-22 15:33:58 +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 |
|
Urban Rotnik
|
9d3874e343
|
Add margin to keywords container
|
2020-05-22 14:23:03 +02:00 |
|
Miha Mencin
|
a4cd014682
|
Merge pull request #2591 from okriuchykhin/ok_SCI_4656
Make a snapshot name synced with the inventory name if changed [SCI-4656]
|
2020-05-22 12:57:08 +02:00 |
|
Urban Rotnik
|
55f77cfe00
|
Merge pull request #2594 from urbanrotnik/4663-fix-button-visibility
Fix button visibility [SCI-4663]
|
2020-05-22 12:55:16 +02:00 |
|
Urban Rotnik
|
1c2883414b
|
Bring newStep top button back
|
2020-05-22 12:29:14 +02:00 |
|
Urban Rotnik
|
a1fa0b4e05
|
Add check for button visibility
|
2020-05-22 12:02:38 +02:00 |
|
Urban Rotnik
|
a9bed41ff5
|
Remove obsolete html message
|
2020-05-22 10:33:13 +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 |
|
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 |
|
Oleksii Kriuchykhin
|
388f52a064
|
Make a snapshot name synced with the inventory name if changed [SCI-4656]
|
2020-05-21 11:51:37 +02:00 |
|
Alex Kriuchykhin
|
bc70ceb120
|
Merge pull request #2590 from biosistemika/SCI-4628-schedule-snapshots-for-locked-tasks
[SCI-4628] moving snapshot provisioning logic into repository model, ma…
|
2020-05-21 09:53:04 +02:00 |
|
Mojca Lorber
|
12982260b7
|
Fix css hover effects
|
2020-05-21 08:37:40 +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 |
|
Oleksii Kriuchykhin
|
f2043f111b
|
Change display of the live version for a deleted inventory [SCI-4659]
|
2020-05-20 21:50:39 +02:00 |
|
aignatov-bio
|
d16930e987
|
Add private tasks to assigned task list
|
2020-05-20 17:23:48 +02:00 |
|
Urban Rotnik
|
a5b1f1cfd5
|
Merge pull request #2587 from urbanrotnik/ur-sci-4634-v2
Inventory import fix [SCI-4634] v2
|
2020-05-20 14:45:57 +02:00 |
|
Mojca Lorber
|
e2959fec32
|
Merge branch 'develop' into ml-sci-4582
|
2020-05-20 10:37:33 +02:00 |
|
Urban Rotnik
|
32df6f2568
|
Skip cell import if value is nil
|
2020-05-20 09:56:08 +02:00 |
|
mlorb
|
29370cf82e
|
Merge pull request #2586 from mlorb/ml-sci-4615
Fix missing creator in task details [SCI-4615]
|
2020-05-20 09:47:08 +02:00 |
|
aignatov-bio
|
51d9f054ee
|
Merge pull request #2584 from aignatov-bio/ai-sci-4654-clear-fullview-modal-before-open
Clear full view repository modal before open [SCI-4654]
|
2020-05-20 09:45:26 +02:00 |
|
aignatov-bio
|
4e7a26bdd0
|
Merge pull request #2583 from aignatov-bio/ai-sci-4651-fix-repository-ordering
Fix repositories order in dropdown [SCI-4651]
|
2020-05-20 09:45:13 +02:00 |
|
Urban Rotnik
|
2283491629
|
Conver to string if not importing into Number column
|
2020-05-20 09:09:14 +02:00 |
|
Mojca Lorber
|
40a3ee82d5
|
Add creator to task
|
2020-05-20 08:59:07 +02:00 |
|
aignatov-bio
|
40b266ee0d
|
Clear full view repository modal before open
|
2020-05-19 16:44:47 +02:00 |
|
aignatov-bio
|
d714b4b7bf
|
Merge pull request #2579 from aignatov-bio/ai-sci-4635-fix-checklist-appearance-in-fullview
Fix checklist render in full view [SCI-4635]
|
2020-05-19 16:18:45 +02:00 |
|
aignatov-bio
|
f8b246eb2a
|
Fix repositories order in dropdown
|
2020-05-19 16:18:01 +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
|
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 |
|
aignatov-bio
|
9db19603dc
|
Fix checklist render in fullview
|
2020-05-18 16:32:27 +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 |
|
Mojca Lorber
|
6b6fba591e
|
Fix manage permissions on views
|
2020-05-18 15:54:32 +02:00 |
|
Urban Rotnik
|
7e009ab8ee
|
Merge pull request #2574 from urbanrotnik/ur-sci-4634
Fix excel header parsing [SCI-4634]
|
2020-05-18 14:56:22 +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 |
|
Urban Rotnik
|
3b08241b0b
|
Fix excel header parsing
|
2020-05-18 11:39:19 +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
|
acb1b392fc
|
Merge pull request #2564 from aignatov-bio/ai-sci-4632-remove-task-inventory-tab
Remove inventory tab from task and routes to inventory page [SCI-4632]
|
2020-05-18 11:16:17 +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 |
|
aignatov-bio
|
dc2caca4f3
|
Small css fixes and test fix
|
2020-05-15 11:04:17 +02:00 |
|
mlorb
|
dbd03a09ef
|
Merge pull request #2565 from mlorb/ml-sci-4511
Add New Task layout Collapsed/Expanded States saving [SCI-4511]
|
2020-05-15 09:23:05 +02:00 |
|
Urban Rotnik
|
e290f555f4
|
Merge pull request #2561 from urbanrotnik/ur-sci-4625-import-fix
Fix for empty status cell [SCI-4625]
|
2020-05-15 08:44:30 +02:00 |
|
Mojca Lorber
|
4c15c89cf5
|
Add New Task layout Collapsed/Expanded States saving
|
2020-05-15 00:49:23 +02:00 |
|
aignatov-bio
|
51e3c70a4d
|
Merge pull request #2563 from aignatov-bio/ai-sci-4638-fix-step-content-aligment
Fix align for step content [SCI-4638]
|
2020-05-14 22:10:50 +02:00 |
|
aignatov-bio
|
bac98bdbdc
|
Remove inventory tab from task and routes to inventory page
|
2020-05-14 22:10:13 +02:00 |
|
aignatov-bio
|
443c301ca1
|
Fix align for step content
|
2020-05-14 21:53:00 +02:00 |
|
aignatov-bio
|
c9a9cd2e75
|
Remove search from state load in task repository
|
2020-05-14 21:49:01 +02:00 |
|
Urban Rotnik
|
ba68eef044
|
Fix for empty status cell
|
2020-05-14 17:59:25 +02:00 |
|
mlorb
|
1e0fed75d1
|
Merge pull request #2551 from mlorb/ml-sci-4620
Fix missing corner on opened task inventory [SCI-4620]
|
2020-05-14 17:25:39 +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 |
|
aignatov-bio
|
78b4067c50
|
Merge pull request #2549 from aignatov-bio/ai-sci-4604-small-snapshot-corrections
Small snapshot css corrections [SCI-4604]
|
2020-05-14 15:18:13 +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 |
|
aignatov-bio
|
99e1affa73
|
Merge pull request #2556 from aignatov-bio/ai-sci-4515-fix-smart-annotation-position
Fix smart annotation position for horizontal scroll [SCI-4515]
|
2020-05-14 13:18:57 +02:00 |
|
aignatov-bio
|
5bdf1ff586
|
Merge pull request #2558 from aignatov-bio/ai-sci-4608-fix-pdf-report-time-position
Prevent time to go newline in reports [SCI-4608]
|
2020-05-14 13:18:31 +02:00 |
|
Alex Kriuchykhin
|
384b107c6c
|
Merge pull request #2560 from biosistemika/SCI-4601-fix-snapshot-bugs
SCI-4601 fix the associations, renaming variable
|
2020-05-14 13:09:10 +02:00 |
|
Miha Mencin
|
15508a5065
|
codestyle fix
|
2020-05-14 12:57:16 +02:00 |
|
Miha Mencin
|
26caeed04f
|
increase pooling interval to 10s
|
2020-05-14 12:39:13 +02:00 |
|
Mojca Lorber
|
009dce110b
|
Css fix
|
2020-05-14 12:18:45 +02:00 |
|
Miha Mencin
|
0e5ce1054e
|
decrease pooling time for snapshots
|
2020-05-14 12:03:07 +02:00 |
|
Miha Mencin
|
2e4655f9ee
|
Merge pull request #2548 from urbanrotnik/ur-sci-4609-task-card-due-date
Task card due date fix [SCI-4609]
|
2020-05-14 11:52:44 +02:00 |
|
Miha Mencin
|
76232f0298
|
SCI-4601 fix the associations, minor styling changes
|
2020-05-14 11:47:19 +02:00 |
|
Alex Kriuchykhin
|
f089e4abc8
|
Merge pull request #2559 from okriuchykhin/ok_SCI_4596
Restore deleted method after rebase [SCI-4596]
|
2020-05-14 11:20:08 +02:00 |
|
Oleksii Kriuchykhin
|
ea740eb2a4
|
Restore deleted method after rebase [SCI-4596]
|
2020-05-14 10:57:43 +02:00 |
|