scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-25 01:16:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
11359 commits 69 branches 179 tags 165 MiB
Commit graph

11359 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aignatov-bio b27706c6f1
Merge pull request #4158 from aignatov-bio/ai-sci-update-core-version-1.25.2 
Update version to 1.25.2
 2022-06-09 16:08:07 +02:00
Anton 70ab0b5886 Update version to 1.25.2 2022-06-09 16:07:18 +02:00
Alex Kriuchykhin 86c339f0d3
Merge pull request #4143 from biosistemika/release/1.25.2 
Release  1.25.2
 2022-06-09 16:01:42 +02:00
Alex Kriuchykhin ded673ebf3
Merge pull request #4151 from okriuchykhin/ok_SCI_6886 
Improve Inventory table loading time [SCI-6886]
 2022-06-09 15:59:41 +02:00
Anton cfe2e72c96 Fix Docx preview after replace file [SCI-6878] 2022-06-09 15:58:40 +02:00
aignatov-bio ada26d8036
Merge pull request #4157 from aignatov-bio/ai-sci-6782-fix-css-for-inline-editing 
Finalize inline edit field [SCI-6782]
 2022-06-09 15:25:46 +02:00
Anton 66212fd703 Finalize inline edit field [SCI-6782] 2022-06-09 14:40:45 +02:00
Oleksii Kriuchykhin 31ae9ffbda Fix switching between views on experiment canvas [SCI-6879] 2022-06-09 14:13:29 +02:00
Oleksii Kriuchykhin f82c2af244 Improve inventory stock saving with comment [SCI-6805] 2022-06-09 13:18:00 +02:00
aignatov-bio 7446e4be9b
Merge pull request #4150 from aignatov-bio/ai-sci-5257-close-all-modals-to-esc 
Fix element closing on select [SCI-5257]
 2022-06-09 12:44:59 +02:00
aignatov-bio 7cbe36340e
Merge pull request #4154 from aignatov-bio/ai-sci-6791-fix-show-password 
Fix show password for invitation/password reset screens [SCI-6791]
 2022-06-09 12:44:11 +02:00
Anton f84a972f6a Fix show password for invitation/password reset screens [SCI-6791] 2022-06-09 11:40:22 +02:00
artoscinote e114f9b880
Update protocols.io importer and import from repository [SCI-6872] (#4138) 2022-06-08 15:55:50 +02:00
aignatov-bio 81773151a4
Merge pull request #4152 from aignatov-bio/ai-sci-6875-update-team-import-export 
Update team import/export scripts [SCI-6875]
 2022-06-08 15:43:50 +02:00
Anton fb9fcb9371 Update team import/export scripts [SCI-6875] 2022-06-08 15:32:59 +02:00
ajugo 5d198924af
DOCX: Render image for step table [SCI-6885] (#4144) 2022-06-08 13:37:03 +02:00
ajugo a5065b82cb
Show error for broken file in repository row [SCI-6838] (#4146) 2022-06-08 13:35:06 +02:00
Oleksii Kriuchykhin 07716e56a5 Improve Inventory table loading time [SCI-6886] 2022-06-08 13:23:39 +02:00
Alex Kriuchykhin 1f0225043f
Merge pull request #4149 from biosistemika/dependabot/bundler/jmespath-1.6.1 
Bump jmespath from 1.4.0 to 1.6.1
 2022-06-08 10:35:33 +02:00
dependabot[bot] b7b21f8e10
Bump jmespath from 1.4.0 to 1.6.1 
Bumps [jmespath](https://github.com/trevorrowe/jmespath.rb) from 1.4.0 to 1.6.1.
- [Release notes](https://github.com/trevorrowe/jmespath.rb/releases)
- [Changelog](https://github.com/jmespath/jmespath.rb/blob/main/CHANGELOG.md)
- [Commits](https://github.com/trevorrowe/jmespath.rb/compare/v1.4.0...v1.6.1)

---
updated-dependencies:
- dependency-name: jmespath
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-07 21:20:25 +00:00
Anton 4ab4f4c6ed Fix element closing on select [SCI-5257] 2022-06-07 15:14:00 +02:00
aignatov-bio 2cb5d44109
Merge pull request #4148 from aignatov-bio/ai-sci-6870-finalize-protocol-repository 
Finalize protocol repository [SCI-6870]
 2022-06-07 15:11:40 +02:00
Anton 46631a1f46 Finalize protocol repository [SCI-6870] 2022-06-07 12:10:10 +02:00
aignatov-bio f2785bbff6
Merge pull request #4145 from aignatov-bio/ai-sci-6869-add-metadata-block-to-protocol-in-repository 
Add metadata block in protocol repository [SCI-6869]
 2022-06-07 10:53:14 +02:00
Anton 656d036b2a Fix markup [SCI-6869] 2022-06-07 10:02:10 +02:00
Alex Kriuchykhin bdd61d3e19
Merge pull request #4134 from okriuchykhin/ok_SCI_6842 
Update team users table with new user assignments [SCI-6842]
 2022-06-06 18:23:09 +02:00
Anton e86a0610b2 Add metadata block in protocol repository [SCI-6869] 2022-06-06 13:56:22 +02:00
artoscinote bb067974b4 Version 1.25.1 2022-06-06 10:16:09 +02:00
artoscinote e0536c85ac Fix label templates (#4128) 2022-06-06 10:15:58 +02:00
aignatov-bio a8fe943658
Merge pull request #4140 from aignatov-bio/ai-sci-6868-remove-new-protocal-modal 
Remove protocol creation modal [SCI-6868]
 2022-06-05 22:41:57 +02:00
aignatov-bio d7926654ee
Merge pull request #4139 from aignatov-bio/ai-sci-6867-add-view-mode-for-protocol-and-step 
Add view mode to protocol and step [SCI-6867]
 2022-06-03 15:27:15 +02:00
Anton 32273fe169 Fix markup [SCI-6867] 2022-06-03 15:26:16 +02:00
Anton 3910fa34f3 Remove protocol creation modal [SCI-6868] 2022-06-03 15:11:51 +02:00
Anton 2da1a380c3 Add view mode to protocol and step [SCI-6867] 2022-06-03 11:53:53 +02:00
ajugo 13798374ed
Add consume column to assigned item export [SCI-6841] (#4115) 
* Add consume column to assigned item export [SCI-6841]

* Fix hound [SCI-6841]
 2022-06-03 10:10:00 +02:00
ajugo 9d4c97f191
Add task assignment API [SCI-6846] (#4123) 
* Add user assignment to task API [SCI-6846]

* Add test for task assignments [SCI-6846]
 2022-06-03 10:09:42 +02:00
Martin Artnik 1df4433074 Fix file activity logging in steps controller 2022-06-02 13:44:03 +02:00
Martin Artnik 8c78920927 Fixed checklist editing 2022-06-02 12:02:34 +02:00
Martin Artnik ded23dc528 Fix checklist update issue 2022-06-02 11:53:24 +02:00
Martin Artnik 02c813bf06 Fix text serializer and file activity logging 2022-06-02 11:32:31 +02:00
Martin Artnik 9abbe22c26 Merge branch 'develop' into features/step-editing-improvements 2022-06-02 11:26:39 +02:00
aignatov-bio 6b4a3f2651
Merge pull request #4130 from aignatov-bio/ai-sci-6856-update-pdf-report 
Update PDF report layout [SCI-6856]
 2022-06-02 11:18:16 +02:00
artoscinote ab5cb19d6e
Add step activities, fix checklists [SCI-6852] (#4136) 
* Add step activities, fix checklists [SCI-6852]

* Linter fix [SCI-6852]
 2022-06-02 11:15:32 +02:00
aignatov-bio c5f3b4affb
Merge pull request #4133 from aignatov-bio/ai-sci-6878-fix-docx-preview-after-replace-file 
Fix Docx preview after replace file [SCI-6878]
 2022-06-02 11:07:40 +02:00
aignatov-bio cd7ca54610
Merge pull request #4135 from aignatov-bio/ai-sci-6865-add-step-text-option-to-report-wizard 
Add step text option to report wizard [SCI-6865]
 2022-06-02 11:06:48 +02:00
aignatov-bio edc01ffc6a
Merge pull request #4122 from aignatov-bio/ai-sci-replace-protocol-view-in-protocol-repository 
Add new protocol view to repository [SCI-6858]
 2022-06-02 11:06:24 +02:00
Anton 61464b3780 Add new protocol view to repository [SCI-6858] 2022-06-02 11:05:25 +02:00
Anton 08e7ea3014 Add step text option to report wizard [SCI-6865] 2022-06-01 15:53:40 +02:00
aignatov-bio 3645200700
Merge pull request #4127 from aignatov-bio/ai-sci-6855-update-docx-report 
Update step structure in report [SCI-6855]
 2022-06-01 15:42:59 +02:00
Oleksii Kriuchykhin c5c3afa906 Update team users table with new user assignments [SCI-6842] 2022-06-01 15:06:19 +02:00