Commit Graph

4831 Commits (e45d51242dc9db2bd0aee5c5c365057296d5f1b6)
 

Author SHA1 Message Date
Sofia 517c72c8e5 Merge branch 'master' into doxygen_doc
2 years ago
Sofia 3268aaace0 merge in master
2 years ago
Krista Bennett 417459a43b ENGINE-895: binary-labelled ascii attachments with lines longer than 998 characters will now be base64 encoded in spite of this. (But try to use the right mime-type please)
2 years ago
Krista Bennett dc09909b9e Config hash define fix, ENGINE-885 function for commit hash, and fix for semicolon in codegen from Release_2.1
2 years ago
darthmama 0249e69cfb Merge pull request 'ENGINE-894 adds commit_hash.h gen script. Rm gen code script and uses the aggregate used by macOS instead. a) To be consisgtant, b) to not fail on first build after clean checkout.' (#7) from buff/pEpEngine:master into master
2 years ago
Andreas Buff 2deb1a5049 ENGINE-894 adds commit_hash.h gen script. Rm gen code script and uses the aggregate used by macOS instead. a) To be consisgtant, b) to not fail on first build after clean checkout.
2 years ago
darthmama e457ab8562 Merge pull request 'Build: Fix MacOS linking (sequoia symbols not found)' (#4) from heck/pEpEngine:master into master
2 years ago
heck 3d026c270c Build: Fix MacOS linking (sequoia symbols not found)
2 years ago
Volker Birk 15362005bd add disable_all_sync_channels(), see ENGINE-890
2 years ago
Volker Birk 7b3e6642d9 if signing or encryption failes for one own identity, try the next one
2 years ago
darthmama 2387ae4ac2 Merge pull request 'simplify message_dup(): remove unneeded variables and if() branches.' (#3) from roker/pEpEngine:master into master
2 years ago
roker ba609fd664 simplify message_dup(): remove unneeded variables and if() branches.
2 years ago
Volker Birk 0afa7b78b6 fixing typo
2 years ago
Krista Bennett 2bd0ae2ddc ENGINE-866: comment update
2 years ago
Krista Bennett 38ed5b5f25 ENGINE-866 feature branch merge (squashed commit) of functionality to set the sticky bit for manually imported keys, to query for that bit in the trust database, and prevention of automatic reset of sticky keys by key reset when devices leave a device group.
2 years ago
Krista Bennett d1664cf505 ENGINE-866 DDL fix across current active master-descendants
2 years ago
Krista Bennett 9e9b3f9d72 ENGINE-884: replacement for ENGINE-883 git hooks; moves functionality into build system for Linux. (N.B.: ENGINE-886 will address this for Windows.
2 years ago
Devan Carpenter 8fc9172917
CI: unpack yml2 into INSTPREFIX
2 years ago
Krista Bennett c52f4d39fb Added sql separate from ENGINE-606/ENGINE-822 so that the DDLs don't diverge any further (merges are difficult without this being separated this way in master as well). This means that some of the groups sql logic is present here, but it won't get used until the branch code makes it in here. If you have problems merging a branch, let me know. Better now than later.
2 years ago
Krista Bennett 52df6b71f1 ENGINE-883: test if files are there to diminish annoying pings from git
2 years ago
Krista Bennett f726fd607c ENGINE-883: script updates from hooks directory, Makefile fix for those who haven't put hooks in. Needs to be tested on other systems and won't save non-hooks-using windows users from themselves.
2 years ago
Krista Bennett 10fd79d18e ENGINE-883: Added include. WARNING: COPY HOOK SCRIPTS TO HOOKS DIRECTORY
2 years ago
Krista Bennett 75ee90ffb6 ENGINE-883: syncing changes up with Release_2.1
2 years ago
Krista Bennett 0abde28775 ENGINE-883: better way to do this. None of them are without problems, but we'll do this non-tracked.
2 years ago
Krista Bennett d3a715330d Merge branch 'master' of https://gitea.pep.foundation/pEp.foundation/pEpEngine
2 years ago
roker dbc13f0cf5 Merge branch 'master' of https://gitea.pep.foundation/pEp.foundation/pEpEngine
2 years ago
Krista Bennett a6fb33c8c0 ENGINE-883: files for commit hash work. Still need to set up the how-to and ensure we go back and forth to older commits without choking.
2 years ago
Krista Bennett 7abcfd2e8a Testing for 883 - may roll back
2 years ago
Devan Carpenter e67f0ce68d
CI: don't use insecure docker registries anymore
2 years ago
Volker Birk 6a6cd7a23e fixing a typo
2 years ago
Sofia Balicka ce528b3c46 more comments
2 years ago
darthmama 97ebfe6b2e Merge pull request 'Simple CI-CD Jobs' (#1) from dvn/pEpEngine:CI-CD into master
2 years ago
Devan Carpenter d54e9549c5
CI: add basic gitlab-ci jobs
2 years ago
Volker Birk 4ec29a5141 make protocol families extensible
2 years ago
Volker Birk de9ac34993 install depends on build
2 years ago
Volker Birk e0f92dac26 only install pEpMIME if configured
2 years ago
Volker Birk 13bcfcdaf5 do not replace subject if message format 1.x and unencrypted subject is enabled
2 years ago
Volker Birk 07bef414c4 FIX ENGINE-814: skip identities without key
2 years ago
Krista Bennett 457fa437b5 More protection against bad parsing. Can't reproduce the actual bug.
2 years ago
Krista Bennett 0ddef895f7 Merge branch 'ENGINE-864'. This merges in some generic Makefile refactoring as well as the changes so that pEpMIME can be built in to the engine (this requires a separately checked-out pEpMIME repo, setting PEP_MIME to 1 in the local.conf file, and ensuring PEP_MIME_SRC is set properly. System also needs boost to do built-in parsing, but if you don't touch the PEP_MIME variable, we still default to etpan. Please contact krista with a copy of your local.conf and the compiler error if you can't get it working. (Does not apply to non-MacOS/*nix-flavoured OSs for the time being...)
2 years ago
Krista Bennett f88f7d0351 ENGINE-864: Makefile tweaks. Will have to come into default, but since we're doing this anyway...
2 years ago
Krista Bennett 1cfc799b84 ENGINE-864: Tiny refactor. Ugh.
2 years ago
Krista Bennett 4cc0e3a5af ENGINE-864: Cleanup, plus fixed some semantics regarding CFLAGS/CXXFLAGS/CPPFLAGS that had been built in to the build system.
2 years ago
Krista Bennett 08910435a3 ENGINE-864: some cleanup
2 years ago
Krista Bennett 2bb4797be2 ENGINE-864: tests build and run (and fail appropriately) on debian
2 years ago
Krista Bennett 73136bff28 ENGINE-864: compiles on debian now
2 years ago
Sofia Balicka dfdee25ff4 more doxygen comments
2 years ago
Sofia Balicka 25bc031f61 Merge branch 'master' into doxygen_doc
2 years ago
Krista Bennett 8c4ef665a7 ENGINE-864: Shut off PEP_MIME default (use PEP_MIME=1 in local.conf to activate for testing fun) - only tested on MacOS so far. Next stop: debian.
2 years ago
Krista Bennett 9130f81042 ENGINE-864: pEpMIME Makefile madness
2 years ago