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
7790 commits 70 branches 179 tags 165 MiB
Commit graph

7790 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Urban Rotnik 69d086ba32 Scope snapshots to project 2020-06-03 22:58:22 +02:00
Miha Mencin 1a5c8c104a
Merge pull request #2635 from urbanrotnik/ur-sci-4724-fix-report-default-snapshot 
Fix for default snapshot in report [SCI-4724]
 2020-06-03 13:06:34 +02:00
Urban Rotnik 50bc313853 Fix for default snapshot in report 2020-06-03 10:49:45 +02:00
Urban Rotnik 21e048c52e
Merge pull request #2633 from urbanrotnik/ur-sci-fix-manage-column-dropdown 
Fix dropdown render for columns manage modal [SCI-4720]
 2020-06-02 15:44:25 +02:00
Urban Rotnik 9d96baf008 Escape special chars for FE and BE 2020-06-02 15:16:01 +02:00
Miha Mencin ca669263bf
Merge pull request #2634 from aignatov-bio/ai-sci-4719-fix-owner-team-for-snapshots 
Fix owner team for snapshots [SCI-4719]
 2020-06-02 12:05:04 +02:00
aignatov-bio f986a0ed56 Fix owner team for snapshots 2020-06-02 11:40:30 +02:00
Miha Mencin d89dce9f72
Merge pull request #2632 from okriuchykhin/ok_SCI_4715 
Remove inventory links of unshared inventory [SCI-4715]
 2020-06-02 10:46:33 +02:00
Urban Rotnik 9b0f215187 Fix status dropdown rendering 2020-06-02 06:15:34 +02:00
Urban Rotnik 4fc37e12a0 Fix dropdown render for columns manage modal 2020-06-01 18:41:58 +02:00
Oleksii Kriuchykhin 6afebdc5da Remove inventory links of unshared inventory [SCI-4715] 2020-06-01 17:50:31 +02:00
mlorb 26bdabb0c3
Merge pull request #2609 from mlorb/ml-sci-4529 
Add rename task and rename experiment activities [SCI-4529]
 2020-06-01 12:58:36 +02:00
aignatov-bio 4d6282510d
Merge pull request #2629 from aignatov-bio/ai-sci-4599-fix-ordering-for-projects-in-sidebar 
Fixed projects ordering in sidebar on team page [SCI-4599]
 2020-06-01 11:19:29 +02:00
aignatov-bio 2269299b61 Fixed projects ordering in sidebar on team page 2020-06-01 10:55:23 +02:00
aignatov-bio 7c8460dcf5
Merge pull request #2628 from aignatov-bio/ai-sci-4699-change-line-thikness 
Change selected line thickness [SCI-4699]
 2020-06-01 10:43:46 +02:00
aignatov-bio 222e89ea8d Change selected line thickness 2020-06-01 10:30:06 +02:00
aignatov-bio 8f3c7fa9aa
Merge pull request #2627 from aignatov-bio/ai-sci-4549-fix-shared-inventory-icon 
Fix shared inventory icon [SCI-4549]
 2020-06-01 10:28:07 +02:00
aignatov-bio e67f345602
Merge pull request #2624 from aignatov-bio/ai-sci-4701-small-css-fixes 
Small css fixes [SCI-4701]
 2020-06-01 10:27:54 +02:00
Alex Kriuchykhin c6291ef09e
Merge pull request #2623 from aignatov-bio/ai-sci-4709-filter-assigned-private-tasks 
Filter private assigned tasks [SCI-4709]
 2020-05-29 18:19:42 +02:00
Alex Kriuchykhin b688b0c335
Merge pull request #2616 from okriuchykhin/ok_SCI_4698_v2 
Fix handling of deleted repositories in reports [SCI-4698]
 2020-05-29 16:51:17 +02:00
Oleksii Kriuchykhin d774a82762 Fix handling of snapshots of deleted repositories in reports [SCI-4698] 2020-05-29 16:30:27 +02:00
aignatov-bio 1430ca5ae9 Fix shared inventory icon 2020-05-29 13:17:07 +02:00
Oleksii Kriuchykhin 7a95355e81 Add extra check for repository presence in report [SCI-4698] 2020-05-29 11:39:07 +02:00
Alex Kriuchykhin be8c7e01e2
Merge pull request #2622 from aignatov-bio/ai-sci-4699-show-selected-snapshot-in-sidebar 
Show selected snapshot in sidebar [SCI-4699]
 2020-05-29 11:14:52 +02:00
Alex Kriuchykhin 3087133857
Merge pull request #2626 from biosistemika/dependabot/bundler/kaminari-1.2.1 
Bump kaminari from 1.1.1 to 1.2.1
 2020-05-29 11:11:47 +02:00
Alex Kriuchykhin 4c50f75aa2
Merge pull request #2621 from aignatov-bio/ai-sci-4710-fix-escape-issue-in-dropdowns 
Fix escape issue in dropdowns [SCI-4710]
 2020-05-29 09:52:36 +02:00
Alex Kriuchykhin 26449fdfe2
Merge pull request #2625 from okriuchykhin/ok_SCI_4712 
Fix assigned repositories list and snapshot creation for shared repositories [SCI-4712]
 2020-05-29 09:52:08 +02:00
dependabot[bot] a7864ea235
Bump kaminari from 1.1.1 to 1.2.1 
Bumps [kaminari](https://github.com/kaminari/kaminari) from 1.1.1 to 1.2.1.
- [Release notes](https://github.com/kaminari/kaminari/releases)
- [Changelog](https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kaminari/kaminari/compare/v1.1.1...v1.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-05-28 22:01:17 +00:00
Oleksii Kriuchykhin 8027cc6a49 Fix assigned repositories list and snapshot creation for shared repositories [SCI-4712] 2020-05-28 16:15:05 +02:00
aignatov-bio 7f0d43209e Small css fixes 2020-05-28 16:04:21 +02:00
aignatov-bio 116747f261 Filter private assigned tasks 2020-05-28 15:35:19 +02:00
aignatov-bio 368ee8a689 Show selected snapshot in sidebar 2020-05-28 15:18:26 +02:00
aignatov-bio 7b27c4a4a8
Merge pull request #2619 from aignatov-bio/ai-sci-4553-fix-whats-new-title 
Fix What’s New title [SCI-4553]
 2020-05-28 14:24:06 +02:00
aignatov-bio 34eaf4a138
Merge pull request #2618 from aignatov-bio/ai-sci-4599-order-elements-in-sidebar 
Add name order for porject/experiment/task sidebar [SCI-4599]
 2020-05-28 14:23:53 +02:00
Alex Kriuchykhin 5ce1311591
Merge pull request #2620 from okriuchykhin/ok_SCI_4673 
Fix file download from MS Office online [SCI-4673]
 2020-05-28 13:09:14 +02:00
aignatov-bio f7a215c953 Fix escape issue in dropdowns 2020-05-28 10:55:36 +02:00
aignatov-bio 2950f4fe51
Merge pull request #2615 from aignatov-bio/ai-sci-4633-check-duplicate-protocol-name-during-import 
Check duplicate protocol name during import [SCI-4633]
 2020-05-27 17:15:44 +02:00
Oleksii Kriuchykhin 0465dba2cf Fix file dowload from MS Office online [SCI-4673] 2020-05-27 16:59:28 +02:00
aignatov-bio 8f998ceee9 Fix counter 2020-05-27 16:11:10 +02:00
aignatov-bio 149600e2f5 Fix What’s New title 2020-05-27 15:27:12 +02:00
aignatov-bio c30ba4cd18
Merge pull request #2617 from aignatov-bio/ai-sci-4531-fix-forgot-password-margin 
Fix forgot password link margin [SCI-4531]
 2020-05-27 13:40:10 +02:00
aignatov-bio aaff5eb67f Add name order for porject/experiment/task sidebar 2020-05-27 13:31:00 +02:00
aignatov-bio 32c1f4af84 Fix forgot password link margin 2020-05-27 12:55:15 +02:00
Oleksii Kriuchykhin b430d507cf Fix handling of deleted repositories in reports [SCI-4698] 2020-05-27 12:15:19 +02:00
aignatov-bio 40ad9fbf00 Check duplicate protocol name during import 2020-05-27 12:10:48 +02:00
Miha Mencin 183f5af7de
Bump version to 1.19.0 2020-05-27 11:33:32 +02:00
Alex Kriuchykhin 05d4f57793
Merge pull request #2613 from biosistemika/revert-2611-ok_SCI_4698 
Revert "Fix handling of deleted repositories in reports [SCI-4698]"
 2020-05-27 10:40:19 +02:00
Alex Kriuchykhin 8ed8f148a3 Revert "Fix handling of deleted repositories in reports [SCI-4698]" 2020-05-27 10:39:44 +02:00
Urban Rotnik e198a2a149 Merge pull request #2612 from urbanrotnik/ur-sci-inventory-activity-fix 
Fix constantizing for repository
 2020-05-27 10:02:35 +02:00
aignatov-bio 7b36392a19
Merge pull request #2606 from aignatov-bio/ai-sci-4621-resize-simple-table-header-size-on-sidebar-colapse 
Resize simple table header on sidebar collapse [SCI-4621]
 2020-05-27 09:35:40 +02:00