Commit graph

10311 commits

Author SHA1 Message Date
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
37baa13f47 Fi tests 2020-06-09 14:37:45 +02:00
mlorb
71eef19acb
Merge pull request #2649 from mlorb/ml-sci-4737
Fix protocol duplication at saving protocol from task to repository [SCI-4737]
2020-06-09 13:36:58 +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
0cca53066f
Merge pull request #2645 from mlorb/ml-sci-4689
Add archive to repository rows [SCI-4689]
2020-06-08 16:51:02 +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
aignatov-bio
fd930ff5d5
Merge pull request #2636 from aignatov-bio/ai-sci-4681-add-view-switcher-for-inventory-list
Add switch for active/archive repository view [SCI-4681][SCI-4682]
2020-06-08 09:53:19 +02:00
Alex Kriuchykhin
8606555c9b
Merge pull request #2646 from biosistemika/dependabot/bundler/websocket-extensions-0.1.5
Bump websocket-extensions from 0.1.4 to 0.1.5
2020-06-08 09:48:46 +02:00
Alex Kriuchykhin
081102cf53
Merge pull request #2647 from biosistemika/dependabot/npm_and_yarn/websocket-extensions-0.1.4
Bump websocket-extensions from 0.1.3 to 0.1.4
2020-06-08 09:48:27 +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
dependabot[bot]
6be1200828
Bump websocket-extensions from 0.1.3 to 0.1.4
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-06 15:55:22 +00:00
dependabot[bot]
3ed3e2501e
Bump websocket-extensions from 0.1.4 to 0.1.5
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-ruby) from 0.1.4 to 0.1.5.
- [Release notes](https://github.com/faye/websocket-extensions-ruby/releases)
- [Changelog](https://github.com/faye/websocket-extensions-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-ruby/compare/0.1.4...0.1.5)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-05 15:00:29 +00: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
c0e984b316 Fix tests 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
mlorb
a29a8d67f4
Merge pull request #2643 from mlorb/ml-sci-4684
Add archive to repository [SCI-4684]
2020-06-04 16:36:42 +02:00
Mojca Lorber
d8523e03c8 Add db changes 2020-06-04 16:08:29 +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
Urban Rotnik
494c707cca
Merge pull request #2641 from biosistemika/develop
Develop to Master
2020-06-04 13:36:05 +02:00
Miha Mencin
17306eb585
Bump version to 1.19.1 2020-06-04 12:58:56 +02:00
Alex Kriuchykhin
c8e8b8e2f3
Merge pull request #2640 from okriuchykhin/ok_SCI_4728
Fix appearance of snapshots from another my_module in report [SCI-4728]
2020-06-04 09:50:43 +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
Miha Mencin
4a1a957cda
Merge pull request #2637 from aignatov-bio/ai-sci-4726-add-snapshots-to-team-export-import
Add snapshots to team export/import [SCI-4726]
2020-06-03 21:17:25 +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
Miha Mencin
1a5c8c104a
Merge pull request #2635 from urbanrotnik/ur-sci-4724-fix-report-default-snapshot
Fix for default snapshot in report [SCI-4724]
2020-06-03 13:06:34 +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
Miha Mencin
ca669263bf
Merge pull request #2634 from aignatov-bio/ai-sci-4719-fix-owner-team-for-snapshots
Fix owner team for snapshots [SCI-4719]
2020-06-02 12:05:04 +02:00