Commit graph

6649 commits

Author SHA1 Message Date
aignatov-bio
f77902f6d4 Add tinymce table support to docx 2020-07-15 09:44:25 +02:00
Mojca Lorber
f7083a000a Add devise lockable to user 2020-07-14 14:49:51 +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
c73998b6bf Fix markup 2020-07-13 16:32:28 +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
Urban Rotnik
07e2df8951 Remove :not_shared permission level for TeamRepository entity 2020-07-13 12:56:26 +02:00
Alex Kriuchykhin
65f2f4a5b8
Merge pull request #2703 from okriuchykhin/ok_SCI_4776
Add API endpoints for checklists, checklist items, tables, API code improvements [SCI-4776]
2020-07-13 10:59:10 +02:00
aignatov-bio
7d20bf6fea Add recovery screen 2020-07-13 09:51:04 +02:00
Mojca Lorber
cea9e6f956 Add check for search state 2020-07-10 15:39:01 +02:00
Oleksii Kriuchykhin
b4fab62d38 Merge branch 'develop' into ok_SCI_4776 2020-07-10 13:40:46 +02:00
Alex Kriuchykhin
594d8031ce
Merge pull request #2726 from mlorb/ml-sci-4855
Remove search state load from repositories table [SCI-4855]
2020-07-10 13:07:44 +02:00
Mojca Lorber
39ae1ed25e Fix search status 2020-07-10 12:52:07 +02:00
Alex Kriuchykhin
edf8fc6428
Merge pull request #2725 from aignatov-bio/ai-sci-4820-double-events-on-inventory
Disable inventories table initialization on turbolinks preview [SCI-4820]
2020-07-10 12:50:15 +02:00
Oleksii Kriuchykhin
c7fcc3f89b Fix issue with missing archived items on task page [SCI-4854] 2020-07-10 11:43:06 +02:00
aignatov-bio
50714eb59d Disable inventories table initialization on turbolinks preview 2020-07-10 11:05:27 +02:00
Mojca Lorber
21f0d431b0 Remove search state load from repositories table 2020-07-10 11:05:22 +02:00
Miha Mencin
12a8d50098
Merge pull request #2722 from okriuchykhin/ok_SCI_4845
Fix missing unshared inventories with snapshots in reports [SCI-4845]
2020-07-10 09:21:58 +02:00
aignatov-bio
fef6e5f1db Add recovery strategy for 2fa 2020-07-09 17:01:00 +02:00
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