Commit graph

2370 commits

Author SHA1 Message Date
Alex Kriuchykhin
d4408f6af7
Merge pull request #2738 from aignatov-bio/ai-sci-4732-add-pagination-to-results
Add pagination to results page [SCI-4732]
2020-07-23 14:45:10 +02:00
aignatov-bio
1d3055011f Merge branch 'features/tinymce-tables' into develop 2020-07-22 13:41:43 +02:00
aignatov-bio
53d62b0310 Fix tests 2020-07-22 13:16:27 +02:00
aignatov-bio
ddfe8231d8 Merge branch 'features/2fa' into develop 2020-07-22 11:56:36 +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