scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-28 19:06:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
7130 commits 69 branches 179 tags 165 MiB
Commit graph

5538 commits

Author SHA1 Message Date
Mojca Lorber 276df8c151 Fix Safari inventories bug 2020-01-27 10:20:49 +01:00
Urban Rotnik d7761622ba Hide Edit/Delete buttons if user do not has permissions 2020-01-25 12:36:36 +01:00
Urban Rotnik 503c05805d Move editable? method from helper to model 2020-01-25 09:43:05 +01:00
Urban Rotnik 0effb3ee69 Add translation for read-only items 2020-01-25 08:52:33 +01:00
Urban Rotnik ec8af5f943 Add readonly repository rows records 2020-01-24 16:33:44 +01:00
Mojca Lorber 3af2f4af19 Change to new style checkboxes on share inventory modal 2020-01-24 15:43:13 +01:00
Mojca Lorber 9cf77e0551 Fix hound 2020-01-24 13:35:29 +01:00
Mojca Lorber f5d245e7cc Sidebar redesign 2020-01-24 13:22:04 +01:00
aignatov-bio 9524659e1d Demodulize column name in datatable helper 2020-01-24 11:33:30 +01:00
aignatov-bio 24b296fd86 Fix duplicate tags and small css issues 2020-01-23 13:38:02 +01:00
aignatov-bio 4395a7cc6b Fix small visual bugs 2020-01-23 13:12:58 +01:00
Urban Rotnik 8d7f51edde Fix for items with newline 2020-01-22 13:15:29 +01:00
Urban Rotnik 0a2970c18d Fix import for old activities 2020-01-22 12:24:56 +01:00
Mojca Lorber 658b64b617 Change button 2020-01-21 17:21:49 +01:00
aignatov-bio 79d71f1e9b
Merge pull request #2346 from aignatov-bio/ai-sci-4268-new-emoji-picker 
Add new emoji picker [SCI-4268]
 2020-01-21 16:33:05 +01:00
aignatov-bio 5a4d74d487 Update emoji picker image loading 2020-01-21 15:49:13 +01:00
Mojca Lorber 981f8678df Fix alerts style 2020-01-21 15:21:40 +01:00
mlorb ee609890ef
Merge pull request #2344 from mlorb/ml-sci-4138 
Fix constants for email redesign [SCI-4138]
 2020-01-21 15:02:26 +01:00
aignatov-bio bf9c7a70d4 Improve event handling 2020-01-21 14:01:44 +01:00
Urban Rotnik 1ecea5216e Add webpack libs for emojis and assets 2020-01-21 11:43:04 +01:00
aignatov-bio 6a67280f6a Add new emoji picker 2020-01-21 10:50:55 +01:00
Alex Kriuchykhin b0432fd10b
Merge pull request #2345 from urbanrotnik/ur-sci-4266-duplicate-spinner 
Set spinner to the table [SCI-4266]
 2020-01-21 10:43:45 +01:00
Urban Rotnik 74f38af54f Set spinner to the table 2020-01-21 10:26:24 +01:00
Miha Mencin 0157794274
Merge pull request #2341 from biosistemika/SCI-4270-select-all-doesnt-work 
SCI-4270 update selector
 2020-01-21 09:43:40 +01:00
Mojca Lorber 404805bef5 Fix constants for email redesign 2020-01-21 09:38:08 +01:00
Urban Rotnik ed77d95abd
Merge pull request #2343 from urbanrotnik/ur-sci-4262-disable-columns-editing-on-task-page 
Hide new column button in modal [SCI-4262]
 2020-01-21 09:25:21 +01:00
Miha Mencin 5b099cb147
Merge pull request #2334 from okriuchykhin/ok_SCI_4258 
Switch input type to text for Numbers in repositories [SCI-4258]
 2020-01-21 09:23:47 +01:00
Miha Mencin 96ed19ab22
Merge pull request #2342 from aignatov-bio/ai-sci-4269-fix-small-scss-issue-with-new-branding 
Fix small css issues [SCI-4269]
 2020-01-21 09:22:56 +01:00
Miha Mencin ba4e06f7e6 make selector a bit more specific 
make selector more specific
 2020-01-21 09:19:21 +01:00
Urban Rotnik 42df748f87 Hide new column button in modal 2020-01-21 08:37:02 +01:00
aignatov-bio e022f7a096 Fix small css issues 2020-01-20 15:48:51 +01:00
Miha Mencin 652b9014e1 SCI-4270 update selector 2020-01-20 15:37:04 +01:00
Miha Mencin 239abfee33
Merge pull request #2340 from biosistemika/SCI-4218-remove-tooltips 
SCI-4218 prevent displaying tooltip on column type selection
 2020-01-20 15:25:28 +01:00
aignatov-bio 01cce84314
Merge pull request #2339 from aignatov-bio/ai-sci-4195-update-delimiter-dropdown 
Update delimiter dropdown for manage column modal [SCI-4195]
 2020-01-20 15:22:40 +01:00
Miha Mencin ed7d275d9a SCI-4218 prevent displaying tooltip on column type selection 2020-01-20 14:42:16 +01:00
mlorb 9747a72567
Merge pull request #2338 from mlorb/ml-sci-4132-v2 
Change html structure for flash msg, change columns buttons [SCI-4132]
 2020-01-20 14:36:33 +01:00
aignatov-bio cd471bfb25 Update delimiter dropdown for manage column modal 2020-01-20 14:26:17 +01:00
Mojca Lorber 772118d246 change html structure for flash msg, change columns buttons 2020-01-20 14:02:42 +01:00
Urban Rotnik c29aee081b
Merge pull request #2335 from urbanrotnik/ur-sci-4236 
Use Jquery scroll [SCI-4236]
 2020-01-20 10:59:04 +01:00
Urban Rotnik fc29641c2b Hide manage column action buttons on Task page 2020-01-17 17:29:26 +01:00
Urban Rotnik f52a2ef5b8 Use Jquery scroll 2020-01-17 16:23:24 +01:00
Oleksii Kriuchykhin fa0bff93ff Switch input type to text for Numbers in repositories [SCI-4258] 2020-01-17 16:04:19 +01:00
aignatov-bio e4e2e08456
Merge pull request #2325 from aignatov-bio/ai-sci-4239-2-fix-smartannotation-position 
Fix smart annotation position [SCI-4239]
 2020-01-17 14:39:54 +01:00
Miha Mencin a9add011d9
Merge pull request #2333 from biosistemika/SCI-4260-fix-the-visibility-of-the-buttons-2 
[SCI-4260] Fix the manage buttons visibility after columns reordering
 2020-01-17 14:34:32 +01:00
Miha Mencin 58db10ce7f
Merge pull request #2331 from urbanrotnik/ur-sci-4240-status-items-error-message 
Add error message for status item [SCI-4240]
 2020-01-17 14:07:42 +01:00
Miha Mencin 61ead41271
Merge pull request #2332 from urbanrotnik/ur-sci-4193-item-error-handling 
item error handling [SCI-4193] FIX
 2020-01-17 14:07:19 +01:00
Miha Mencin 88210bd812 applying the patch 2020-01-17 14:04:25 +01:00
mlorb f91db8eb41
Merge pull request #2329 from mlorb/ml-sci-4132 
Redesign flash alerts [SCI-4132]
 2020-01-17 13:58:20 +01:00
aignatov-bio 597c88cacc Fix smart annotation position 2020-01-17 13:55:43 +01:00
Urban Rotnik 58ed1d3f8a Update default delimiter for new records 2020-01-17 12:14:50 +01:00
Urban Rotnik 6bf08a9f3d Update counter visability 2020-01-17 11:59:46 +01:00
Urban Rotnik 7b50dd7b53
Merge pull request #2330 from urbanrotnik/ur-sci-4236 
Add timeout to scroll efect fix
 2020-01-17 11:26:39 +01:00
Urban Rotnik 2e8db12ca5 Add error message for status item 2020-01-17 11:25:01 +01:00
Mojca Lorber 8b635ac38a Refactor flash alerts 2020-01-17 10:49:41 +01:00
Urban Rotnik 0437383132 Add timeout to scroll efect 2020-01-17 10:40:18 +01:00
Mojca Lorber 36ecfbf7bf Redesign flash alerts 2020-01-16 19:08:14 +01:00
Miha Mencin 16724f622c
Merge pull request #2326 from urbanrotnik/ur-sci-4236 
Scroll left on new item in repository datatables [SCI-4236]
 2020-01-16 17:30:01 +01:00
Alex Kriuchykhin 4a96fa2648
Merge pull request #2323 from aignatov-bio/ai-sci-4255-disable-column-manage-button-in-edit-mode 
Disable column manage button in edit mode [SCI-4255]
 2020-01-16 16:37:29 +01:00
Alex Kriuchykhin e3e36d40a7
Merge pull request #2322 from okriuchykhin/ok_SCI_4251 
Fix global search for repositories and checklists update [SCI-4251]
 2020-01-16 16:37:12 +01:00
Alex Kriuchykhin b482783f64
Merge pull request #2324 from okriuchykhin/ok_SCI_4204_v2 
Fix cloning of date time values [SCI-4204]
 2020-01-16 16:35:10 +01:00
Urban Rotnik 96457d07bb Scroll left on new item in datatables 2020-01-16 16:34:45 +01:00
aignatov-bio d32201ad58 Fix smart annotation position 2020-01-16 16:28:51 +01:00
Oleksii Kriuchykhin 7d8ba7cb32 Fix clonning of date time values [SCI-4204] 2020-01-16 16:03:13 +01:00
Urban Rotnik 7655dd0bea
Merge pull request #2321 from urbanrotnik/ur-sci-4257 
Remove Checklist item min length validation and modal fixes [SCI-4257]
 2020-01-16 16:02:30 +01:00
mlorb 8e4d0e9ff6
Merge pull request #2320 from mlorb/ml-sci-4069-v2 
Add emojionearea for status column type [SCI-4069]
 2020-01-16 16:00:36 +01:00
aignatov-bio b7fe8b71c1 Disable column manage button in edit mode 2020-01-16 15:59:57 +01:00
Oleksii Kriuchykhin 8c2b1e5037 Fix global search for repositories and checklists update [SCI-4251] 2020-01-16 15:30:19 +01:00
Miha Mencin e75d85c198
Merge pull request #2318 from biosistemika/SCI-4250-prevent-selecting-inventory-item 
SCI-4250 disable row selection when vieweng selected checklist items
 2020-01-16 15:29:13 +01:00
Urban Rotnik af082f530a
Merge pull request #2319 from urbanrotnik/ur-sci-4253-report-docx-fix 
Add custom method for repository report JSON data [SCI-4253]
 2020-01-16 15:22:58 +01:00
Urban Rotnik 469714c40d Remove Checklist item min length validation and modal fixes 2020-01-16 15:21:01 +01:00
Mojca Lorber a342e3d31f Add emojionearea for status column type 2020-01-16 14:58:59 +01:00
Miha Mencin 6460d6e879 fix typo, fix codestyle 2020-01-16 14:50:31 +01:00
Urban Rotnik 507443ba38 Add custom method for repository report JSON data 2020-01-16 14:42:26 +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
Miha Mencin 29458375ab SCI-4250 disable row selection when vieweng selected checklist items 2020-01-16 13:39:49 +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 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 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
mlorb e44903bae5
Merge branch 'develop' into ml-sci-4150-v2 2020-01-15 14:47:25 +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