- mzR
- Graph
-
0368dbf558
(HEAD -> devel, origin/master, origin/devel, origin/HEAD)
Merge branch 'saskema-fix288' into devel by
Steffen Neumann <sneumann@ipb-halle.de>
2024-11-19 17:40:48 +0100;
-
-
e91cfccefc
attempt fix for github action by
Steffen Neumann <sneumann@ipb-halle.de>
2024-11-19 17:40:24 +0100;
-
7bd8d491b3
Bump version. Thanks Sascha, this closes <a href="#288">#288</a> by
Steffen Neumann <sneumann@ipb-halle.de>
2024-11-19 17:38:44 +0100;
-
2487295017
Fixed typo in DESCRIPTION by
sascha.manier@uni-saarland.de <sascha.manier@uni-saarland.de>
2024-11-19 12:51:01 +0100;
-
48883850aa
Fix Issue #288: Compilation fails: control reaches end of non-void function by
sascha.manier@uni-saarland.de <sascha.manier@uni-saarland.de>
2024-11-19 10:59:55 +0100;
-
-
4e4e270c97
bump x.y.z version to odd y following creation of RELEASE_3_20 branch by
J Wokaty <jennifer.wokaty@sph.cuny.edu>
2024-10-29 09:38:05 -0400;
-
942e97707f
(origin/RELEASE_3_20, RELEASE_3_20)
bump x.y.z version to even y prior to creation of RELEASE_3_20 branch by
J Wokaty <jennifer.wokaty@sph.cuny.edu>
2024-10-29 09:38:05 -0400;
-
fe18e32ad2
bump version by
Laurent Gatto <laurent.gatto@uclouvain.be>
2024-10-12 08:48:22 +0200;
-
4507e04c00
Merge pull request <a href="#299">#299</a> from rdhale92/patch-1 by
Laurent Gatto <laurent.gatto@uclouvain.be>
2024-10-12 08:46:48 +0200;
-
-
f7ea9b3e8d
Improve grammar of `openMSfile` manpage by
rdhale92 <75230021+rdhale92@users.noreply.github.com>
2024-10-11 22:54:13 -0400;
-
-
3b07b8cfb3
Merge branch 'devel' of github.com:sneumann/mzR into devel by
Laurent Gatto <laurent.gatto@uclouvain.be>
2024-09-30 13:30:38 +0200;
-
-
21c905f738
document CV udpating by
Laurent Gatto <laurent.gatto@uclouvain.be>
2024-09-30 13:27:23 +0200;
-
1325d3b2b4
Merge pull request <a href="#297">#297</a> from sneumann/cv-astral by
Laurent Gatto <laurent.gatto@uclouvain.be>
2024-09-30 13:25:51 +0200;
-
-
c104a91ab9
Merge branch 'cv-astral' of github.com:sneumann/mzR into cv-astral by
Laurent Gatto <laurent.gatto@uclouvain.be>
2024-09-30 08:15:25 +0200;
-
-
-
-
7dcdc4bc55
update cv by
Laurent Gatto <laurent.gatto@uclouvain.be>
2024-09-30 08:14:42 +0200;
-
-
-
115c9b7db5
Merge pull request <a href="#296">#296</a> from sneumann/main by
Laurent Gatto <laurent.gatto@uclouvain.be>
2024-09-29 11:38:51 +0200;
-
-
-
-
b2b8884387
bump x.y.z version to odd y following creation of RELEASE_3_19 branch by
J Wokaty <jwokaty@users.noreply.github.com>
2024-04-30 10:25:16 -0400;
-
d986b265c7
(origin/RELEASE_3_19, RELEASE_3_19)
bump x.y.z version to even y prior to creation of RELEASE_3_19 branch by
J Wokaty <jwokaty@users.noreply.github.com>
2024-04-30 10:25:16 -0400;
-
-
3f14342167
Merge pull request <a href="#291">#291</a> from sneumann/fix/issue290 by
Steffen Neumann <sneumann@ipb-halle.de>
2024-03-18 14:20:22 +0100;
-
-
e12a2245c1
Fix compilation on Windows/aarch64 (closes #290) by
Steffen Neumann <sneumann@ipb-halle.de>
2024-03-18 12:52:50 +0100;
-
-
5f50097366
remove mentions of mzData by
Laurent Gatto <laurent.gatto@uclouvain.be>
2024-02-24 15:18:16 +0100;
-
a3ad6fac89
Bump github actions to BioC 3.19 devel by
Steffen Neumann <sneumann@ipb-halle.de>
2023-11-07 15:08:36 +0100;
-
a0d56e75c5
Bump github actions to BioC 3.18 devel by
Steffen Neumann <sneumann@ipb-halle.de>
2023-11-06 09:12:12 +0100;
-
5143a8f59a
First attempt to fix compilation on centOS 7 / R-4.3.1 reported in <a href="#286">#286</a> by
Steffen Neumann <sneumann@ipb-halle.de>
2023-11-03 08:34:10 +0100;
-
40004fe59f
bump x.y.z version to odd y following creation of RELEASE_3_18 branch by
J Wokaty <jennifer.wokaty@sph.cuny.edu>
2023-10-24 09:47:39 -0400;
-
1764563bfc
(origin/RELEASE_3_18, RELEASE_3_18)
bump x.y.z version to even y prior to creation of RELEASE_3_18 branch by
J Wokaty <jennifer.wokaty@sph.cuny.edu>
2023-10-24 09:47:39 -0400;
-
cbc98f1c42
(origin/RELEASE_3_17, RELEASE_3_17)
Bump version and NEWS. Thanks to Christian Iseli for the PR! Closes <a href="#282">#282</a> by
Steffen Neumann <sneumann@ipb-halle.de>
2023-06-19 13:52:27 +0200;
-
edf636b125
Fix build on Fedora 38 / R-4.3.0 by
Christian Iseli <christian.iseli@epfl.ch>
2023-04-25 23:08:12 +0200;
-
a9788d43f5
Bump version and NEWS. Thanks to Christian Iseli for the PR! Closes <a href="#282">#282</a> by
Steffen Neumann <sneumann@ipb-halle.de>
2023-04-28 11:13:03 +0200;
-
fc15a3c7c4
Merge pull request <a href="#283">#283</a> from c4chris/devel by
Steffen Neumann <sneumann@ipb-halle.de>
2023-04-28 11:10:25 +0200;
-
-
65feb5f28d
Update github action r-lib by
Steffen Neumann <sneumann@ipb-halle.de>
2023-04-27 16:22:45 +0200;
-
127ddca1cb
Bump bioc for CI by
Steffen Neumann <sneumann@ipb-halle.de>
2023-04-27 16:19:18 +0200;
-
30f975859b
Fix build on Fedora 38 / R-4.3.0 by
Christian Iseli <christian.iseli@epfl.ch>
2023-04-25 23:08:12 +0200;
-
e1deaeb8cf
bump x.y.z version to odd y following creation of RELEASE_3_17 branch by
J Wokaty <jwokaty@users.noreply.github.com>
2023-04-25 10:20:39 -0400;
-
-
-
14ccc37ab3
bump x.y.z version to even y prior to creation of RELEASE_3_17 branch by
J Wokaty <jwokaty@users.noreply.github.com>
2023-04-25 10:20:39 -0400;
-
-
038f68d6c4
Merge pull request <a href="#279">#279</a> from sneumann/fix/issue278 by
Steffen Neumann <sneumann@ipb-halle.de>
2023-04-06 09:36:29 +0200;
-
-
12513b6cf9
Update to newer pwiz CV handling code by
Steffen Neumann <sneumann@ipb-halle.de>
2023-04-06 08:55:37 +0200;
-
78fc419e8b
Updating the CV by
Steffen Neumann <sneumann@ipb-halle.de>
2023-04-05 14:44:04 +0200;
-
-
f2439b3d94
bump x.y.z version to odd y following creation of RELEASE_3_16 branch by
J Wokaty <jennifer.wokaty@sph.cuny.edu>
2022-11-01 11:06:10 -0400;
-
ef57d59205
(origin/RELEASE_3_16, RELEASE_3_16)
bump x.y.z version to even y prior to creation of RELEASE_3_16 branch by
J Wokaty <jennifer.wokaty@sph.cuny.edu>
2022-11-01 11:06:10 -0400;
-
48029f236c
bump version by
Steffen Neumann <sneumann@ipb-halle.de>
2022-05-24 10:45:03 +0200;
-
24f51a7d93
Merge branch 'master' of git.bioconductor.org:packages/mzR by
Steffen Neumann <sneumann@ipb-halle.de>
2022-05-24 10:43:38 +0200;
-
-
cfc7d73e4f
Merge pull request <a href="#270">#270</a> from jorainer/issue_269 by
Steffen Neumann <sneumann@ipb-halle.de>
2022-05-24 10:42:57 +0200;
-
-
a0a9a8ea66
fix: read full spectra data in get3DMap (issue #269) by
jorainer <johannes.rainer@gmail.com>
2022-05-24 09:28:04 +0200;
-
-
0b19fcb4fd
bump x.y.z version to odd y following creation of RELEASE_3_15 branch by
Nitesh Turaga <nitesh.turaga@gmail.com>
2022-04-26 15:08:40 +0000;
-
563ae755cf
(origin/RELEASE_3_15, RELEASE_3_15)
bump x.y.z version to even y prior to creation of RELEASE_3_15 branch by
Nitesh Turaga <nitesh.turaga@gmail.com>
2022-04-26 15:08:40 +0000;
-
-
4745773a64
Merge pull request <a href="#267">#267</a> from jorainer/master by
Steffen Neumann <sneumann@ipb-halle.de>
2022-04-25 10:18:26 +0200;
-
-
3b091f3a32
fix: mzML export by
jorainer <johannes.rainer@gmail.com>
2022-04-22 15:50:18 +0200;
-
-
88b1c19b08
Merge pull request <a href="#265">#265</a> from jorainer/master by
Steffen Neumann <sneumann@ipb-halle.de>
2022-03-20 19:20:40 +0100;
-
-
0e6e520656
merge by
jorainer <johannes.rainer@gmail.com>
2022-03-18 14:47:56 +0100;
-
-
-
-
c2ab2b8c61
feat: pwiz returns peak matrices with column names by
jorainer <johannes.rainer@gmail.com>
2022-03-18 11:38:45 +0100;
-
68e17202e1
re-apply clang compile fix after pwiz upgrade, closes <a href="#263">#263</a> by
Steffen Neumann <sneumann@ipb-halle.de>
2022-03-14 11:47:04 +0100;
-
34f92398db
Add minimum R version: Versioned LinkingTo is only usable in R >= 3.0.2 by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-26 21:20:10 +0100;
-
45834cf058
Fix Warning from Wparentheses by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-26 21:17:58 +0100;
-
71c792d7ce
Remove stray file also removed from boost upstream by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-26 21:11:13 +0100;
-
458704d680
Merge pull request <a href="#253">#253</a> from sneumann/feature/updatePwiz_3_0_21263 by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-25 17:51:47 +0100;
-
-
f9a4423877
Merge branch 'master' into feature/updatePwiz_3_0_21263 by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-25 17:30:31 +0100;
-
-
-
-
e43067df3f
Cleanup ZLIB from Makevars, enable other arches and disable error on warning in GitHub action, update DESCRIPTION and NEWS by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-25 10:42:19 +0100;
-
9b60d77203
Fix compile errors by win_check() by
uly55e5 <uly55e5@web.de>
2022-01-24 18:18:46 +0100;
-
d51b668984
fixed iostream.cpp by
uly55e5 <uly55e5@web.de>
2022-01-19 01:30:42 +0100;
-
d2f5476d83
Add iostream.cpp by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-18 12:59:27 +0100;
-
d49b824da6
Add winthreads, adopt to changed location of iostream.cpp by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-18 12:27:30 +0100;
-
54422cf977
Adding algo by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-18 11:55:21 +0100;
-
d8aa09b2f3
Add more headers for unordered by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-18 11:29:09 +0100;
-
3cb3c128c7
Add more headers by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-18 10:43:12 +0100;
-
11faef7a98
Adding IPC detail on windows by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-18 09:33:38 +0100;
-
828c534b87
Adding stream on windows by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-17 14:33:38 +0100;
-
3e92e81223
Add spinlock on windows by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-17 14:07:22 +0100;
-
e07abc7993
Fix path of windows includes by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-17 13:28:34 +0100;
-
a4600bb328
Add IPB on windows by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-17 13:00:22 +0100;
-
bdfb826b0b
Move disabling INSTALL patches by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-14 10:04:24 +0100;
-
4c79687123
Fix env var against install time patches again by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-14 09:22:15 +0100;
-
60306fb03a
Fix Avoid install time patching in github actions by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-14 08:05:56 +0100;
-
8af49c07de
Avoid install time patching in github actions by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-14 07:34:11 +0100;
-
0132be366b
avoid use of find in Makevars, breaking windows builds by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-13 22:44:30 +0100;
-
9daef8f9e0
Cleanup in build files by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-13 21:21:45 +0100;
-
3d7449c099
Merge remote-tracking branch 'drauh/feature/updatePwiz_3_0_21263' into feature/updatePwiz_3_0_21263 by
Steffen Neumann <sneumann@ipb-halle.de>
2022-01-13 09:17:12 +0100;
-
-
942bd2aeae
Fix problems with Filesystem.cpp from pwiz <a href="#253">#253</a> by
uly55e5 <uly55e5@web.de>
2021-12-09 08:53:32 +0100;
-
87322ebb0c
Change DESCRIPTION to work with devtools::check_win() by
uly55e5 <uly55e5@web.de>
2021-12-09 08:51:46 +0100;
-
fbfaeb1a14
don't install dependencies originally added for xcms github action by
Steffen Neumann <sneumann@ipb-halle.de>
2021-11-27 19:51:13 +0100;
-
-
a3475bfd58
Revert d76a1fe3601ffdcf4b8a30a535a1e2a442f894e2 and change preprocessor check instead by
Steffen Neumann <sneumann@ipb-halle.de>
2021-11-27 18:52:21 +0100;
-
86b5dcddca
Add some mac stuff by
Steffen Neumann <sneumann@ipb-halle.de>
2021-11-27 18:37:38 +0100;
-
f8316567b0
Adding more win stuff by
Steffen Neumann <sneumann@ipb-halle.de>
2021-11-27 17:17:55 +0100;
-
a0ee32b052
Adding more win stuff by
Steffen Neumann <sneumann@ipb-halle.de>
2021-11-27 14:24:19 +0100;
-
d76a1fe360
Explicitly and manually define _MSC_VER on Windows by
Steffen Neumann <sneumann@ipb-halle.de>
2021-11-27 13:35:29 +0100;
-
1aeecc6485
Adding more win stuff by
Steffen Neumann <sneumann@ipb-halle.de>
2021-11-27 12:11:29 +0100;
-
17ebe8ec2f
Adding more win stuff by
Steffen Neumann <sneumann@ipb-halle.de>
2021-11-27 11:23:50 +0100;
-
d9219a9ac1
Adding winapi by
Steffen Neumann <sneumann@ipb-halle.de>
2021-11-26 23:31:46 +0100;
-
cfe0e67aa8
Add github actions by
Steffen Neumann <sneumann@ipb-halle.de>
2021-11-26 22:38:42 +0100;
-
6f8ec1746d
Merge pull request <a href="#254">#254</a> from jorainer/feature/updatePwiz_3_0_21263 by
Steffen Neumann <sneumann@ipb-halle.de>
2021-11-26 18:00:54 +0100;
-
-
ee9c964e8f
refactor: header always returns a `data.frame` (PR #253) by
jorainer <johannes.rainer@gmail.com>
2021-11-25 09:27:02 +0100;
-
-
f95a952bc7
Merge branch 'master' into feature/updatePwiz_3_0_21263 by
Steffen Neumann <sneumann@ipb-halle.de>
2021-11-24 17:31:22 +0100;
-
-
-
-
3271d295a0
Fix DESCRIPTION by
Steffen Neumann <sneumann@ipb-halle.de>
2021-11-23 23:15:45 +0100;
-
899e9e0c6c
Add News by
Steffen Neumann <sneumann@ipb-halle.de>
2021-11-20 12:19:02 +0100;
-
-
-
-
cf900d05a8
Fix version number after release by
Steffen Neumann <sneumann@ipb-halle.de>
2021-10-27 14:39:10 +0200;
-
5b6d251ade
Fix merge conflict on Versions after BioC release by
Steffen Neumann <sneumann@ipb-halle.de>
2021-10-27 14:28:00 +0200;
-
-
4c03c48709
Use pwiz to extract acquisitionNum from scanId by
jorainer <johannes.rainer@gmail.com>
2021-10-27 07:52:05 +0200;
-
93b51a7b99
bump x.y.z version to odd y following creation of RELEASE_3_14 branch by
Nitesh Turaga <nitesh.turaga@gmail.com>
2021-10-26 15:59:59 +0000;
-
bee7d6fb5f
(origin/RELEASE_3_14, RELEASE_3_14)
bump x.y.z version to even y prior to creation of RELEASE_3_14 branch by
Nitesh Turaga <nitesh.turaga@gmail.com>
2021-10-26 15:59:59 +0000;
-
-
-
2aed7135fe
refactor: patially rewrite code to exctract header info by
jorainer <johannes.rainer@gmail.com>
2021-10-25 10:58:52 +0200;
-