Commit Graph

136 Commits

Author SHA1 Message Date
Björn Endres b82c633663
Merge pull request #45 from seamuslee001/seamus_master
Update autogenrated civix file to be most recent version
2020-09-08 10:35:41 +02:00
Seamus Lee 76b5d8f49a Update autogenrated civix file to be most recent version 2020-09-08 18:07:47 +10:00
B. Endres c8c5694b52 [#44] alignment for readability 2020-09-07 09:36:17 +02:00
B. Endres 0ae1acb426 [#44] merged CiviCRM's new routes by @seamuslee001 2020-09-07 09:34:18 +02:00
B. Endres 1f46d5e5da [#44] added warning for CiviCRM < 5.27 2020-09-07 09:32:57 +02:00
Björn Endres 911f9ec3d3
Merge pull request #43 from seamuslee001/normal_routing
Add in normal url routes for tracked opens and tracking urls to the m…
2020-09-07 09:28:15 +02:00
Seamus Lee a88b621758 Add in normal url routes for tracked opens and tracking urls to the mend urls function and also make use of the normal routes when quering the target civi 2020-09-04 16:41:31 +10:00
Björn Endres 999345f4b5
Merge pull request #41 from MikeyMJCO/patch-1
MkDocs upgrade fix.
2020-04-14 12:46:04 +02:00
Mikey O'Toole d5062f8345
Update mkdocs.yml 2020-04-13 16:07:45 +01:00
Mikey O'Toole 9600bdd11c
MkDocs upgrade fix. 2020-04-13 12:21:41 +01:00
B. Endres e8fc1b1b0d bump back to 0.6-dev 2020-03-17 07:52:14 +01:00
Philipp Batroff c941a1248e Added logging to successful webhook handling 2019-11-27 17:11:00 +01:00
B. Endres 42c95f62c7 0.6-beta1 2019-11-26 16:20:14 +01:00
B. Endres 6478762b74 [#38] merged mosaico relative url fix (dev_38) 2019-11-26 16:09:41 +01:00
B. Endres 8aeaa3120b [#32] merged webhook2api (dev_32) 2019-11-26 16:08:11 +01:00
Philipp Batroff 20140a0d41 [#38] Fix relative file paths for view in browser 2019-11-25 17:48:32 +01:00
Björn Endres 5763a2b792
Merge pull request #36 from d1ss0nanz/master
simplify email regex; allow + in user part
2019-09-26 15:12:52 +02:00
Daniel Stutz 1bb61efd32 simplify email regex; allow + in user part 2019-09-25 17:39:26 +02:00
Björn Endres ccb0c41377
Merge pull request #28 from pbatroff/dev_27
Fix for #27: Correct link generation. Needs a bit more testing
2019-09-24 14:14:18 +02:00
Björn Endres d4853095ce
Merge branch 'master' into dev_27 2019-09-24 14:14:09 +02:00
Björn Endres 9b4c5f8f99
Merge pull request #34 from jaapjansma/issue_33
Issue #33 case insesntive entity and action specification
2019-09-03 07:28:44 +02:00
Jaap Jansma cad78b5496 Issue #33 case insesntive entity and action specification 2019-08-30 14:38:48 +02:00
Philipp Batroff 917af8650d Changed http return code to 200 if the command was parsed successfully, but a civiCRM error occured. In that case we shouldn't return an error code, because it's an internal error 2019-07-18 12:18:38 +02:00
Philipp Batroff f83fc0c77e udpate parsing of response codes from civicrm api 2019-07-18 11:34:18 +02:00
Philipp Batroff 1ffa67865d implementing webhook2api, amendment for json array parameter parsing. WiP - debuggin output for error_log 2019-07-17 14:15:52 +02:00
B. Endres f044515feb [#32] improved documentation 2019-01-04 17:41:45 +01:00
B. Endres 2207a95c2b [#32] implementing webhook2api 2019-01-04 17:28:52 +01:00
B. Endres d87d5a6c24 [#32] implementing webhook2api 2019-01-04 16:22:43 +01:00
B. Endres 3eae978200 Merge remote-tracking branch 'Michael/config-dist' 2019-01-04 10:45:44 +01:00
B. Endres aef6fbeaa2 bump master back to 0.6-dev 2019-01-04 10:06:15 +01:00
B. Endres bf53d03b3b [#31] added remark about clean URLs 2018-11-26 09:02:22 +01:00
B. Endres abb46397d3 [#30] added php-curl requirement 2018-11-26 07:24:38 +01:00
Philipp Batroff 47f6f1b4b8 Fix for #27: Correct link generation. Needs a bit more testing 2018-07-02 11:50:44 +02:00
SYSTOPIA 5894bce133
Merge pull request #24 from michaelmcandrew/docker
adding Dockerfile
2018-03-12 13:16:09 +01:00
Michael McAndrew 8f1aba57e7 Merge branch 'master' of https://github.com/systopia/CiviProxy into config-dist 2018-03-12 09:02:29 +00:00
Michael McAndrew 8116bdd128 Merge branch 'master' of https://github.com/systopia/CiviProxy into docker 2018-03-12 09:02:19 +00:00
Michael McAndrew 3f0a766241 adding Dockerfile 2018-03-09 17:27:26 +00:00
Michael McAndrew 1b1d5e8bd4 a hint on installation in the config.dist.php file 2018-03-09 17:25:16 +00:00
Michael McAndrew aaa5330591 distribute a config.dist.php file 2018-03-09 17:24:13 +00:00
systopia d846c1d9ff implemented #22 2018-03-01 11:12:11 +01:00
systopia 1e280e1f0e Merge remote-tracking branch 'origin/dev_20' 2018-03-01 11:09:58 +01:00
systopia a23f0cfb05 implementing #20 2018-03-01 11:08:44 +01:00
systopia e4a9927919 released 0.5 2018-03-01 10:18:49 +01:00
systopia 2346076e72 implementing #20 2018-03-01 10:15:59 +01:00
systopia 9f1caed052 implementing #20 2018-02-28 17:06:02 +01:00
systopia 9e9bae4015 0.5.beta1 2017-12-11 11:36:34 +01:00
systopia dd9affd1f9 disable mosaic by default 2017-11-17 15:59:52 +01:00
systopia 9e7cbdc00a fixed static mail 2017-11-17 15:43:40 +01:00
systopia ecbf179fbb make mosaico static mail work (#7) 2017-11-17 14:05:15 +01:00
systopia b6dcfbcb16 moved mosaico to separate script (#7) 2017-11-17 13:59:28 +01:00