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

6951 Commits

Author SHA1 Message Date
Enno Rehling 32d43820c2 Merge remote-tracking branch 'upstream/develop' into develop 2016-02-06 23:23:26 +01:00
Enno Rehling 80eb22b1e4 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2016-02-06 23:19:49 +01:00
Enno Rehling 8279c3b348 release version 3.8.2 2016-02-06 15:28:54 +01:00
Enno Rehling b89e424253 submodules. more like suckmodules, amirite? 2016-02-06 15:28:15 +01:00
Enno Rehling 9d1020b73b Merge branch 'ennorehling-feature/apache-md5' 2016-02-06 15:24:04 +01:00
Enno Rehling 26a33e28ce Merge branch 'feature/apache-md5' of https://github.com/ennorehling/eressea into ennorehling-feature/apache-md5 
Conflicts:
	src/util/password.c
	src/util/password.h
	src/util/password.test.c
 2016-02-06 15:23:42 +01:00
Enno Rehling 4f0e8d29bf latest module 2016-02-06 15:17:16 +01:00
Enno Rehling bee97c002c use apache implementation by default 2016-02-06 15:16:15 +01:00
Enno Rehling c21cde25f5 fix build (bad type) 
Conflicts:
	crypto
 2016-02-06 15:15:58 +01:00
Enno Rehling d2d50cb23f fix build, add test for new algorithm 
Conflicts:
	src/util/password.test.c
 2016-02-06 15:15:04 +01:00
Enno Rehling 4c46d9d0ef add the apache md5 implementation to valid password hash algorithms 
Conflicts:
	src/util/password.c
	src/util/password.h
 2016-02-06 15:14:23 +01:00
Enno Rehling 7b4b879cc1 quick addition to a_removeall 
additional testing for attributes
 2016-02-06 10:56:08 +01:00
Enno Rehling 49b5a27bc8 Merge pull request #471 from ennorehling/develop 
fopen is misunderstood (by me)
 2016-02-05 23:19:39 +01:00
Enno Rehling 8a3bb35987 eliminate global log_flags, revert the mode arguments for fopen. 
turns out that text is default, and windows hates it if I open a binary file without 'b'
standardize on using join_path to create filenames
(use backslash on windows, even though fopen doesn't seem to care).
 2016-02-05 23:10:05 +01:00
Enno Rehling e39af68dde remove unused file 2016-02-01 21:37:02 +01:00
Enno Rehling 5e148a9599 Merge remote-tracking branch 'upstream/develop' into develop 2016-02-01 18:35:09 +01:00
Enno Rehling 1b0561c07e start development on release 3.9 2016-02-01 18:24:27 +01:00
Enno Rehling 31f989d6c6 Merge branch 'develop' of github.com:eressea/server into develop 2016-02-01 18:20:23 +01:00
Enno Rehling 6c90ff97cb release version 3.8.1 2016-02-01 18:16:25 +01:00
Enno Rehling d0f8723ffb refactoring: eliminate a_findc, and too much const-fuckery 2016-02-01 17:31:03 +01:00
Enno Rehling 4804b2c30a Merge pull request #470 from ennorehling/feature/issue-468-jsonconf-errorrs 
fix reading building maintenance
 2016-02-01 14:15:01 +01:00
Enno Rehling ea8246f762 Merge pull request #469 from ennorehling/develop 
file operations cleanup
 2016-02-01 14:09:07 +01:00
Enno Rehling 23e57c6bff fix missing translation error messages during tests. 2016-02-01 14:06:56 +01:00
Enno Rehling b3db14465e fix logic error in json_buildings 2016-02-01 13:59:35 +01:00
Enno Rehling 85010e5358 seems like there is a problem opening files with the optional 'b' mode, so remove it everywhere? 2016-02-01 12:29:41 +01:00
Enno Rehling 2f2bbb16ab remove wild mkdir calls all over the code, catch EEXIST errors 
use join_path more consistently
fix a test that's intermittent on windows because fopen(..., "wb") fails, why?
 2016-02-01 09:26:24 +01:00
Enno Rehling 665a271972 Merge pull request #467 from ennorehling/develop 
prevent negative parents: manual merge, code cleanup
 2016-01-31 22:26:11 +01:00
Enno Rehling ba39fc9284 I'm really bad at reading. Fixed! 2016-01-31 22:17:55 +01:00
Enno Rehling ca81dadedb missed a spot! 2016-01-31 22:12:08 +01:00
Enno Rehling 7ebfdb0747 manually smooth out a merge of two commits trying to do the same thing. 
prevent negative parents
https://bugs.eressea.de/view.php?id=2183
 2016-01-31 22:10:37 +01:00
Enno Rehling 4683e122fc Merge branch 'ennorehling-feature/issue-462-log-test-errors' into develop 2016-01-31 21:58:24 +01:00
Enno Rehling 09ae3d8993 Merge branch 'feature/issue-462-log-test-errors' of https://github.com/ennorehling/eressea into ennorehling-feature/issue-462-log-test-errors 
Conflicts:
	src/magic.test.c
 2016-01-31 21:58:16 +01:00
Enno Rehling caac2e65b0 remove unused includes 2016-01-31 21:41:25 +01:00
Enno Rehling b0bb566f47 clang is picky about the correct name of stdarg.h 2016-01-31 21:40:19 +01:00
Enno Rehling 217fbca656 missing include broke the gcc build 2016-01-31 21:39:28 +01:00
Enno Rehling 3e57b19d62 stop duplicate parsing of arguments 2016-01-31 21:36:01 +01:00
Enno Rehling 8f4e6475c7 complete redesign of the log library (almost finished?) 2016-01-31 19:54:49 +01:00
Enno Rehling cebea47720 Merge pull request #465 from eressea/feature/issue-464-stonecircles 
fix crash when aging stone circles without an astral plane
 2016-01-31 14:20:16 +01:00
Enno Rehling 1ec20aed16 fix crash when aging stone circles without an astral plane 2016-01-31 13:47:18 +01:00
Enno Rehling 9376aa5c46 Merge branch 'develop' of github.com:eressea/server into develop 2016-01-30 23:09:38 +01:00
Enno Rehling c08235693d Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
	src/kernel/item.c
	src/kernel/region.c
	src/laws.c
 2016-01-30 23:09:02 +01:00
Enno Rehling c557778731 fix https://bugs.eressea.de/view.php?id=2183 2016-01-30 23:04:41 +01:00
Enno Rehling f3ab4d5ca6 release version 3.7.10 2016-01-30 22:57:51 +01:00
Enno Rehling abac9a0f7e Merge pull request #463 from ennorehling/develop 
addparam_region and the "normal" plane.
 2016-01-29 20:14:22 +01:00
Enno Rehling a94a238af0 addparam_region fix: all regions in spell parameters should be in the "normal" plane. 2016-01-29 20:04:05 +01:00
Enno Rehling 73f16d5bb6 adding a join_path function to try and narrow down misbehavior. 2016-01-29 19:11:48 +01:00
Enno Rehling 9bf1059d8a trying to make tests not throw out so many ERROR log mesages, commenting on some of them. 2016-01-29 17:49:27 +01:00
Enno Rehling fda20b2fb4 Merge pull request #461 from ennorehling/feature/bug-2173-easy-braineaters 
easy braineaters
 2016-01-28 22:55:33 +01:00
Enno Rehling 729c4ceea1 increase error-logging from unit tests. 
suppress some unrelated errors.
 2016-01-28 16:00:36 +01:00
Enno Rehling 69d2c7c9b3 get_normalplane is unnecessary 2016-01-28 12:46:38 +01:00