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

10423 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton 8b8e2c6d92 Merge branch 'develop' into features/stock-management 2022-03-14 11:56:38 +01:00
artoscinote 35dfa15e57
Implement hidden repository cell reminders [SCI-6504] (#3933) 2022-03-11 12:38:45 +01:00
artoscinote 1954d39beb
Bump version to 1.24.2 2022-03-10 15:02:33 +01:00
Alex Kriuchykhin 378fbb6b76
Apply user's time zone in advanced filters for time data type [SCI-6585] (#3930) 2022-03-10 13:49:09 +01:00
ajugo 959b86b40c
Task inventory activity for assigned item consumption [SCI-6453] (#3830) 
* Add task inventory activity [SCI-6453]
 2022-03-09 18:43:38 +01:00
Alex Kriuchykhin d777149865
Update Rails to 6.1.4.7 [SCI-6615] (#3928) 2022-03-09 16:04:52 +01:00
artoscinote 06430c9340
Fix moving experiment [SCI-6602] (#3927) 2022-03-09 15:30:30 +01:00
aignatov-bio bf058dea03
Add flyout for repository reminders [SCI-6501] (#3926) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-09 15:09:49 +01:00
aignatov-bio 10743921d4
Add reminders to stock modal [SCI-6557] (#3917) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-09 14:19:15 +01:00
aignatov-bio d89ea7d77f
Add red dot for date/datetime reminder [SCI-6499] (#3924) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-09 14:18:34 +01:00
artoscinote d577fcc824
Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] (#3911) 
* Implement basic logic for Date/DateTime/Stock reminders [SCI-6554]

* Implement bell icon [SCI-6500]

* Refactor reminder cells scope [SCI-6554]
 2022-03-09 14:13:48 +01:00
aignatov-bio 7f7bf0533a
Fix tests [SCI-6486] (#3913) 
* Fix tests [SCI-6486]

* Fix rspec tests [SCI-6486]

Co-authored-by: Anton <anton@scinote.net>
 2022-03-09 14:12:16 +01:00
artoscinote 20ef08907a
Stock column fixes [SCI-6455] (#3878) 
* Fix issues with stock column management [SCI-6455]

* Refactor stock column in datatables [SCI-6455]
 2022-03-08 14:52:45 +01:00
Miha Mencin aa4599e79f
Bump version to 1.24.1 2022-03-08 11:44:29 +01:00
dependabot[bot] 049933f95c
Bump url-parse from 1.5.7 to 1.5.10 (#3901) 
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.7 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.7...1.5.10)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-03-08 10:34:19 +01:00
dependabot[bot] 595f2ec5f9
Bump nokogiri from 1.12.5 to 1.13.2 (#3900) 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.12.5 to 1.13.2.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.12.5...v1.13.2)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-03-08 10:33:24 +01:00
dependabot[bot] db2ba235a8
Bump image_processing from 1.12.1 to 1.12.2 (#3909) 
Bumps [image_processing](https://github.com/janko/image_processing) from 1.12.1 to 1.12.2.
- [Release notes](https://github.com/janko/image_processing/releases)
- [Changelog](https://github.com/janko/image_processing/blob/master/CHANGELOG.md)
- [Commits](https://github.com/janko/image_processing/compare/v1.12.1...v1.12.2)

---
updated-dependencies:
- dependency-name: image_processing
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-03-08 10:32:50 +01:00
Alex Kriuchykhin 96e6cd3c1d
Fix time range advanced filtering [SCI-6585] (#3922) 2022-03-08 10:20:53 +01:00
artoscinote 732977b80d
Fix fetching available repository rows [SCI-6601] (#3920) 2022-03-07 17:12:41 +01:00
artoscinote 8d096df826
Fix reload of edit column index [SCI-6598] (#3918) 2022-03-07 17:11:56 +01:00
artoscinote e948fc20bc
Fix members dropdown CSS, order [SCI-6595] (#3919) 2022-03-07 17:11:35 +01:00
aignatov-bio 881e6403aa
Fix rte table in docx report [SCI-6449] (#3916) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-03 14:12:06 +01:00
artoscinote f9a8358d72
Fix archived column hiding issue in snapshots, fix typos [SCI-6589] (#3915) 2022-03-03 13:52:56 +01:00
artoscinote ea6873b465
Implement low stock threshold column [SCI-6555] (#3907) 2022-03-03 11:13:17 +01:00
Alex Kriuchykhin 32d005f480
Fix step deletion for API [SCI-6561] (#3914) 2022-03-03 10:00:44 +01:00
Miha Mencin c4d6aad658
Bump version to 1.24.0 2022-03-02 11:17:03 +01:00
artoscinote 87d202f3eb
Fix my_module_activities in AcitivtyService [SCI-6562] (#3908) 2022-03-01 12:28:45 +01:00
aignatov-bio 577f449b95
Fix repository table header [SCI-6559] (#3906) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-28 14:19:31 +01:00
artoscinote 4e118d095d
Fix dropdown component for group select [SCI-6583] (#3905) 2022-02-28 13:21:17 +01:00
aignatov-bio 99e8f7e3cb
Fix added on this month filter [SCI-6584] (#3904) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-28 11:16:29 +01:00
aignatov-bio 155b437d6a
Fix blank state for time filter [SCI-6590] (#3903) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-28 11:05:01 +01:00
aignatov-bio d54c7f1927
Fix save button dropdown for archived page [SCI-6581] (#3902) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-28 10:44:40 +01:00
Alex Kriuchykhin bd47893947
Add inventory archiving to the API [SCI-5584] (#3885) 2022-02-28 10:33:43 +01:00
Alex Kriuchykhin cc96a7e372
Fix advanced filters for numbers [SCI-6577] (#3899) 2022-02-28 10:31:42 +01:00
ajugo 493c7d64eb
Enable result comment button after canceling result edit [SCI-6537] (#3894) 
* Enable result comment button after cancelling edit button [SCI-6537]
 2022-02-25 22:32:21 +01:00
artoscinote 3df030b29e
Fix date/time filter loading and overwriting [SCI-6582] (#3898) 
* Fix filter overwrite [SCI-6582]

* Fix date/time filter loading [SCI-6582]

* Fix time/time range filter loading [SCI-6582]

* Code style fixes [SCI-6582]
 2022-02-25 15:27:31 +01:00
Alex Kriuchykhin c0e4b6f1f6
Fix advanced filters for added on field [SCI-6578] (#3895) 2022-02-25 14:30:37 +01:00
artoscinote 69964aae7b
Fix time range value filter [SCI-6580] (#3896) 2022-02-25 14:29:39 +01:00
aignatov-bio 7b4968a7a3
Fix archived on filters fix [SCI-6579] (#3897) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-25 14:29:27 +01:00
aignatov-bio 899f2efbd6
Fix blank state for dates range [SCI-6576] (#3893) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-24 12:47:32 +01:00
Alex Kriuchykhin fa6aeac1d9
Fix saving of time range values [SCI-6570] (#3892) 2022-02-24 09:43:15 +01:00
dependabot[bot] 24450fe280
Bump puma from 5.5.2 to 5.6.2 (#3847) 
Bumps [puma](https://github.com/puma/puma) from 5.5.2 to 5.6.2.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.5.2...v5.6.2)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-02-23 16:47:26 +01:00
aignatov-bio f7cc20ebab
Update blank state for datetime filters [SCI-6571] (#3891) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-23 14:55:04 +01:00
artoscinote c097b321a7
Fix multiple saving bug for repository filters [SCI-6523] (#3890) 2022-02-23 14:30:28 +01:00
aignatov-bio d6c7305dfe
Move range filter logic to separate mixin (#3889) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-23 13:28:59 +01:00
aignatov-bio cf200a23a7
Fix datetime switch between operators [SCI-6571] (#3888) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-23 11:40:37 +01:00
aignatov-bio 91ab7d0b40
Update none of operator for assigned tasks [SCI-6572] (#3884) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-23 10:05:24 +01:00
Alex Kriuchykhin e750295b07
Fix filtering in repository snapshots [SCI-6423] (#3887) 2022-02-23 09:24:38 +01:00
aignatov-bio 3ae683307d
Fix time filter [SCI-6575] (#3886) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-23 09:24:11 +01:00
Alex Kriuchykhin dd5939e89d
Fix advanced filters for ID and Name columns [SCI-6496] (#3865) 2022-02-22 14:49:17 +01:00