Bioconductor Code: Browse

Graph of mzR

f2439b3d94 (HEAD -> master, origin/master, origin/HEAD) 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;
7ff9196cdd remove (hopefully) unused directories by Steffen Neumann <sneumann@ipb-halle.de> 2021-09-23 17:21:20 +0200;
72fef926d8 Updating pwiz to 3_0_21263 by Steffen Neumann <sneumann@ipb-halle.de> 2021-09-23 14:34:25 +0200;
d6c9b8db08 Removed old pwiz code by Steffen Neumann <sneumann@ipb-halle.de> 2021-09-22 12:40:31 +0200;
5fbb9facff Merge pull request <a href="#251">#251</a> from jorainer/without_ramp by Steffen Neumann <sneumann@ipb-halle.de> 2021-09-20 20:55:47 +0200;
e3f79ff5f7 Remove Ramp backend with dependencies by jorainer <johannes.rainer@gmail.com> 2021-09-20 14:19:56 +0200;
5a5c15c5e9 (origin/RELEASE_3_13, RELEASE_3_13) add missing atomic_count_sync.hpp for M1 by Laurent Gatto <laurent.gatto@uclouvain.be> 2021-06-19 06:09:16 +0200;
60bf78693c misc + version update by Laurent Gatto <laurent.gatto@uclouvain.be> 2021-06-18 18:37:31 +0200;
d1bfdcc6dd Merge pull request <a href="#248">#248</a> from vjcitn/vince_M1_file by Laurent Gatto <laurent.gatto@uclouvain.be> 2021-06-18 17:35:44 +0200;
dbc53ee30f needed on M1 mac by Vince Carey <stvjc@channing.harvard.edu> 2021-06-18 09:41:18 -0400;
b1b203ad69 bump x.y.z version to odd y following creation of RELEASE_3_13 branch by Nitesh Turaga <nitesh.turaga@gmail.com> 2021-05-19 15:49:34 +0000;
537e62479e bump x.y.z version to even y prior to creation of RELEASE_3_13 branch by Nitesh Turaga <nitesh.turaga@gmail.com> 2021-05-19 15:49:34 +0000;
b73baad175 Merge pull request <a href="#246">#246</a> from sneumann/fix/issue244 by Steffen Neumann <sneumann@ipb-halle.de> 2021-05-08 16:11:28 +0200;
4c81caf25c Bump version after previous commit & fix, closes <a href="#244">#244</a> by Steffen Neumann <sneumann@ipb-halle.de> 2021-05-08 16:06:08 +0200;
d028ffbe38 Fix for clang-11 compile error courtesy Kurt Hornik by Steffen Neumann <sneumann@ipb-halle.de> 2021-05-08 09:43:30 +0200;
e294448881 Add rmarkdown dependency to fix build error by Steffen Neumann <sneumann@ipb-halle.de> 2021-04-17 16:44:00 +0200;
022ea55534 Merge pull request <a href="#240">#240</a> from jorainer/master by Steffen Neumann <sneumann@ipb-halle.de> 2021-02-08 14:27:25 +0100;
6ac854dd08 fix another column by jorainer <johannes.rainer@gmail.com> 2021-02-08 13:29:16 +0100;
cc0f816e1a fix: ensure columns are returned in correct data type by jorainer <johannes.rainer@gmail.com> 2021-02-08 13:19:25 +0100;
373a390e26 Merge pull request <a href="#239">#239</a> from jorainer/master by Laurent Gatto <laurent.gatto@uclouvain.be> 2021-02-03 14:13:32 +0100;
1848257456 Fix polarity being a `integer` for CDF by jorainer <johannes.rainer@gmail.com> 2021-02-03 13:08:52 +0100;
f56e0c92af fix: ensure header returns the same columns for all backends by jorainer <johannes.rainer@gmail.com> 2021-02-02 19:46:29 +0100;
09d5907dac Bump version to trigger new build and use latest Rcpp by Laurent Gatto <laurent.gatto@uclouvain.be> 2020-11-18 14:41:52 +0100;
e1d4de8761 (origin/RELEASE_3_12, RELEASE_3_12) Bump version to trigger new build and use latest Rcpp by Laurent Gatto <laurent.gatto@uclouvain.be> 2020-11-18 14:39:00 +0100;
19d69eb0e1 bump x.y.z version to odd y following creation of RELEASE_3_12 branch by Nitesh Turaga <nitesh.turaga@gmail.com> 2020-10-27 10:42:32 -0400;
4ac45e0e5d bump x.y.z version to even y prior to creation of RELEASE_3_12 branch by Nitesh Turaga <nitesh.turaga@gmail.com> 2020-10-27 10:42:32 -0400;
74ba1dfb61 Merge branch 'master' into devel by Laurent Gatto <laurent.gatto@uclouvain.be> 2020-09-09 18:06:46 +0200;
39380f5993 delete old changelog by Laurent Gatto <laurent.gatto@uclouvain.be> 2020-09-09 18:06:21 +0200;
162efcd9a7 Fix version number by Laurent Gatto <laurent.gatto@uclouvain.be> 2020-09-09 18:06:07 +0200;
bce725b258 bump version by Laurent Gatto <laurent.gatto@uclouvain.be> 2020-09-09 18:05:16 +0200;
9dd4715383 Merge pull request <a href="#227">#227</a> from mdnestor/master by Laurent Gatto <laurent.gatto@uclouvain.be> 2020-09-09 18:02:59 +0200;
5400bd1ff9 rename peptide_ref to peptideRef by Michael Nestor <michael.nestor@pnnl.gov> 2020-09-09 08:32:19 -0700;
809f9f5a36 Merge pull request <a href="#230">#230</a> from sneumann/fixIssue229 by Laurent Gatto <laurent.gatto@uclouvain.be> 2020-09-09 11:20:37 +0200;
4121d10357 don't specify exact distribution by Steffen Neumann <sneumann@ipb-halle.de> 2020-09-09 10:35:41 +0200;
ff929eea3b Script to pull most recent upstream CV files, closing <a href="#229">#229</a> by Steffen Neumann <sneumann@ipb-halle.de> 2020-09-09 10:29:24 +0200;
47cc64aa9e add peptide_ref to modification and psm info by Michael Nestor <michael.nestor@pnnl.gov> 2020-07-28 12:55:10 -0700;
b657cceaa1 bump x.y.z version to odd y following creation of RELEASE_3_11 branch by Nitesh Turaga <nitesh.turaga@gmail.com> 2020-04-27 18:26:37 +0000;
b432f21559 (origin/RELEASE_3_11, RELEASE_3_11) bump x.y.z version to even y prior to creation of RELEASE_3_11 branch by Nitesh Turaga <nitesh.turaga@gmail.com> 2020-04-27 18:26:37 +0000;
a6e86e062b update email by Laurent Gatto <laurent.gatto@uclouvain.be> 2020-03-29 16:58:52 +0200;