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

7781 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Miha Mencin 55aac63fba Fix a typo 2020-05-25 17:28:36 +02:00
Miha Mencin 79ba0b3708
Merge pull request #2605 from biosistemika/SCI-4674-tehnician-snapshots-permissions 
SCI-4674 allow tehnician to create, delete and select snapshot
 2020-05-25 16:55:33 +02:00
Miha Mencin 26f4f24cc6 SCI-4674 fix stupid 2020-05-25 16:30:22 +02:00
Miha Mencin 77e1feda97 SCI-4674 name permissions more properly 2020-05-25 16:29:00 +02:00
aignatov-bio f86b71144d Resize simple table header on sidebar collapse 2020-05-25 16:21:28 +02:00
Miha Mencin 5f195b3622 SCI-4674 check if experiment and projects are active during snapshot creation 2020-05-25 15:56:39 +02:00
Miha Mencin 5994e8c6a6 SCI-4674 create special permissions for snapshots on task 2020-05-25 15:49:31 +02:00
Miha Mencin cd70d9c5a6 SCI-4674 allow tehnician to create, delete and select snapshot 2020-05-25 15:03:37 +02:00
Urban Rotnik c7361332ab
Merge pull request #2567 from urbanrotnik/ur-sci-4622-snapshot-in-report 
Show snapshot in report [SCI-4622]
 2020-05-25 14:21:49 +02:00
Urban Rotnik b264b86cba Prepand callback 2020-05-25 14:00:41 +02:00
Alex Kriuchykhin 6ada4dc723
Merge pull request #2604 from okriuchykhin/ok_SCI_4669 
Fix viewing of office files in repository snapshots [SCI-4669]
 2020-05-25 13:55:31 +02:00
aignatov-bio 3a1280fead
Merge pull request #2602 from aignatov-bio/ai-sci-4675-fix-ordering-of-columns-to-snapshots 
Fix snapshot column ordering by parent_id [SCI-4675]
 2020-05-25 13:39:16 +02:00
Urban Rotnik d9690115f8 Move refresh reference from controller to model 2020-05-25 13:19:34 +02:00
Urban Rotnik df8fe20d03 Keep reportElements up to date with active snapshots and repositories 2020-05-25 13:19:33 +02:00
Urban Rotnik 359517eb17 Add deleted repositories to report 2020-05-25 13:19:30 +02:00
Urban Rotnik 2b493ce6f6 Refactor assigned rows 2020-05-25 13:19:29 +02:00
Urban Rotnik 9536939b3b Show snapshot rows in report 2020-05-25 13:19:28 +02:00
Alex Kriuchykhin 4dc3d352f7
Merge pull request #2603 from mlorb/ml-sci-4676 
Change order of snapshots versions [SCI-4676]
 2020-05-25 12:39:43 +02:00
Oleksii Kriuchykhin 3cabe2250b Fix viewing of office files in repository snapshots [SCI-4669] 2020-05-25 12:30:08 +02:00
Mojca Lorber 76a1f73989 Change order of snapshots versions 2020-05-25 12:15:24 +02:00
mlorb 981839eb6f
Merge pull request #2601 from mlorb/ml-sci-4664 
Hide hamburger menu on login [SCI-4664]
 2020-05-25 11:30:57 +02:00
aignatov-bio f0bdae8b67 Fix snapshot column ordering by parent_id 2020-05-25 11:19:43 +02:00
Mojca Lorber 94dc314c73 Hide hamburger menu on login screen 2020-05-25 10:39:35 +02:00
mlorb 384ec40c4e
Merge pull request #2542 from mlorb/ml-sci-4582 
Task details description corrections and some changes of locales [SCI-4582]
 2020-05-25 09:10:37 +02:00
aignatov-bio 9973151278
Merge pull request #2598 from aignatov-bio/ai-sci-4662-fix-new-comment-field 
Fix new comment field [SCI-4662]
 2020-05-25 09:09:33 +02:00
aignatov-bio 100108bd43
Merge pull request #2596 from aignatov-bio/ai-sci-4642-improve-assigned-task-search 
Improve search through assigned tasks [SCI-4642]
 2020-05-25 09:09:19 +02:00
Miha Mencin 24e5839319
Merge pull request #2600 from okriuchykhin/ok_SCI_4661 
Improve handling of unassigned inventories with existing snapshots [SCI-4661]
 2020-05-25 08:25:54 +02:00
Alex Kriuchykhin af988b08ae
Merge pull request #2599 from biosistemika/dependabot/bundler/puma-4.3.5 
Bump puma from 4.3.3 to 4.3.5
 2020-05-22 17:38:27 +02:00
Oleksii Kriuchykhin c98b042585 Improve handling of unassigned inventories with existing snapshots [SCI-4661] 2020-05-22 17:36:04 +02:00
aignatov-bio f180a47c95
Merge pull request #2585 from aignatov-bio/ai-sci-4655-add-full-size-clickable-buttons 
Make snapshots versions buttons full size clickable [SCI-4655]
 2020-05-22 17:17:22 +02:00
aignatov-bio 230ec487ba Make snapshots versions buttons full size clickable 2020-05-22 17:16:20 +02:00
dependabot[bot] b1a0f53546
Bump puma from 4.3.3 to 4.3.5 
Bumps [puma](https://github.com/puma/puma) from 4.3.3 to 4.3.5.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-05-22 15:11:42 +00:00
aignatov-bio ce53235cb9
Merge pull request #2592 from aignatov-bio/ai-sci-4621-fix-order-icon-position-in-simple-view 
Fix ordering in simple table view [SCI-4621]
 2020-05-22 16:52:45 +02:00
aignatov-bio 8161bbb31c Fix new comment field 2020-05-22 16:51:11 +02:00
Alex Kriuchykhin b5e0e4649c
Merge pull request #2597 from urbanrotnik/4663-fix-button-visibility 
Fix for snapshot creation [SCI-4672]
 2020-05-22 16:38:29 +02:00
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