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

7416 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Kriuchykhin 92279d07ad
Merge pull request #2437 from aignatov-bio/ai-sci-4380-saving-navigation-state 
Refactor sidebar [SCI-4380]
 2020-03-30 09:56:51 +02:00
Alex Kriuchykhin 4fe3d9f3a7
Merge pull request #2414 from aignatov-bio/ai-sci-4134-auto-open-tiny-mce-if-unsaved-data 
Open unsaved TinyMce editor [SCI-4134]
 2020-03-30 09:50:32 +02:00
Mojca Lorber ee037ea13c Bump version to 1.18.6 2020-03-25 14:23:13 +01:00
aignatov-bio 71573049f5
Merge pull request #2490 from aignatov-bio/ai-sci-4500-fix-team-dropdown 
Fix team dropdown scroll
 2020-03-25 13:02:59 +01:00
aignatov-bio ab6001c068 Fix scroll 2020-03-25 12:56:01 +01:00
Miha Mencin a2a5f8cfbd
Merge pull request #2489 from aignatov-bio/ai-sci-4500-fix-team-dropdown 
Fix team dropdown [SCI-4500]
 2020-03-25 12:55:46 +01:00
aignatov-bio a7e4083ef1 Fix team dropdown 2020-03-25 12:31:47 +01:00
aignatov-bio 948034e3d4
Merge pull request #2488 from aignatov-bio/ai-sci-4494-fix-calendar-safari-issue 
Calendar CSS safari fix [SCI-4494]
 2020-03-24 21:55:40 +01:00
Miha Mencin be8e18110d
Merge pull request #2481 from mlorb/ml-sci-4344 
Fix tooltips appear wrongly [SCI-4344]
 2020-03-24 19:43:34 +01:00
Miha Mencin 89e4a73fbb
Merge pull request #2487 from aignatov-bio/ai-sci-4464-fix-timezone-when-import-datetime 
Fix timezone when import datetime [SCI-4464]
 2020-03-24 19:42:48 +01:00
Alex Kriuchykhin 08b53e7735
Merge pull request #2484 from biosistemika/ai-sci-4424-teams-dropdown-appears-everytime 
Teams dropdown appears every time [SCI-4424]
 2020-03-24 19:19:15 +01:00
aignatov-bio 4052ec1c67 Calendar CSS safari fix 2020-03-24 18:44:09 +01:00
aignatov-bio 6bdd45e7b7 Fix timezone when import datetime 2020-03-24 17:45:09 +01:00
aignatov-bio d62ec81472
Merge pull request #2478 from aignatov-bio/ai-sci-4449-fix-new-protocol-report-dashboard 
Fix protocol and report create modals after dashboard redirect [SCI-4449]
 2020-03-24 16:38:08 +01:00
Alex Kriuchykhin bdb57fd803
Merge pull request #2486 from okriuchykhin/ok_SCI_4487 
Fix due dates on task cards in the canvas [SCI-4487]
 2020-03-24 11:39:29 +01:00
Alex Kriuchykhin 54097a26ae
Merge pull request #2479 from mlorb/ml-sci-4473 
Fix new task modal css error [SCI-4473]
 2020-03-24 10:40:36 +01:00
Oleksii Kriuchykhin f9a7d58157 Fix due dates on task cards in the canvas [SCI-4487] 2020-03-24 10:30:29 +01:00
aignatov-bio 39be0d5109
Merge pull request #2480 from aignatov-bio/ai-sci-4457-fix-padding-dashboard-current-list 
Fix padding for current tasks widget [SCI-4457]
 2020-03-24 09:52:58 +01:00
Alex Kriuchykhin 1ae2e93a85
Merge pull request #2485 from mlorb/ml-sci-4478 
Disable selecting range at update column [SCI-4478]
 2020-03-24 09:28:45 +01:00
Mojca Lorber 3a58bd3cd6 Disable selecting range at update column 2020-03-23 20:02:57 +01:00
aignatov-bio 5004270c22 Teams dropdown apears everytime 2020-03-23 19:42:36 +01:00
Alex Kriuchykhin bbd5dac518
Merge pull request #2483 from okriuchykhin/ok_SCI_4469 
Fix annotation notifications for inventory rows [SCI-4469]
 2020-03-23 19:06:17 +01:00
Oleksii Kriuchykhin c5dd572e8e Fix annotation notifications for inventory rows [SCI-4469] 2020-03-23 18:45:36 +01:00
Alex Kriuchykhin c09ef36f52
Merge pull request #2482 from okriuchykhin/ok_SCI_4479 
Fix taken space display for teams [SCI-4479]
 2020-03-23 16:53:47 +01:00
Oleksii Kriuchykhin 4db810c18f Fix taken space display for teams [SCI-4479] 2020-03-23 16:32:05 +01:00
Mojca Lorber 9045d1a8de Fix tooltips appear wrongly 2020-03-22 17:47:13 +01:00
aignatov-bio a5bdef07a2 Fix padding for current tasks widget 2020-03-20 17:01:54 +01:00
Mojca Lorber b4d5fb524b Fix new task modal css error 2020-03-20 10:21:56 +01:00
aignatov-bio da4b55ceea Fix protocol and report create modals after dashboard redirect 2020-03-19 19:43:20 +01:00
aignatov-bio 37304df878 Fix markup 2020-03-19 15:48:45 +01:00
aignatov-bio b188b0511b Refactor TinyMCE autosave check 2020-03-19 15:45:14 +01:00
aignatov-bio 1d02ba5ebf Open unsaved TinyMce editor 2020-03-18 16:03:36 +01:00
Oleksii Kriuchykhin 122edf7cca Bump version to 1.18.5 2020-03-18 13:52:48 +01:00
Alex Kriuchykhin 1c8750cae1
Merge pull request #2477 from mlorb/ml-sci-4462 
Add data hook [SCI-4462]
 2020-03-18 11:27:37 +01:00
Miha Mencin b3b9f578b8
Merge pull request #2476 from biosistemika/SCI-4464-fix-date-time-imports 
SCI-4464 fix the import of the dates, some tests
 2020-03-18 10:59:22 +01:00
Mojca Lorber 94d5dcf4a9 Add data hook 2020-03-18 10:50:09 +01:00
Miha Mencin fd8462b008 codstyle 2020-03-18 10:35:31 +01:00
Miha Mencin ecd49cb1e7 fix format and export_format mess 2020-03-18 09:57:57 +01:00
Miha Mencin 24b979aa6f fix CR comments 2020-03-18 09:53:47 +01:00
Miha Mencin c89503f691 SCI-4464 fix the import of the dates, some tests 2020-03-17 21:20:50 +01:00
Alex Kriuchykhin 749c1dda69
Merge pull request #2475 from okriuchykhin/ok_SCI_4459 
Add used space calculation method to the team model [SCI-4459]
 2020-03-17 16:58:37 +01:00
Oleksii Kriuchykhin 675b578272 Add used space calculation method to the team model [SCI-4459] 2020-03-17 16:56:55 +01:00
mlorb 6f0e2fc541
Merge pull request #2474 from mlorb/ml-sci-4450-v2 
Change default date in preferences [SCI-4450]
 2020-03-17 16:17:21 +01:00
mlorb 54f7499988
Merge pull request #2473 from mlorb/ml-sci-4452 
Small support dropdown fixes [SCI-4452]
 2020-03-17 16:17:06 +01:00
aignatov-bio e550d49012
Merge pull request #2472 from biosistemika/ai-sci-add-class-to-no-inventories-placeholder 
Add class to no-inventories placeholder
 2020-03-17 16:12:55 +01:00
Mojca Lorber ea755eaea7 Change default date in preferences 2020-03-17 15:52:57 +01:00
Mojca Lorber 7e36a4e357 Small support dropdown fixes 2020-03-17 15:44:57 +01:00
aignatov-bio c39c3e852c Add class to no-inventories placeholder 2020-03-17 14:38:11 +01:00
Alex Kriuchykhin 2a2e479cd3
Merge pull request #2470 from okriuchykhin/ok_SCI_4408 
Enable time fraction for task due date [SCI-4408]
 2020-03-16 18:55:10 +01:00
Oleksii Kriuchykhin bece39fbfb Fix failing tests [SCI-4408] 2020-03-16 18:30:17 +01:00