Commit graph

6956 commits

Author SHA1 Message Date
Oleksii Kriuchykhin 168ba9d1c6 Fix logo and flash messages in sign_in_halt layout [SCI-4243] 2020-01-15 18:04:07 +01:00
Miha Mencin b23c874f9e
Merge pull request #2310 from biosistemika/SCI-4199-selected-checklist-is-lost
Sci 4199 selected checklist is lost
2020-01-15 15:28:34 +01:00
Miha Mencin 79ad164166
Merge pull request #2311 from biosistemika/SCI-4202-dropdown-not-closing-after-select
SCI-4202 add close param
2020-01-15 15:27:11 +01:00
Miha Mencin 5085e55f22 fix status selection as well 2020-01-15 15:22:05 +01:00
Miha Mencin df43c4c15f SCI-4202 add close param 2020-01-15 14:52:06 +01:00
aignatov-bio 91cb1b6c8e
Merge pull request #2300 from mlorb/ml-sci-4150-v2
Refactor manage repository columns, move it from page into modal [SCI-4150]
2020-01-15 14:48:07 +01:00
mlorb e44903bae5
Merge branch 'develop' into ml-sci-4150-v2 2020-01-15 14:47:25 +01:00
aignatov-bio f4a1393201
Merge pull request #2309 from aignatov-bio/ai-sci-4131-update-branding-style-and-pagination-fix
Fix pagination and update css [SCI-4131]
2020-01-15 14:35:24 +01:00
Mojca Lorber c234b014cb fix locales 2020-01-15 14:18:08 +01:00
Miha Mencin 7134eb2bc4 fixing spacing 2020-01-15 14:03:42 +01:00
Miha Mencin 8c77058179 fixing indentation 2020-01-15 14:02:33 +01:00
Miha Mencin 5bfa5c7939 SCI-4199 disabling delimiter, adding warning 2020-01-15 13:59:28 +01:00
aignatov-bio 778264713f Fix pagination and update css 2020-01-15 13:55:11 +01:00
Alex Kriuchykhin da26d8a018
Merge pull request #2304 from okriuchykhin/ok_SCI_4204
Refactor repository cell cloning to support all data types [SCI-4204]
2020-01-15 13:04:50 +01:00
aignatov-bio 271d6db792
Merge pull request #2303 from aignatov-bio/ai-sci-4175-update-design-date-time-fields
Update css and error handling for date and time fields [SCI-4175]
2020-01-15 12:36:12 +01:00
Alex Kriuchykhin 9412cccc9c
Merge pull request #2306 from urbanrotnik/ur-sci-fix-for-list-items-update
Fix for list items update
2020-01-15 12:34:33 +01:00
Urban Rotnik 97954b3930 fixup! Fix list item update 2020-01-15 11:28:31 +01:00
Alex Kriuchykhin 3093e84581
Merge pull request #2217 from okriuchykhin/ok_SCI_3988
Remove Paperclip DB columns and fix experiment templates [SCI-3988]
2020-01-15 11:28:11 +01:00
Urban Rotnik a23b2eab78 Fix list item update 2020-01-15 11:24:50 +01:00
Oleksii Kriuchykhin 9e8bd23616 Merge latest branch 'develop' into ok_SCI_3988 2020-01-15 10:52:20 +01:00
Oleksii Kriuchykhin 66def56af9 Fix test for checklist value [SCI-4204] 2020-01-15 10:21:14 +01:00
aignatov-bio 2a83c6bae2 Update hidden field for time cell 2020-01-15 09:48:18 +01:00
aignatov-bio 3fb727225a
Merge pull request #2301 from aignatov-bio/ai-sci-4128-change-datatable-headers-colors
Update table header color and update checkboxes [SCI-4128]
2020-01-15 09:34:43 +01:00
Urban Rotnik 6d55b07fdc
Merge branch 'develop' into ai-sci-4128-change-datatable-headers-colors 2020-01-15 09:10:43 +01:00
Urban Rotnik 2c86c2263d
Merge pull request #2298 from urbanrotnik/ur-sci-4230-cannot-create-checklist
Fix empty checklist and dropdown column creation [SCI-4230]
2020-01-15 09:09:17 +01:00
Urban Rotnik 2fd76d7f47
Merge pull request #2305 from urbanrotnik/ur-sci-4234-old-column-drop
Add rescue block for setting default repository state [SCI-4234]
2020-01-15 08:43:15 +01:00
Urban Rotnik bcce8235cc Add rescue block for setting default repository state 2020-01-14 23:49:02 +01:00
Oleksii Kriuchykhin eed68a2590 Refactor repository cell clonning to support all data types [SCI-4204] 2020-01-14 16:55:10 +01:00
Mojca Lorber 16226640d5 changes upon Antons review 2020-01-14 16:46:48 +01:00
aignatov-bio 7ea6dbc67b Update css and error handling for date and time fields 2020-01-14 16:31:55 +01:00
Urban Rotnik bb9c1e6fff
Merge pull request #2302 from urbanrotnik/ur-sci-4026-renew-assign-column-fix
Keep circles for task page [FIX]
2020-01-14 14:02:42 +01:00
Urban Rotnik 75c7cb7aa8 Keep circles for task page 2020-01-14 13:31:44 +01:00
aignatov-bio 79b020b97e Update table header color and update checkboxes 2020-01-14 11:39:15 +01:00
Mojca Lorber 9176301b7b Refactor manage repository columns, move it from page into modal 2020-01-14 11:13:19 +01:00
Urban Rotnik c5fea73187
Merge pull request #2296 from urbanrotnik/ur-sci-4026-renew-assign-column
Assign column update [SCI-4026]
2020-01-14 09:56:33 +01:00
Urban Rotnik 1cf793127a Update cell color 2020-01-14 09:24:42 +01:00
Urban Rotnik 2468b67de0 Assign column update 2020-01-14 09:02:30 +01:00
Alex Kriuchykhin 4ca2981177
Merge pull request #2299 from okriuchykhin/ok_SCI_4224
Fix repository filtering and improve speed [SCI-4224]
2020-01-13 17:57:11 +01:00
Oleksii Kriuchykhin 0e391f6751 Fix tests [SCI-4224] 2020-01-13 17:17:07 +01:00
Oleksii Kriuchykhin 01b8d2226d Optimize repository table counters [SCI-4224] 2020-01-13 16:31:42 +01:00
Oleksii Kriuchykhin 7b82e33eb6 Fix repository filtering and improve speed [SCI-4224] 2020-01-13 16:09:07 +01:00
Urban Rotnik 0a3359e815 Fix empty checklist and dropdown column creation 2020-01-13 15:48:55 +01:00
aignatov-bio accd1d9e16
Merge pull request #2297 from aignatov-bio/ai-sci-4207-fix-datable-overflow
Update layout for repository [SCI-4207]
2020-01-13 15:13:39 +01:00
aignatov-bio b37d8f1275 Update layout for repository 2020-01-13 14:46:43 +01:00
aignatov-bio ac2f431a0b
Merge pull request #2292 from aignatov-bio/ai-sci-4221-fix-big-numbers-in-repository-number-value
Fix big number in repository number value [SCI-4221]
2020-01-13 10:42:13 +01:00
aignatov-bio 7ac1b45aaa
Merge pull request #2295 from aignatov-bio/ai-sci-fix-const-in-repository-show
Fix const in repository show view
2020-01-13 10:39:54 +01:00
aignatov-bio 6f78901d4e
Merge pull request #2294 from aignatov-bio/ai-sci-4124-fix-flash-message
Fix flash message for datetime column [SCI-4124]
2020-01-13 10:24:35 +01:00
aignatov-bio bdbb3712e6
Merge pull request #2293 from aignatov-bio/ai-sci-4223-add-smart-annotations-to-text-fields
Add smart annotations to repository text value [SCI-4223]
2020-01-13 10:24:22 +01:00
Alex Kriuchykhin 67b1bf4611
Merge pull request #2286 from urbanrotnik/ur-sci-4161-v2
Fix for numeric item in SQL array [SCI-4161]
2020-01-13 10:15:48 +01:00
aignatov-bio 189bf5762e Fix const in repository show view 2020-01-13 10:13:33 +01:00