Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,432 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

9432 Commits

Author SHA1 Message Date
Enno Rehling 15ae3ba45f Merge branch 'master' of https://github.com/ennorehling/eressea.git 2018-07-12 20:24:29 +02:00
Enno Rehling 64eb545b4a Bug 2460: Startgeschenke 2018-07-12 20:24:23 +02:00
Enno Rehling e089a9e9c6 Merge remote-tracking branch 'upstream/master' 2018-07-07 10:57:28 +02:00
Enno Rehling 8af4b1fe29 pipe cron output to logfile, fix sendreport script 2018-07-07 10:45:11 +02:00
Enno Rehling 82b1e16a82 Merge branch 'master' of github.com:eressea/server 2018-06-24 18:39:46 +02:00
Enno Rehling 503b22aa9f
Merge pull request #788 from ennorehling/master 
bugfixes
 2018-06-24 18:38:42 +02:00
Enno Rehling 6d10ee8fa5 BUG 2453: Erstausstattung und Default-Befehle für neue Parteien. 2018-06-24 18:08:19 +02:00
Enno Rehling 34d0b56c68 BUG 2448: Default-Attacken respektieren! 2018-06-11 21:36:59 +02:00
Enno Rehling a62541a17e BUG 2443: Straßen ohne komplizierte String-Bastelei. 2018-06-11 21:00:33 +02:00
Enno Rehling c3d08d1536 redirect cron output to a logfile 2018-06-11 21:00:01 +02:00
Enno Rehling 1f5a31b817 Merge remote-tracking branch 'upstream/master' 2018-06-10 10:58:18 +02:00
Enno Rehling 1cfa28e4e9 Merge branch 'master' of github.com:eressea/server 2018-06-10 10:44:25 +02:00
Enno Rehling eb4a13cd76
Merge pull request #786 from ennorehling/master 
bugfixes turn 1080
 2018-06-10 10:44:15 +02:00
Enno Rehling 6d61b837cf BUG 2443, spaces again 2018-06-10 10:37:20 +02:00
Enno Rehling af898c29a3 BUG 2443: spaces for list of roads, again! 2018-06-10 10:36:34 +02:00
Enno Rehling 8bfa9a77c5 BUG 2443: spaces for list of roads, again! 2018-06-10 10:23:35 +02:00
Enno Rehling 9d693d08e4 BUG 2443, list of roads missing whitespace. 2018-06-10 10:16:34 +02:00
Enno Rehling ade7b2ef43 BUG 2446: trade prices not getting read from XML. 2018-06-10 09:58:26 +02:00
Enno Rehling 61d5bf9898 Merge branch 'master' of github.com:eressea/server 2018-06-09 21:43:13 +02:00
Enno Rehling 719bc37a60
Merge pull request #785 from ennorehling/master 
para_tactics messages were broken
 2018-06-09 21:42:53 +02:00
Enno Rehling 2d05a99e7d Renaming a message is more complicated now. I got it wrong with these. 2018-06-09 21:42:21 +02:00
Enno Rehling 15f2b92eca Merge remote-tracking branch 'upstream/master' 2018-06-09 21:33:02 +02:00
Enno Rehling 11b18b9b1d fix orders script running from install directory 2018-06-05 21:14:02 +02:00
Enno Rehling 6a6089b48c Merge branch 'muttmail' 2018-06-05 21:03:54 +02:00
Enno Rehling 2d73126310 convert orders-process to use mutt 
update install process.
 2018-06-03 21:26:35 +02:00
Enno Rehling e0bd113ea5 make orders-accept use mutt to send email, fix encoding 2018-06-03 21:26:32 +02:00
Enno Rehling 38038849ab Merge remote-tracking branch 'upstream/master' 2018-06-03 11:03:46 +02:00
Enno Rehling b763639833 Merge branch 'develop' 2018-06-03 10:56:52 +02:00
Enno Rehling 82f2aa0d52
Merge pull request #784 from ennorehling/develop 
fix str_escape read overflow
 2018-05-27 15:22:49 +02:00
Enno Rehling 034872c44e respect the input length when copying in str_escape_ex. 2018-05-27 15:15:31 +02:00
Enno Rehling 5af3ac1b40 reproduce buffer overflow in str_escape_ex 2018-05-27 15:11:03 +02:00
Enno Rehling ef7ee57893
Merge pull request #783 from ennorehling/develop 
bugfixes, string escaping
 2018-05-26 21:25:08 +02:00
Enno Rehling 95c5c86303 Bug 2444: set default scores 2018-05-24 16:40:50 +02:00
Enno Rehling b353de43de BUG 2443: missing spaces in NR. 2018-05-24 16:35:39 +02:00
Enno Rehling 9b3b376579 BUG 2443: Fehlende Leerzeile im Kampfreport. 2018-05-24 16:31:01 +02:00
Enno Rehling 49178d8fc7 unused variable 2018-05-21 16:38:32 +02:00
Enno Rehling e53a1caa08 cleanup unused conde 2018-05-21 16:24:08 +02:00
Enno Rehling 60a86e7b2f escaping a string for use in CR needs to only replace quotes and backslashes. 2018-05-21 13:27:02 +02:00
Enno Rehling f1d76808d1
Merge pull request #782 from ennorehling/develop 
crash fix
 2018-05-20 17:27:19 +02:00
Enno Rehling 226fa2ba08 fix crash in region messages. 2018-05-20 17:11:29 +02:00
Enno Rehling b3b19e7c83 suppress those null-reference bugs in another way, maybe? 2018-05-19 21:01:10 +02:00
Enno Rehling 9a481d7e15 small clibs change 2018-05-19 20:56:21 +02:00
Enno Rehling dfa0ff09d1 Suppress some false positive coverity results. 
It apparently does not understand CuTest code well?
Add a check for Lua eff_skill binding.
 2018-05-19 20:53:51 +02:00
Enno Rehling 76b163dc07 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-05-19 13:34:10 +02:00
Enno Rehling 4154b1c3d9 remove additional whitespace in some strings. 2018-05-19 13:34:00 +02:00
Enno Rehling bd5df1b476
Merge pull request #781 from ennorehling/develop 
the majestic expat replacement
 2018-05-18 22:05:41 +02:00
Enno Rehling 2ac8e31ddc Merge remote-tracking branch 'upstream/develop' into develop 2018-05-18 22:00:52 +02:00
Enno Rehling e5218781d6
Merge pull request #14 from ennorehling/exparse 
expat replaces libxml2
 2018-05-18 21:58:59 +02:00
Enno Rehling adfc4ad7ce add a header to po files, charset UTF-8 2018-05-18 21:54:46 +02:00
Enno Rehling 9250f28ac8
Merge pull request #780 from ennorehling/develop 
simplicate and add lightness
 2018-05-18 21:44:36 +02:00