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

7781 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Urban Rotnik ebbce8d09e Add restore columns to migrations 2020-06-09 18:43:22 +02:00
mlorb 0cca53066f
Merge pull request #2645 from mlorb/ml-sci-4689 
Add archive to repository rows [SCI-4689]
 2020-06-08 16:51:02 +02:00
mlorb 75f2a49cc4
Merge branch 'features/inventory-archiving' into ml-sci-4689 2020-06-08 16:30:24 +02:00
Mojca Lorber a9a278409c Fix test 2020-06-08 16:22:37 +02:00
aignatov-bio fd930ff5d5
Merge pull request #2636 from aignatov-bio/ai-sci-4681-add-view-switcher-for-inventory-list 
Add switch for active/archive repository view [SCI-4681][SCI-4682]
 2020-06-08 09:53:19 +02:00
Mojca Lorber 42d6d727b9 Add archive to repository rows 2020-06-04 23:29:37 +02:00
aignatov-bio 4a6d7d0e12 Add archived inventories 2020-06-04 19:07:10 +02:00
aignatov-bio dd58fc4199 Fix i18n 2020-06-04 18:41:45 +02:00
aignatov-bio 66a77d8de9 Add sidebar reload on view change 2020-06-04 18:41:45 +02:00
aignatov-bio c0e984b316 Fix tests 2020-06-04 18:41:45 +02:00
aignatov-bio 012b7b3d23 Add switch for active/archive repository view 2020-06-04 18:41:45 +02:00
mlorb a29a8d67f4
Merge pull request #2643 from mlorb/ml-sci-4684 
Add archive to repository [SCI-4684]
 2020-06-04 16:36:42 +02:00
Mojca Lorber d8523e03c8 Add db changes 2020-06-04 16:08:29 +02:00
Mojca Lorber d3806e53a5 Add archive to repository 2020-06-04 15:44:47 +02:00
aignatov-bio e32d942aec
Merge pull request #2630 from aignatov-bio/ai-sci-4677-add-repository-list-view 
Add repositories list view [SCI-4677]
 2020-06-02 10:34:03 +02:00
aignatov-bio 3294840611 Fix sidebar event 2020-06-01 14:45:03 +02:00
aignatov-bio f963608996 Add I18n and tests 2020-06-01 14:34:04 +02:00
aignatov-bio aee75a2f83 Add repository list view 2020-06-01 10:24:03 +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 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
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
Urban Rotnik fcd3efe07e Fix constantizing for repository 2020-05-27 09:19:11 +02:00
Miha Mencin 56b9a3ee2c
Merge pull request #2611 from okriuchykhin/ok_SCI_4698 
Fix handling of deleted repositories in reports [SCI-4698]
 2020-05-27 08:43:38 +02:00
Oleksii Kriuchykhin 6424bd23da Fix handling of deleted repositories in reports [SCI-4698] 2020-05-27 08:21:55 +02:00
aignatov-bio 457b0a8137
Merge pull request #2610 from aignatov-bio/ai-sci-4697-fix-snapshot-date-creation 
Fix snapshot date creation [SCI-4697]
 2020-05-26 16:28:13 +02:00
aignatov-bio 15f58be1c2 Fix snapshot date creation 2020-05-26 15:59:49 +02:00
aignatov-bio 88122904a5
Merge pull request #2608 from aignatov-bio/ai-sci-4696-fix-full-view-zindex 
Fix z-index for full view modal [SCI-4696]
 2020-05-26 15:41:18 +02:00
aignatov-bio 73c7ff47a5 Fix z-index for full view modal 2020-05-26 12:41:07 +02:00
Miha Mencin 4b7b3a8622
Merge pull request #2607 from biosistemika/SCI-4674-tehnician-snapshots-permissions 
[SCI-4674] Fix a typo
 2020-05-25 17:30:19 +02:00