max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 08:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,665 Commits 6 Branches 4 Tags
Commit Graph

3665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Darth Vader
bbc24721b4 Merge commit 'f7383cafbbb95a6bc058eb08222adfb2fd878d98' 2021-10-30 22:54:20 +00:00
Darth Vader
f7383cafbb Squashed 'examples/c/' changes from 8d5070c9..2a2707ae 
2a2707ae [iphreeqccom] updated date
a203e0cf [iphreeqc] updated image location
aa055fc9 added README to examples
e1f78666 added CMakeLists.txt to examples
23fa9771 fixed to run on linux; cleaned examples
7dade0c0 [phreeqc] Testing subtree merges
445c6945 [phreeqc] Testing subtree merges 2
294e42f6 [phreeqc] Testing subtree merges
d664f890 Added .gitlab-ci.yml
513a83ee Closes https://gitlab.cr.usgs.gov/coupled/IPhreeqc/issues/6

git-subtree-dir: examples/c
git-subtree-split: 2a2707ae767123b1418ca2250e14df6caa65d6e2
 2021-10-30 22:54:20 +00:00
Charlton, Scott R
6487c6837e Test squash subtree merge 2021-10-30 22:52:20 +00:00
Charlton, Scott R
899bbd0755 Merge branch 'charlton-master-patch-43983' into 'master' 
testing clone

See merge request coupled/iphreeqc!22
 2021-10-30 21:08:45 +00:00
Charlton, Scott R
65e475e45f testing clone 2021-10-30 21:08:21 +00:00
Darth Vader
9499e78cb2 Merge commit 'f715edb5897985acf0692d2b0bde4ab34379469f' 2021-09-29 23:26:31 +00:00
Darth Vader
f715edb589 Merge commit '2243d25babbc524e7875b3d591bb6b91c4399a95' 2021-09-29 23:26:01 +00:00
Charlton, Scott R
d6b34b3e21 Merge remote-tracking branch 'usgs-coupled/master' 2021-09-29 16:56:09 -06:00
Scott Charlton
8cf5a22bcb
Update cmake.yml 
working on getting to work both in jenkins and github-actions.
 2021-09-29 16:33:06 -06:00
Charlton, Scott R
e9c1c7591d updated versioning 2021-09-29 16:15:35 -06:00
Charlton, Scott R
d64894ec91 Merge remote-tracking branch 'usgs-coupled/master' 2021-09-29 14:23:52 -06:00
Scott Charlton
01dbd82eb8
Update cmake.yml 
Check then build to avoid object files in src directory
 2021-09-28 17:15:13 -06:00
Charlton, Scott R
2ffcc14386 updated init outputs 2021-09-28 07:00:03 -07:00
Charlton, Scott R
547c6ed33d cleaning up r-build 2021-09-27 18:01:34 -07:00
Darth Vader
55f645329e Merge commit '6e8b89a2ef1547d485ca8bd59016646bedbf746f' 2021-09-27 18:23:26 +00:00
Darth Vader
6e8b89a2ef Merge commit '2243d25babbc524e7875b3d591bb6b91c4399a95' 2021-09-27 18:23:14 +00:00
Darth Vader
2243d25bab Merge commit '013c822f76e5dc2e4fc19e87c6e5777aea6151d2' 2021-09-27 18:22:25 +00:00
Darth Vader
f8b289df8e Merge commit 'c1af6f3585142e84fc40ec2c74914ef4a3b5da8b' 2021-09-27 18:21:19 +00:00
Darth Vader
5cbd50cf24 Merge commit 'd3bdd8b54a3af64f157001e84f1f46cd1c4c89fc' 2021-09-27 16:26:19 +00:00
Charlton, Scott R
de3cd91cff see if check creates tarball 2021-09-23 18:42:25 -07:00
Charlton, Scott R
d990665808 try running check a different way 2021-09-23 17:21:44 -07:00
Charlton, Scott R
c1af6f3585 added newlines for CRAN 2021-09-23 06:37:13 -07:00
Charlton, Scott R
013c822f76 added newlines for CRAN 2021-09-23 06:37:13 -07:00
Charlton, Scott R
d3bdd8b54a added newlines for CRAN 2021-09-23 06:37:13 -07:00
Charlton, Scott R
f4adff599c added newlines for CRAN 2021-09-23 06:37:13 -07:00
Charlton, Scott R
08e7aa28a7 re-added make check 2021-09-22 16:44:20 -06:00
Charlton, Scott R
bffe5c829b simplified 2021-09-22 16:29:22 -06:00
Charlton, Scott R
7eac510adf simplified 2021-09-22 16:27:02 -06:00
Charlton, Scott R
85ed08045a added devtools install 2021-09-22 11:55:30 -06:00
Charlton, Scott R
ff272b20a6 reformatted date 2021-09-22 11:41:56 -06:00
Charlton, Scott R
f26d85b82b added r-build section 2021-09-22 11:31:45 -06:00
Charlton, Scott R
149da2ea0a Merge remote-tracking branch 'origin/master' 2021-09-22 11:23:01 -06:00
Charlton, Scott R
0408914a6f Merge branch 'cran-update' into 'master' 
cran update

See merge request coupled/iphreeqc!21
 2021-09-21 20:01:44 +00:00
Charlton, Scott R
cc826688f2 cran update 2021-09-21 20:01:43 +00:00
Charlton, Scott R
975798eb3a forgot to change file name 2021-09-16 14:33:39 -06:00
Charlton, Scott R
5d41b53c53 found chm 2021-09-16 14:31:08 -06:00
Charlton, Scott R
aca0041714 debugging 2021-09-16 14:26:19 -06:00
Charlton, Scott R
a1762ab717 added ls recurse 2021-09-16 14:19:25 -06:00
Charlton, Scott R
44b5dcb303 updated distcheck ls 2021-09-16 13:51:14 -06:00
Charlton, Scott R
4b96b19aa8 updated distcheck 2021-09-16 13:48:34 -06:00
Charlton, Scott R
a736c7daca updated distcheck 2021-09-16 13:41:06 -06:00
Charlton, Scott R
bcb5c8dd87 still trying to fix hhc exit code 2021-09-16 12:31:41 -06:00
Charlton, Scott R
f8369c15e9 trying to fix hhc exit code 2021-09-16 12:28:47 -06:00
Charlton, Scott R
e6ec04d9d4 fixed hhc exit code check 2021-09-16 12:09:25 -06:00
Charlton, Scott R
ff0cac0151 I think hhc returns non-zero on success 2021-09-15 22:12:40 -06:00
Charlton, Scott R
c47d523431 modified path to run hhc 2021-09-15 22:08:45 -06:00
Charlton, Scott R
ef187a70e1 build chm 2021-09-15 22:02:22 -06:00
Charlton, Scott R
ca348d2508 verify htmlhelp install 2021-09-15 18:52:41 -06:00
Charlton, Scott R
776f8298c0 added htmlhelp install 2021-09-15 18:49:53 -06:00
Charlton, Scott R
886c44cde9 simplified steps 2021-09-15 13:09:26 -06:00