scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-26 01:46:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
8049 commits 69 branches 179 tags 166 MiB
Commit graph

8049 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Urban Rotnik a407bf857f Fix for show and create 2020-05-22 16:19:21 +02:00
Urban Rotnik a754e5765d
Merge pull request #2595 from urbanrotnik/ur-sci-4670-missing-button 
New step missing button [SCI-4670]
 2020-05-22 15:33:58 +02:00
aignatov-bio cbc578f84b Fix snapshot name column id 2020-05-22 15:10:21 +02:00
aignatov-bio 3287070df7 Improve search through assigned tasks 2020-05-22 14:36:28 +02:00
Urban Rotnik 9d3874e343 Add margin to keywords container 2020-05-22 14:23:03 +02:00
Miha Mencin a4cd014682
Merge pull request #2591 from okriuchykhin/ok_SCI_4656 
Make a snapshot name synced with the inventory name if changed [SCI-4656]
 2020-05-22 12:57:08 +02:00
Urban Rotnik 55f77cfe00
Merge pull request #2594 from urbanrotnik/4663-fix-button-visibility 
Fix button visibility [SCI-4663]
 2020-05-22 12:55:16 +02:00
Urban Rotnik 1c2883414b Bring newStep top button back 2020-05-22 12:29:14 +02:00
Urban Rotnik a1fa0b4e05 Add check for button visibility 2020-05-22 12:02:38 +02:00
Alex Kriuchykhin 43166ab6d8
Merge pull request #2593 from mlorb/ml-sci-4649 
Expand assigned inventory after updating assigned items on task [SCI-4649]
 2020-05-22 11:07:27 +02:00
Urban Rotnik a9bed41ff5 Remove obsolete html message 2020-05-22 10:33:13 +02:00
Mojca Lorber 92861fdd32 Expand assigned inventory after updating assigned items on task 2020-05-21 22:36:09 +02:00
aignatov-bio 0aa1c32813 Fix ordering in simple table view 2020-05-21 16:51:07 +02:00
aignatov-bio d3781a7048
Merge pull request #2588 from aignatov-bio/ai-sci-4660-change-assigned-private-task-view 
Add private tasks to assigned task list [SCI-4660]
 2020-05-21 12:57:59 +02:00
Oleksii Kriuchykhin 388f52a064 Make a snapshot name synced with the inventory name if changed [SCI-4656] 2020-05-21 11:51:37 +02:00
Alex Kriuchykhin bc70ceb120
Merge pull request #2590 from biosistemika/SCI-4628-schedule-snapshots-for-locked-tasks 
[SCI-4628] moving snapshot provisioning logic into repository model, ma…
 2020-05-21 09:53:04 +02:00
Alex Kriuchykhin f0cc148e9a
Merge pull request #2589 from okriuchykhin/ok_SCI_4659 
Change display of the live version for a deleted inventory [SCI-4659]
 2020-05-21 09:40:56 +02:00
Mojca Lorber 12982260b7 Fix css hover effects 2020-05-21 08:37:40 +02:00
Miha Mencin 7de12990a9 SCI-4628 moving snapshot provisioning logic into repository model, making snapshot unique selection validation conditional 2020-05-21 00:36:24 +02:00
Oleksii Kriuchykhin f2043f111b Change display of the live version for a deleted inventory [SCI-4659] 2020-05-20 21:50:39 +02:00
aignatov-bio d16930e987 Add private tasks to assigned task list 2020-05-20 17:23:48 +02:00
Urban Rotnik a5b1f1cfd5
Merge pull request #2587 from urbanrotnik/ur-sci-4634-v2 
Inventory import fix [SCI-4634] v2
 2020-05-20 14:45:57 +02:00
Mojca Lorber e2959fec32 Merge branch 'develop' into ml-sci-4582 2020-05-20 10:37:33 +02:00
Urban Rotnik 32df6f2568 Skip cell import if value is nil 2020-05-20 09:56:08 +02:00
mlorb 29370cf82e
Merge pull request #2586 from mlorb/ml-sci-4615 
Fix missing creator in task details [SCI-4615]
 2020-05-20 09:47:08 +02:00
aignatov-bio 51d9f054ee
Merge pull request #2584 from aignatov-bio/ai-sci-4654-clear-fullview-modal-before-open 
Clear full view repository modal before open [SCI-4654]
 2020-05-20 09:45:26 +02:00
aignatov-bio 4e7a26bdd0
Merge pull request #2583 from aignatov-bio/ai-sci-4651-fix-repository-ordering 
Fix repositories order in dropdown [SCI-4651]
 2020-05-20 09:45:13 +02:00
Urban Rotnik 2283491629 Conver to string if not importing into Number column 2020-05-20 09:09:14 +02:00
Mojca Lorber 40a3ee82d5 Add creator to task 2020-05-20 08:59:07 +02:00
aignatov-bio 40b266ee0d Clear full view repository modal before open 2020-05-19 16:44:47 +02:00
aignatov-bio d714b4b7bf
Merge pull request #2579 from aignatov-bio/ai-sci-4635-fix-checklist-appearance-in-fullview 
Fix checklist render in full view [SCI-4635]
 2020-05-19 16:18:45 +02:00
aignatov-bio f8b246eb2a Fix repositories order in dropdown 2020-05-19 16:18:01 +02:00
Urban Rotnik 431bd0c53b
Merge pull request #2582 from urbanrotnik/ur-sci-4650-font-size-fix 
Fonts size update [SCI-4650]
 2020-05-19 14:55:22 +02:00
mlorb 7cbbcff86a
Merge pull request #2576 from mlorb/ml-sci-4619 
Fix manage permissions on views [SCI-4619]
 2020-05-19 14:29:11 +02:00
Urban Rotnik ac4532eea3 Update fonts 2020-05-19 14:14:58 +02:00
aignatov-bio 2dcada4bc5
Merge pull request #2580 from aignatov-bio/ai-sci-4647-add-custom-tinymce-plugins-to-asset-pipeline 
Add custom tinymce plugins to assets pipeline [SCI-4647]
 2020-05-19 10:31:51 +02:00
aignatov-bio c00b96ff7e
Merge pull request #2577 from aignatov-bio/ai-sci-4646-fix-task-sections-collapse-animation 
Fix collapse animation for task sections [SCI-4646]
 2020-05-19 10:31:36 +02:00
Urban Rotnik 1dc0e2b40b
Merge pull request #2581 from urbanrotnik/ur-sci-4640-wrong-snapshot-displayed 
Hide sidebar Versions by default [SCI-4640]
 2020-05-19 10:27:57 +02:00
Alex Kriuchykhin 49a35f43c5
Merge pull request #2578 from okriuchykhin/ok_SCI_4645 
Fix error message for file upload limit on steps [SCI-4645]
 2020-05-19 10:27:12 +02:00
Alex Kriuchykhin afdd6fd149
Merge pull request #2572 from okriuchykhin/ok_SCI_4629 
Prevent the inventory items editing while snapshot is being created [SCI-4629]
 2020-05-19 10:10:34 +02:00
Urban Rotnik ea0e97d046 Hide sidebar on modal close 2020-05-19 09:46:38 +02:00
aignatov-bio 3047af759f Add custom tinymce plugins to assets pipeline 2020-05-18 18:06:52 +02:00
aignatov-bio 9db19603dc Fix checklist render in fullview 2020-05-18 16:32:27 +02:00
Oleksii Kriuchykhin bc1ee1bd8d Fix error message for file upload limit on steps [SCI-4645] 2020-05-18 16:16:39 +02:00
aignatov-bio 9f4457642d Fix collapse animation for task sections 2020-05-18 16:01:26 +02:00
Mojca Lorber 6b6fba591e Fix manage permissions on views 2020-05-18 15:54:32 +02:00
Urban Rotnik 7e009ab8ee
Merge pull request #2574 from urbanrotnik/ur-sci-4634 
Fix excel header parsing [SCI-4634]
 2020-05-18 14:56:22 +02:00
Alex Kriuchykhin e9a05d2e3d
Merge pull request #2575 from okriuchykhin/ok_SCI_4637 
Fix selection of the default snapshot on tasks [SCI-4637]
 2020-05-18 14:25:26 +02:00
Oleksii Kriuchykhin d77930af61 Fix failing tests for repository rows controller [SCI-4629] 2020-05-18 14:12:06 +02:00
Urban Rotnik 3b08241b0b Fix excel header parsing 2020-05-18 11:39:19 +02:00