Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
10154 commits 10 branches 0 tags 41 MiB
Commit graph

10154 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
a4b4ba3859 Merge branch 'master' into develop 2019-03-01 19:15:05 +01:00
Enno Rehling
0beec878c6 fix bcrypt use 2019-03-01 19:14:09 +01:00
Enno Rehling
89925bcd57 Merge branch 'master' into develop 2019-03-01 11:02:40 +01:00
Enno Rehling
d5c1cb6762 stop writing password to logfile 2019-03-01 11:01:28 +01:00
Enno Rehling
acb1de2eef do not fail on malformed passwords 2019-02-28 10:33:28 +01:00
Enno Rehling
361a7efe18 do not fail on malformed passwords 2019-02-28 10:32:08 +01:00
Enno Rehling
6ab7feb14c
Merge pull request #837 from eressea/develop 
Version 13.9
 2019-02-25 17:21:55 +01:00
Enno Rehling
f052c0542b fix reports backup, I hope 2019-02-17 11:56:11 +01:00
Enno Rehling
9258613ae9
Merge pull request #836 from ennorehling/develop 
changes to upstream
 2019-02-16 20:47:44 +01:00
Enno Rehling
d56eee9687 BUG 2504: skeletons can learn. 
There was a mixup between the AI feature and the race capability, so I cleared up the code a little bit.
It's annoying that these flags are in the same int.
 2019-02-16 20:14:34 +01:00
Enno Rehling
f744cebe66 fix coverity errors 2019-02-15 10:07:55 +01:00
Enno Rehling
57c2772baf include expat in dependencies 2019-02-10 19:21:25 +01:00
Enno Rehling
119e9dbecc remove queue after we are done with it 2019-02-10 10:07:08 +01:00
Enno Rehling
a87e9b6c5c simplify the orders.queue locking logic, remove it from python 2019-02-10 09:51:06 +01:00
Enno Rehling
717fe4a803 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2019-02-09 20:50:56 +01:00
Enno Rehling
7490a827d9 Mantis 2552: rewrite goblin stealing to be more readable. 2019-02-09 20:50:47 +01:00
Enno Rehling
a84a89dc51 asciification 2019-02-09 13:39:28 +01:00
Enno Rehling
5868316537 asciification 2019-02-09 12:50:12 +01:00
Enno Rehling
642d043e7c asciify more files 2019-02-09 11:49:09 +01:00
Enno Rehling
35c6f30511 umlaut substitutions 2019-02-08 11:37:32 +01:00
Enno Rehling
2ecc710122 kaputte umlaute ersetzt, ascii 4 lyfe 2019-02-07 14:48:51 +01:00
Enno Rehling
793a666969 remove UTF-8 BOM from sources 2019-02-06 22:29:09 +01:00
Enno Rehling
1ea064d1f5
Merge pull request #835 from ennorehling/develop 
ongoing changes
 2019-02-03 04:23:31 +01:00
Enno Rehling
e2607a3e7c fix merge error 2019-02-03 04:17:11 +01:00
Enno Rehling
818b309ebf eliminate warnings from cppcheck 2019-02-02 21:20:23 +01:00
Enno Rehling
4bb2b5529d Merge remote-tracking branch 'upstream/master' 2019-02-02 21:19:56 +01:00
Enno Rehling
88dd9203dd Merge remote-tracking branch 'upstream/develop' into develop 2019-02-02 21:18:59 +01:00
Enno Rehling
0043690650 Merge branch 'master' into develop 2019-02-02 21:17:23 +01:00
Enno Rehling
4edff66e61
Merge pull request #834 from ennorehling/master 
hot stuff
 2019-02-02 21:13:05 +01:00
Enno Rehling
97a78ad6b0 Merge branch 'master' of https://github.com/ennorehling/eressea 2019-02-02 20:38:11 +01:00
Enno Rehling
af91459fb1 add some variety to familiar selection. 
effskill: use NULL, not 0 for pointer arguments.
 2019-02-02 20:38:02 +01:00
Enno Rehling
20e0e8400b eliminate MAX/MIN macros completely 2019-01-24 17:51:26 +01:00
Enno Rehling
9b113c050e eliminate MIN and MAX macros 2019-01-24 16:34:07 +01:00
Enno Rehling
5a01ea14b6 reserve memory for backtrace before it runs out 2019-01-24 16:18:58 +01:00
Enno Rehling
5b167077a9 review some flawfinder warnings 2019-01-24 14:26:11 +01:00
Enno Rehling
a4873d7a12 re-undo splint warning fizes 2019-01-24 14:26:11 +01:00
Enno Rehling
2defef021f fix some weak splint warnings 2019-01-24 14:26:11 +01:00
Enno Rehling
ef8139067e
Remove missing package 
Ok
 2019-01-22 16:48:22 +01:00
Enno Rehling
dba46ac480 add scan-build to travis build 2019-01-22 16:17:16 +01:00
Enno Rehling
fbdd3c2fee Merge branch 'master' into develop 2019-01-21 11:10:12 +01:00
Enno Rehling
49e186b742
Merge pull request #833 from ennorehling/master 
Simple Bugfix
 2019-01-21 11:07:25 +01:00
Enno Rehling
148146d94e BUG 2540: Vertraute ohne Auraim CR repariert 2019-01-21 11:00:31 +01:00
Enno Rehling
172387e6bc BUG 2549 promote after recruit 
calculating max units before PROMOTE requires that all recruitment has finished.
 2019-01-20 16:51:04 +01:00
Enno Rehling
f56bbd64c1
Merge pull request #832 from ennorehling/develop 
ongoing development
 2019-01-20 03:12:29 +01:00
Enno Rehling
55c8b9f72a fix shellcheck 2019-01-20 03:09:35 +01:00
Enno Rehling
8eba9d6eaf fix getfaction script, return email 2019-01-20 03:06:33 +01:00
Enno Rehling
dda0fd9d27 fix sendreport script 2019-01-20 02:48:14 +01:00
Enno Rehling
5943047745 MSVC debugger gets confused when two structs have the same name 2019-01-18 22:26:55 +01:00
Enno Rehling
291f2d7113 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2019-01-13 19:19:06 +01:00
Enno Rehling
5648830b4d Vereinfachte Statistik für Durchreiseregionen anzeigen. 2019-01-13 19:17:31 +01:00