scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
6979 commits 70 branches 179 tags 165 MiB
Commit graph

6979 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Urban Rotnik 6bf08a9f3d Update counter visability 2020-01-17 11:59:46 +01:00
Urban Rotnik 3a24d3150d Remove error on new file select, fix for new row file cells 2020-01-16 13:49:34 +01:00
Urban Rotnik 218316bea2 Update error handling for name and text 2020-01-16 13:30:05 +01:00
Urban Rotnik 0522b9b0a3 Update too many items error showing 
Update too many items error showing
 2020-01-16 11:40:59 +01:00
aignatov-bio 17c643fb21
Merge pull request #2313 from aignatov-bio/ai-sci-4328-fix-general-css-issues-for-repositories 
Fix general css issue for repositories [SCI-4238]
 2020-01-16 11:37:49 +01:00
aignatov-bio 1ff0351a74 Merge branch 'develop' into ai-sci-4328-fix-general-css-issues-for-repositories 2020-01-16 11:36:00 +01:00
aignatov-bio 509451daae Fix table header size 2020-01-16 11:26:23 +01:00
aignatov-bio cafc10f569 Fix datetime picker 2020-01-16 11:10:51 +01:00
aignatov-bio 2cb167ba7a Fix markup 2020-01-16 10:54:18 +01:00
aignatov-bio 96e1d4a7d0 Add new error handling 2020-01-16 10:51:37 +01:00
Alex Kriuchykhin c5ccfc1bb7
Merge pull request #2316 from okriuchykhin/ok_SCI_4243 
Fix logo and flash messages in sign_in_halt layout [SCI-4243]
 2020-01-16 10:20:46 +01:00
Miha Mencin ce3b4450cc
Merge pull request #2314 from biosistemika/SCI-4210-fix-styling-of-checklist-in-view-mode 
[SCI-4210][SCI-4189] show checklist as link, hide edit, copy, delete buttons when no items selected
 2020-01-15 18:16:45 +01:00
Oleksii Kriuchykhin 168ba9d1c6 Fix logo and flash messages in sign_in_halt layout [SCI-4243] 2020-01-15 18:04:07 +01:00
Alex Kriuchykhin 077ad7cad1
Merge pull request #2307 from okriuchykhin/ok_SCI_4233 
Unify view and edit modes for number cells [SCI-4233]
 2020-01-15 18:01:41 +01:00
Miha Mencin 0c2f9e5da3
Merge pull request #2315 from aignatov-bio/ai-sci-4239-fix-smart-annotation-window-position 
Fix smart annotation window position [SCI-4239]
 2020-01-15 17:59:25 +01:00
Miha Mencin 960843c008 SCI-4210 move hiding and showing toolbar one level lower 2020-01-15 17:49:25 +01:00
aignatov-bio a10e7de9a6 Fix smart annotation window position 2020-01-15 17:19:56 +01:00
Miha Mencin ac4154bd85 SCI-4210 fix css 2020-01-15 17:09:13 +01:00
aignatov-bio b116c3720c Fix general css issue for repositories 2020-01-15 16:46:01 +01:00
Alex Kriuchykhin 967acb0af3
Merge pull request #2312 from okriuchykhin/ok_SCI_4237 
Improve user experience for repository saving and fix checklist saving [SCI-4237]
 2020-01-15 16:36:40 +01:00
Alex Kriuchykhin 6e24dd4eb6
Merge pull request #2308 from okriuchykhin/ok_SCI_4226 
Disable repository filtering in edit mode [SCI-4226]
 2020-01-15 15:43:17 +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
Oleksii Kriuchykhin bb32117796 Improve user experience for repository saving and fix checklist saving [SCI-4237] 2020-01-15 15:23:03 +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
Oleksii Kriuchykhin dd48a2902d Disable repository filtering in edit mode [SCI-4226] 2020-01-15 12:44:57 +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
Oleksii Kriuchykhin 470f6ff541 Unifify view and edit modes for number cells [SCI-4233] 2020-01-15 12:16:17 +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