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

10080 Commits

Author SHA1 Message Date
Enno Rehling ef90806ca0 hold lockfile only during python script 2019-05-08 21:08:14 +02:00
Enno Rehling 4efe63d3e2
Merge pull request #852 from ennorehling/master 
WIP: implement correct orders.db handling
 2019-05-08 18:43:30 +02:00
Enno Rehling 85a7066ecc move php calls from python to shell script 2019-05-08 18:23:19 +02:00
Enno Rehling 32da0028c1 write to database after the file is created and dated 2019-05-07 21:45:10 +02:00
Enno Rehling 305098c32c do not pollute global namespace with import statements 2019-05-07 20:10:20 +02:00
Enno Rehling 618247e4bf Merge branch 'master' of github.com:ennorehling/eressea 2019-05-07 19:36:50 +02:00
Enno Rehling 0701f895f4 Merge remote-tracking branch 'upstream/master' 2019-05-07 19:35:20 +02:00
Enno Rehling eaddeaa783
Merge pull request #850 from ennorehling/master 
orders-php integration
 2019-05-04 19:01:36 +02:00
Enno Rehling f5e9bc9696 Merge branch 'orders-db' 2019-05-04 18:54:05 +02:00
Enno Rehling 11b628d092 use the orders databse script if it exists 2019-05-04 17:37:11 +02:00
Enno Rehling b20e6972a5 write accepted orders to database 2019-05-04 16:21:03 +02:00
Enno Rehling dbbfc3317e Merge remote-tracking branch 'upstream/master' 2019-05-04 16:20:40 +02:00
Enno Rehling 6b93acec08
Merge pull request #848 from ennorehling/master 
2577: Fix resource values, again.
 2019-04-30 19:00:34 +02:00
Enno Rehling ab58dd6e3a Merge branch 'master' of github.com:ennorehling/eressea 2019-04-30 19:00:33 +02:00
Enno Rehling 505ad39ddf coverity cert hack 2019-04-30 19:00:11 +02:00
Enno Rehling 5cde26e25e preview gets games as arguments, game 4 is over 2019-04-30 19:00:11 +02:00
Enno Rehling 8c0fc4bd91 2577: Fix resource values, again. 2019-04-30 18:56:37 +02:00
Enno Rehling 0e1b61e00e
Merge pull request #847 from ennorehling/master 
bugfix muschelplateau
 2019-04-28 23:14:37 +02:00
Enno Rehling 46f1d36c17 Merge branch 'master' of github.com:ennorehling/eressea 2019-04-28 18:31:13 +02:00
Enno Rehling f89c414bcd Bug 2580: Muschelplateau 2019-04-28 18:30:54 +02:00
Enno Rehling 90cd77c586 preview gets games as arguments, game 4 is over 2019-04-26 18:56:38 +02:00
Enno Rehling d67c1d9899 Merge remote-tracking branch 'upstream/master' 2019-04-26 06:13:40 +02:00
Enno Rehling 97afaa29c3 increase maximum number of submissions per week from 20 to 30. 2019-04-26 06:10:17 +02:00
Enno Rehling 6fcfca27ca Revert "stop using the turn column from gamedb" 
This reverts commit adb626df3d.
 2019-04-20 08:15:27 +02:00
Enno Rehling adb626df3d stop using the turn column from gamedb 2019-04-19 20:14:43 +02:00
Enno Rehling 94f54dc105 Merge branch 'master' of github.com:ennorehling/eressea 2019-04-07 16:07:10 +02:00
Enno Rehling 2c03c67075 fix cmake syntax. 2019-04-07 15:29:16 +02:00
Enno Rehling de5181f3fe I am moving my library dependency folder to c:\libraries 
build.bat needed to know that.
 2019-04-07 15:29:12 +02:00
Enno Rehling c92f7505e5 Bug 2576: additional logging. 
increase log verbosity, decrease some log levels.
 2019-04-07 15:28:47 +02:00
Enno Rehling f7b4ff3c4c
Merge pull request #843 from ennorehling/master 
Bug 2569: Rostregen macht zu viele Waffen kaputt.
 2019-03-31 21:30:01 +02:00
Enno Rehling 29a9d8d30b Merge remote-tracking branch 'upstream/master' 2019-03-31 21:18:35 +02:00
Enno Rehling 17484e220f Bug 2569: Rostregen macht zu viele Waffen kaputt. 2019-03-31 21:03:31 +02:00
Enno Rehling 8868855837 allow setting password to null 2019-03-31 18:14:37 +02:00
Enno Rehling 2ec6021278
Merge pull request #842 from ennorehling/master 
FIX_STARTLEVEL_VERSION
 2019-03-24 21:37:11 +01:00
Enno Rehling 8f5eff063e Merge branch 'master' of github.com:ennorehling/eressea 2019-03-24 21:27:57 +01:00
Enno Rehling fc6bb36ee4 BUG 2566 mountains with no low-level resources. 
NB: new data version
 2019-03-24 21:27:43 +01:00
Enno Rehling a5755a4976
Merge pull request #841 from ennorehling/master 
important bugfix for bad data
 2019-03-24 18:20:58 +01:00
Enno Rehling 9168a25bf2 test debugging 2019-03-24 18:13:42 +01:00
Enno Rehling a75b46d6d4 Merge branch 'master' of github.com:ennorehling/eressea 2019-03-24 17:53:41 +01:00
Enno Rehling 63b762a627 missing nul-termination triggers valgrind. 2019-03-24 17:51:41 +01:00
Enno Rehling f1c27f09e3 dragon evolution gives full hitpoints. 2019-03-24 17:24:16 +01:00
Enno Rehling ea1bf3d3b9 Bug 2567: we had alliances with status 0 in the data. 2019-03-24 17:18:25 +01:00
Enno Rehling dd927aebb6 Merge branch 'master' of github.com:ennorehling/eressea 2019-03-24 17:17:08 +01:00
Enno Rehling 9b3bb7d643 Merge remote-tracking branch 'upstream/master' 2019-03-18 10:37:39 +01:00
Enno Rehling 3fb9b0db13 fix the new password test 2019-03-03 13:31:02 +01:00
Enno Rehling 5eb4115054 new players should have lastorders = 0, get password. 2019-03-03 13:30:53 +01:00
Enno Rehling 5a5a6de69d Merge remote-tracking branch 'upstream/master' 2019-03-03 09:53:40 +01:00
Enno Rehling 9210f77a1a fix bcrypt use 2019-03-03 09:44:44 +01:00
Enno Rehling f5a03d4501 stop writing password to logfile 2019-03-03 09:42:42 +01:00
Enno Rehling e24ebd7cbd do not fail on malformed passwords 2019-03-03 09:42:42 +01:00