Commit graph

7131 commits

Author SHA1 Message Date
Mojca Lorber
f0dcf60421 Fix tests 2020-02-04 16:23:06 +01:00
Mojca Lorber
2727614603 Clean up controllers for manage repository columns 2020-02-04 16:05:16 +01:00
mlorb
49bfb603c8
Merge pull request #2357 from mlorb/ml-sci-4130
Sidebar redesign [SCI-4130]
2020-02-04 09:55:00 +01:00
Alex Kriuchykhin
637156e417
Merge pull request #2355 from biosistemika/SCI-3403-configurable-openssl-verify-mode
SCI-3403 read openssl-verify-mode from env variable
2020-02-04 09:47:08 +01:00
mlorb
415abf8968
Merge pull request #2382 from mlorb/ml-sci-4283
Implement missing style guide changes [SCI-4283]
2020-02-04 09:37:48 +01:00
mlorb
7ad3527338
Merge pull request #2379 from urbanrotnik/ur-sci-4274-visual-fixes
Visual fixes [SCI-4274]
2020-02-03 09:44:48 +01:00
Urban Rotnik
eea80f4a09 Remove JS call 2020-02-02 18:56:52 +01:00
Urban Rotnik
cd14fe01f7 Rename div 2020-02-02 18:52:40 +01:00
Mojca Lorber
e70bc67146 Implement missing style guide changes 2020-01-31 14:11:37 +01:00
aignatov-bio
c8cf47823b
Merge pull request #2381 from biosistemika/ai-sci-fix-repository-column-selector
FIx repository column selector
2020-01-30 15:15:27 +01:00
aignatov-bio
0ece6c60f0 FIx repository column selector 2020-01-30 15:09:47 +01:00
Urban Rotnik
a91ab508e3
Merge pull request #2367 from urbanrotnik/ur-sci-4167
Teams ordering fixed [SCI-4167]
2020-01-30 14:26:42 +01:00
Urban Rotnik
3db48c44f7 Add ordered scope 2020-01-30 13:47:14 +01:00
Urban Rotnik
1bb54d20cf Teams ordering fixed 2020-01-30 13:46:04 +01:00
mlorb
0ef066f921
Merge pull request #2365 from mlorb/ml-sci-4252
Fix checklist list in inventory table [SCI-4252]
2020-01-30 13:44:02 +01:00
aignatov-bio
9a9088a0da
Merge pull request #2354 from aignatov-bio/ai-sci-4279-fix-duplicate-tags-on-task
Fix duplicate tags and small css issues [SCI-4279]
2020-01-30 13:42:22 +01:00
aignatov-bio
44eccaaa12
Merge pull request #2353 from aignatov-bio/ai-sci-4254-inventories-small-visual-fixes-part-1
Fix small visual bugs [SCI-4254]
2020-01-30 13:42:07 +01:00
mlorb
bfd928b8fc
Merge pull request #2373 from mlorb/ml-sci-4293
Fix buttons style [SCI-4293]
2020-01-30 13:40:37 +01:00
mlorb
a2afa11fef
Merge pull request #2378 from mlorb/ml-sci-4311
Fix scroll position on protocol and result page [SCI-4311]
2020-01-30 13:39:16 +01:00
Urban Rotnik
7813d3ab75
Merge pull request #2363 from urbanrotnik/ur-sci-4190
Make less opacity when editing or adding row [SCI-4190]
2020-01-30 13:24:20 +01:00
Urban Rotnik
0991a26ee8
Merge pull request #2351 from urbanrotnik/ur-sci-4211-fix-team-import
Fix import for old activities [SCI-4211]
2020-01-30 13:08:33 +01:00
Urban Rotnik
64a7657f19
Merge pull request #2364 from urbanrotnik/ur-sci-4219
Fix too long line problem[SCI-4219]
2020-01-30 13:07:01 +01:00
Urban Rotnik
2007524365
Merge pull request #2352 from urbanrotnik/ur-sci-4272-multiple-checklist-items-fix
Fix for items with newline [SCI-4272]
2020-01-30 13:05:41 +01:00
Urban Rotnik
d069173ad7
Merge pull request #2371 from urbanrotnik/ur-sci-4178
Fix attachments sorting [SCI-4178]
2020-01-30 11:29:45 +01:00
Urban Rotnik
2863a67dc5
Merge pull request #2380 from urbanrotnik/ur-sci-4302-delimiter
Fix delimiter dropdown selection [SCI-4302]
2020-01-30 11:27:49 +01:00
Urban Rotnik
15f0d41b14 Fix delimiter dropdown selection 2020-01-30 09:26:00 +01:00
aignatov-bio
2c595d01fc
Merge pull request #2370 from biosistemika/ai-sci-add-container-for-repository-filters
Small fixes
2020-01-29 15:48:19 +01:00
Urban Rotnik
db6f1ecebb Set fixed width for preview dropdown 2020-01-29 15:11:42 +01:00
Urban Rotnik
67cbd47353 Fix icon after file editing 2020-01-29 14:56:03 +01:00
Mojca Lorber
9388883479 Fix scroll position on protocol and result page 2020-01-29 14:28:52 +01:00
Urban Rotnik
fc14bf05be
Merge pull request #2377 from biosistemika/master
Master >> Develop
2020-01-29 14:25:11 +01:00
Urban Rotnik
875515121b Fix Share button in repositories 2020-01-29 14:15:47 +01:00
Urban Rotnik
765a577669 Ellipsis with css for Sidebar 2020-01-29 13:22:35 +01:00
Miha Mencin
05b9a36c45
Bump version to 1.18.1 2020-01-29 11:48:16 +01:00
Urban Rotnik
48cd901334
Merge pull request #2376 from biosistemika/release/1.18.1
Release/1.18.1
2020-01-29 11:46:23 +01:00
aignatov-bio
970463f34d Fix input fields 2020-01-29 11:41:47 +01:00
aignatov-bio
470f39ce04 Fix scrollbar 2020-01-29 11:14:25 +01:00
aignatov-bio
3c9bed4b56 Fix markup 2020-01-29 11:03:25 +01:00
aignatov-bio
4aa0a79c02 Fix resize repository 2020-01-29 11:00:48 +01:00
Urban Rotnik
9a4f0ab9f2
Merge pull request #2375 from urbanrotnik/ur-sci-status-item-emoji-fix
Status item emoji fix
2020-01-29 09:39:20 +01:00
Urban Rotnik
6c7a88475e Fix icon selection 2020-01-29 09:36:21 +01:00
Miha Mencin
7c4d842b97
Merge pull request #2374 from biosistemika/revert-2372-ml-sci-4306
Revert "Fix repository data time range column width [SCI-4306]"
2020-01-28 16:26:09 +01:00
Miha Mencin
94cce6d57e
Revert "Fix repository data time range column width [SCI-4306]" 2020-01-28 16:25:21 +01:00
Mojca Lorber
f502408e07 Fix buttons style 2020-01-28 15:30:57 +01:00
mlorb
1015ec40fe
Merge pull request #2372 from mlorb/ml-sci-4306
Fix repository data time range column width [SCI-4306]
2020-01-28 15:15:00 +01:00
Mojca Lorber
1a834c206b Fix repository data time range column width 2020-01-28 15:12:09 +01:00
Urban Rotnik
d974ff57e1 Fix attachments sorting 2020-01-28 15:01:20 +01:00
Urban Rotnik
358a0b89ce
Merge pull request #2369 from urbanrotnik/release/1.18.1
Safe navigation for serializer value of RepositoryListItem [SCI-4308]
2020-01-28 14:28:59 +01:00
aignatov-bio
0ce52aae94 Add container for repository filters 2020-01-28 14:11:11 +01:00
aignatov-bio
cd9a89a586
Merge pull request #2356 from aignatov-bio/ai-sci-demodulize-column-name-in-datatable-helper
Demodulize column name in datatable helper
2020-01-28 13:42:04 +01:00