scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-16 22:25:30 +08:00
Code Issues Projects Releases Packages Wiki Activity
7824 commits 31 branches 181 tags 167 MiB
Commit graph

7824 commits

This branch
This branch
All branches
Author SHA1 Message Date
aignatov-bio
bde548227b
Merge pull request #2687 from aignatov-bio/ai-sci-4775-small-improvments-for-tinymce-tables 
Add tables to TinyMce and small table improvements [SCI-4775]
 2020-06-29 09:52:03 +02:00
aignatov-bio
6a41290d9d Add tables to TinyMce and small table improvments 2020-06-24 15:51:59 +02:00
Alex Kriuchykhin
f8a48946c6
Merge pull request #2663 from biosistemika/dependabot/bundler/sanitize-5.2.1 
Bump sanitize from 5.1.0 to 5.2.1
 2020-06-17 10:56:22 +02:00
dependabot[bot]
b3912d5c69
Bump sanitize from 5.1.0 to 5.2.1 
Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.1.0 to 5.2.1.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v5.1.0...v5.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-16 22:11:34 +00:00
Urban Rotnik
727703a049
Merge pull request #2655 from biosistemika/master 
Version update
 2020-06-11 15:51:55 +02:00
Urban Rotnik
84aacecb81
Bump version to 1.19.2 2020-06-11 15:34:10 +02:00
Urban Rotnik
8928d5ef4e
Merge pull request #2654 from urbanrotnik/ur-ml-sci-4737-cp 
Fix protocol duplication at saving protocol from task to repository [SCI-4737]
 2020-06-11 15:33:16 +02:00
Urban Rotnik
566a800656
Revert bump to 1.19.2 2020-06-11 15:31:55 +02:00
Miha Mencin
12e48d1f7a
Bump version to 1.9.2 2020-06-11 13:25:56 +02:00
Mojca Lorber
cfeb4b4d3d Fix protocol duplication at saving protocol from task to repository 2020-06-11 13:19:21 +02:00
mlorb
71eef19acb
Merge pull request #2649 from mlorb/ml-sci-4737 
Fix protocol duplication at saving protocol from task to repository [SCI-4737]
 2020-06-09 13:36:58 +02:00
Mojca Lorber
c0c93772ff Fix protocol duplication at saving protocol from task to repository 2020-06-09 11:45:03 +02:00
Alex Kriuchykhin
8606555c9b
Merge pull request #2646 from biosistemika/dependabot/bundler/websocket-extensions-0.1.5 
Bump websocket-extensions from 0.1.4 to 0.1.5
 2020-06-08 09:48:46 +02:00
Alex Kriuchykhin
081102cf53
Merge pull request #2647 from biosistemika/dependabot/npm_and_yarn/websocket-extensions-0.1.4 
Bump websocket-extensions from 0.1.3 to 0.1.4
 2020-06-08 09:48:27 +02:00
Alex Kriuchykhin
f521531fd5
Merge pull request #2638 from okriuchykhin/ok_SCI_4571 
Clear the obsolete code for assigning inventory items to the task [SCI-4571]
 2020-06-08 09:47:56 +02:00
Urban Rotnik
9b114a50c3
Merge pull request #2642 from urbanrotnik/ur-sci-4721-counter-fix 
Fix assigned items counter [SCI-4721]
 2020-06-08 09:10:44 +02:00
Urban Rotnik
17620e3e86
Merge pull request #2631 from urbanrotnik/ur-sci-4534-not-visible-checklist 
Export and import checklist items with delimiter [SCI-4534]
 2020-06-08 09:10:26 +02:00
dependabot[bot]
6be1200828
Bump websocket-extensions from 0.1.3 to 0.1.4 
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-06 15:55:22 +00:00
dependabot[bot]
3ed3e2501e
Bump websocket-extensions from 0.1.4 to 0.1.5 
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-ruby) from 0.1.4 to 0.1.5.
- [Release notes](https://github.com/faye/websocket-extensions-ruby/releases)
- [Changelog](https://github.com/faye/websocket-extensions-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-ruby/compare/0.1.4...0.1.5)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-05 15:00:29 +00:00
Oleksii Kriuchykhin
85ce72e5ff Remove obsolete JS functions from repositories datatable [SCI-4571] 2020-06-05 11:15:58 +02:00
Urban Rotnik
c2ecc1749e Fix assigned items counter 2020-06-04 15:36:31 +02:00
Urban Rotnik
494c707cca
Merge pull request #2641 from biosistemika/develop 
Develop to Master
 2020-06-04 13:36:05 +02:00
Miha Mencin
17306eb585
Bump version to 1.19.1 2020-06-04 12:58:56 +02:00
Alex Kriuchykhin
c8e8b8e2f3
Merge pull request #2640 from okriuchykhin/ok_SCI_4728 
Fix appearance of snapshots from another my_module in report [SCI-4728]
 2020-06-04 09:50:43 +02:00
Oleksii Kriuchykhin
f1f26587c0 Fix appearence of snapshots from another my_module in report [SCI-4728] 2020-06-04 09:42:22 +02:00
Miha Mencin
38877aad26
Merge pull request #2639 from urbanrotnik/ur-sci-4728 
Scope snapshots to project [SCI-4728]
 2020-06-03 23:40:14 +02:00
Urban Rotnik
a93e2a5d6f Remove select 2020-06-03 23:18:22 +02:00
Urban Rotnik
69d086ba32 Scope snapshots to project 2020-06-03 22:58:22 +02:00
Oleksii Kriuchykhin
48865c8cea Clear the obsolete code for assiging inventory items to the task [SCI-4571] 2020-06-03 22:54:45 +02:00
Miha Mencin
4a1a957cda
Merge pull request #2637 from aignatov-bio/ai-sci-4726-add-snapshots-to-team-export-import 
Add snapshots to team export/import [SCI-4726]
 2020-06-03 21:17:25 +02:00
aignatov-bio
4886d95ad5 Fix variable naming 2020-06-03 17:07:11 +02:00
aignatov-bio
503d19fb90 Add snapshots to team export/import 2020-06-03 17:02:33 +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
Urban Rotnik
446a2db186 Export and import checklist items with delimiter 2020-06-01 17:19:33 +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