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

6927 Commits

Author SHA1 Message Date
Enno Rehling f4642ce82b Merge pull request #476 from ennorehling/master 
script installation
 2016-02-10 23:21:38 +01:00
Enno Rehling 84a6e7a498 include process directory in install process, clean up install script 2016-02-10 23:06:41 +01:00
Enno Rehling 844bbde0aa Merge pull request #475 from ennorehling/master 
generate htpasswd files, understand apr1 hashes in confirmation script
 2016-02-10 14:23:13 +01:00
Enno Rehling 88f3a46142 generate htpasswd files, understand apr1 hashes in confirmation script 2016-02-10 14:12:38 +01:00
Enno Rehling d361622008 password module 2016-02-10 13:42:53 +01:00
Enno Rehling 3fd7a3c486 Merge branch 'develop' of github.com:eressea/server into develop 2016-02-10 13:41:09 +01:00
Enno Rehling bb44126652 password checking module 2016-02-10 13:40:57 +01:00
Enno Rehling 337aaa18e4 Merge pull request #473 from ennorehling/develop 
attribute storage: reduce datafile size by 5%
 2016-02-10 11:28:49 +01:00
Enno Rehling 01e864273a crash with an assert if Lua code has syntax errors. 
this addresses issue #474
also, correct capitalization of Lua.
 2016-02-09 21:34:24 +01:00
Enno Rehling 91ca77bc48 passwd is no longer written 2016-02-09 18:34:36 +01:00
Enno Rehling 3ee023cdd6 it was all a lua syntax error. good grief. that should go to stderr! 2016-02-09 18:30:42 +01:00
Enno Rehling 50f22d7c2f debug output 2016-02-09 18:20:01 +01:00
Enno Rehling ca6448ec23 re-enable failing valgrind check with more flags 2016-02-09 17:18:09 +01:00
Enno Rehling 652136ee46 unused variable, kill 2016-02-09 16:32:01 +01:00
Enno Rehling 5f2dc192db disable test because valgrind is complaining 2016-02-09 16:11:32 +01:00
Enno Rehling 87aa7c887e fix build 2016-02-09 14:08:36 +01:00
Enno Rehling 997d81e34a memcpy is in string.h 2016-02-09 13:56:57 +01:00
Enno Rehling b6e2fc28df remove unused functions 2016-02-09 13:56:15 +01:00
Enno Rehling 188aa84011 create htpasswd files after the turn. do not overwrite old password file (E2!) 2016-02-09 08:42:24 +01:00
Enno Rehling 1201a6b739 unused variable, bad version check 2016-02-09 07:06:07 +01:00
Enno Rehling 5e631fd145 replace at_key with at_keys, some bugs found by tests. 2016-02-09 07:03:11 +01:00
Enno Rehling dbcae5484e update test to check more than one key and cleanup. 2016-02-09 06:45:46 +01:00
Enno Rehling 0189111876 update key attribute api 
prepare to replace at_key. do not return the internals. add basic test.
 2016-02-09 06:43:19 +01:00
Enno Rehling abc3caa6d1 optimized storage of attribs. 
save the hash instead of the name and save a few bytes.
 2016-02-09 00:28:23 +01:00
Enno Rehling f630278339 Merge remote-tracking branch 'upstream/develop' into develop 2016-02-06 23:27:13 +01:00
Enno Rehling 7cd81df23e wrong crypto module, again 2016-02-06 23:25:32 +01:00
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