Mojca Lorber
|
10e607c281
|
Implement Status labels on a Task card
|
2020-07-17 14:48:45 +02:00 |
|
aignatov-bio
|
7c4bfad09b
|
Add pagination to results page
|
2020-07-16 15:47:19 +02:00 |
|
aignatov-bio
|
f77902f6d4
|
Add tinymce table support to docx
|
2020-07-15 09:44:25 +02:00 |
|
aignatov-bio
|
39b5651283
|
Revert FontAwesome in reports to CDN
|
2020-07-14 09:44:03 +02:00 |
|
Alex Kriuchykhin
|
8dd478ad61
|
Merge pull request #2730 from aignatov-bio/ai-sci-4874-improve-pdf-reports
Improve pdf reports [SCI-4874]
|
2020-07-13 17:02:10 +02:00 |
|
aignatov-bio
|
c592954400
|
Add UX
|
2020-07-13 16:05:23 +02:00 |
|
Mojca Lorber
|
212ba76c16
|
Fix Settings pages titles
|
2020-07-13 14:51:51 +02:00 |
|
aignatov-bio
|
f8c6d9f260
|
Fix markup
|
2020-07-13 14:31:57 +02:00 |
|
aignatov-bio
|
a7fac38fcb
|
Improve pdf reports
|
2020-07-13 14:29:59 +02:00 |
|
aignatov-bio
|
7d20bf6fea
|
Add recovery screen
|
2020-07-13 09:51:04 +02:00 |
|
aignatov-bio
|
fef6e5f1db
|
Add recovery strategy for 2fa
|
2020-07-09 17:01:00 +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
|
4003608c7d
|
Fix style
|
2020-07-09 15:43:08 +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
|
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 |
|
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 |
|
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 |
|
aignatov-bio
|
135ac487d0
|
Small archived repositories fixes
|
2020-07-08 13:42:27 +02:00 |
|
Mojca Lorber
|
00b668a4ba
|
Change title size to h1
|
2020-07-08 13:02:47 +02:00 |
|
Urban Rotnik
|
5d067077b1
|
Add logo and timestamp to PDF and Doc reports
|
2020-07-08 10:48:29 +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
|
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 |
|
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 |
|
aignatov-bio
|
6352a4ba9b
|
Update inventory modals
|
2020-07-06 12:47:42 +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
|
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 |
|
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 |
|
Oleksii Kriuchykhin
|
7ea577d8d4
|
Merge branch 'features/inventory-archiving' into develop
|
2020-06-24 14:04:54 +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 |
|
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
|
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
|
be19190ff1
|
Revert default_scope for active repositories
|
2020-06-22 14:57:35 +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
|
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 |
|
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
|
123375f494
|
Update scopes in reports
|
2020-06-18 09:33:12 +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 |
|
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 |
|
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 |
|
aignatov-bio
|
db35da0cee
|
Add archiving column to datatable helper
|
2020-06-11 12:48:31 +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 |
|
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 |
|
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 |
|
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 |
|
Oleksii Kriuchykhin
|
6afebdc5da
|
Remove inventory links of unshared inventory [SCI-4715]
|
2020-06-01 17:50:31 +02:00 |
|
aignatov-bio
|
f963608996
|
Add I18n and tests
|
2020-06-01 14:34:04 +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
|
aee75a2f83
|
Add repository list view
|
2020-06-01 10:24:03 +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
|
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
|
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 |
|
Mojca Lorber
|
c673e27109
|
Merge branch 'develop' into ml-sci-4261
|
2020-05-28 08:18:24 +02:00 |
|
aignatov-bio
|
aaff5eb67f
|
Add name order for porject/experiment/task sidebar
|
2020-05-27 13:31:00 +02:00 |
|
Oleksii Kriuchykhin
|
b430d507cf
|
Fix handling of deleted repositories in reports [SCI-4698]
|
2020-05-27 12:15:19 +02:00 |
|
aignatov-bio
|
15f58be1c2
|
Fix snapshot date creation
|
2020-05-26 15:59:49 +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
|
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 |
|
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 |
|