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

9449 Commits

Author SHA1 Message Date
Enno Rehling af7e291923 submodule updates 2018-06-28 23:03:12 +02:00
Enno Rehling e8ef5be7f6 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-06-28 22:49:05 +02:00
Enno Rehling 5018308170 remove at_chaoscount, update storage module. 2018-06-28 22:48:57 +02:00
Enno Rehling 38cb6297bb Merge branch 'master' 2018-06-24 20:36:32 +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 2b0b7cd0f8 BUG 2447: PArtei fehlt im Kampfreport. 
replace strcpy with strcat
 2018-06-18 20:33:28 +02:00
Enno Rehling ecdf03138f Merge branch 'master' into develop 2018-06-11 21:38:55 +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 f7d4388232 BUG 2443: spaces for list of roads, again! 2018-06-10 10:59:04 +02:00
Enno Rehling 3c57917b79 BUG 2443: spaces for list of roads, again! 2018-06-10 10:58:39 +02:00
Enno Rehling cf76e0a03c BUG 2443, list of roads missing whitespace. 2018-06-10 10:58:39 +02:00
Enno Rehling 13090fd27c BUG 2446: trade prices not getting read from XML. 2018-06-10 10:58:39 +02:00
Enno Rehling 1c6f598fdd fix orders script running from install directory 2018-06-10 10:58:39 +02:00
Enno Rehling 5939b56b32 convert orders-process to use mutt 
update install process.
 2018-06-10 10:58:39 +02:00
Enno Rehling e168c667ad make orders-accept use mutt to send email, fix encoding 2018-06-10 10:58:39 +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 1a0208cd5d Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-06-09 21:53:43 +02:00
Enno Rehling 0a96be6908 Merge branch 'master' into develop 2018-06-09 21:53:02 +02:00
Enno Rehling d6d9bff6e3 Merge branch 'master' into develop 2018-06-09 21:52:37 +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 5b0f3f9ea7 more sbstring upgrades 2018-06-09 21:22: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 4b5bd11f29 spell_syntax without bsdstring, better tests. 2018-06-03 13:29:54 +02:00
Enno Rehling 6234ae7e76 readability: bool vs int 2018-06-03 12:27:40 +02:00
Enno Rehling f96c9c5bf9 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-06-03 11:04:20 +02:00
Enno Rehling 38038849ab Merge remote-tracking branch 'upstream/master' 2018-06-03 11:03:46 +02:00
Enno Rehling 9055d1aaaa Merge remote-tracking branch 'upstream/develop' into develop 2018-06-03 11:03:31 +02:00
Enno Rehling 3208164b13 update version 2018-06-03 11:01:08 +02:00
Enno Rehling b763639833 Merge branch 'develop' 2018-06-03 10:56:52 +02:00
Enno Rehling cb5d15fee3 eliminate bsdstring.h usage 2018-06-03 05:42:09 +02:00
Enno Rehling 6abf054b42 replace bsdstring functions in cycle_route. 2018-05-27 20:31:36 +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