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

8819 Commits

Author SHA1 Message Date
Enno Rehling c3992c6a6e
Merge pull request #737 from ennorehling/master 
pre-release 3.14 merge
 2017-10-28 20:00:09 +02:00
Enno Rehling 551f349309 begin work on 3.15 release 2017-10-28 19:46:17 +02:00
Enno Rehling 5373d7755e Merge branch 'develop' 2017-10-28 19:38:36 +02:00
Enno Rehling 79aecf21b5 Merge branch 'develop' 2017-10-18 19:40:00 +02:00
Enno Rehling 10eb4f9ac9 Merge pull request #736 from ennorehling/develop 
BUG 2374 ATTACKIERE auf Seeschlangen
 2017-10-16 20:53:57 +02:00
Enno Rehling b337373bc9 shorten some names, too many messages with the same prefix are inefficient. 2017-10-16 20:38:52 +02:00
Enno Rehling e2c7b2c711 merge with master, which was far behind 2017-10-15 20:32:19 +02:00
Enno Rehling a0a39124f0 additional tests for cansee, to support fixing bug 2374 2017-10-15 20:20:43 +02:00
Enno Rehling 018f217e4d Merge remote-tracking branch 'upstream/master' 2017-10-15 20:08:19 +02:00
Enno Rehling 4257a9891c another test. moving some deckchairs around. 2017-10-14 09:01:14 +02:00
Enno Rehling 6d79f85628 orderdb backend choices and first tests. 2017-10-14 08:43:01 +02:00
Enno Rehling e1afdd95bf Merge branch 'order_id' of https://github.com/ennorehling/eressea.git 2017-10-14 08:28:32 +02:00
Enno Rehling 5a40ff9e62 merge conflict fix 2017-10-13 19:35:12 +02:00
Enno Rehling 78360b1466 refactoring: move order_data to orderdb module. 2017-10-13 19:34:39 +02:00
Enno Rehling 8a5164806b try fixing coverity complaints 2017-10-13 19:33:29 +02:00
Enno Rehling 333ef06fef hackish optimization for STUDY orders 2017-10-13 19:33:29 +02:00
Enno Rehling 394839f7a4 WIP: optimized study orders, failing 15 study tests 2017-10-13 19:33:28 +02:00
Enno Rehling 1033143411 fix gcc build 2017-10-13 19:33:28 +02:00
Enno Rehling 42f7be4bb9 do not use a list to store several million entries. 2017-10-13 19:33:28 +02:00
Enno Rehling 34cd692c2d remove the locale from orders. 2017-10-13 19:33:28 +02:00
Enno Rehling 2b54605080 remove order de-duplication for short and study orders. 2017-10-13 19:33:27 +02:00
Enno Rehling db0bd8d4db refactor: split order_data from order, force use of ids (to be replaced with db backend). 2017-10-13 19:33:27 +02:00
Enno Rehling 9ff98b5b23 more fine-grained testing for cansee 2017-10-13 19:32:31 +02:00
Enno Rehling d8ac84c0a4 Merge pull request #735 from ennorehling/develop 
fix more stuff
 2017-10-13 19:15:05 +02:00
Enno Rehling ca6cbe5906 fixing commit 1b53128e1a and adding a test for cansee. 2017-10-13 19:07:57 +02:00
Enno Rehling 8246639e57 test cansee for perception & stealth 2017-10-13 18:41:29 +02:00
Enno Rehling 92f7d0d8a8 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-10-13 18:30:28 +02:00
Enno Rehling a82034b8a7 BUG 2372 canride breakage 2017-10-13 18:30:22 +02:00
Enno Rehling 3734994244 merge conflicts 2017-10-12 18:12:55 +02:00
Enno Rehling cbaf4bfd04 refactoring: move order_data to orderdb module. 2017-10-12 18:11:21 +02:00
Enno Rehling c5b9c8ab06 magic definitions for unix file command 2017-10-11 23:05:35 +02:00
Enno Rehling ed23853c4d add valgrind option to runtests, use in travis builds 2017-10-10 21:30:53 +02:00
Enno Rehling 9527460ca4 github issue 734: clear equipments after test. 2017-10-10 20:59:51 +02:00
Enno Rehling 1b53128e1a BUG 2366: Fix cansee for seen_spell regions. 2017-10-10 20:24:20 +02:00
Enno Rehling 9d48bfc36c BUG 2366: add a test to verify that view_reality sets an observer. 2017-10-10 18:45:44 +02:00
Enno Rehling 0a0806a181 try fixing coverity complaints 2017-10-10 09:29:32 +02:00
Enno Rehling fc80f2bd8c hackish optimization for STUDY orders 2017-10-09 20:33:47 +02:00
Enno Rehling f62c0866e3 WIP: optimized study orders, failing 15 study tests 2017-10-09 18:25:57 +02:00
Enno Rehling 905873e48b fix gcc build 2017-10-08 18:49:14 +02:00
Enno Rehling 710fcd0a08 do not use a list to store several million entries. 2017-10-08 18:41:59 +02:00
Enno Rehling 28d75f7cfc remove the locale from orders. 2017-10-08 17:09:32 +02:00
Enno Rehling 97ff152f17 remove order de-duplication for short and study orders. 2017-10-08 15:34:40 +02:00
Enno Rehling 828ca5f5f6 refactor: split order_data from order, force use of ids (to be replaced with db backend). 2017-10-08 12:39:41 +02:00
Enno Rehling 0ffb4e3ca9 small fix to orders.queue locking 2017-10-08 11:26:36 +02:00
Enno Rehling dc2663571c move orders.queue file (clever use of lockfile program) 2017-10-08 11:26:36 +02:00
Enno Rehling 197fd48508 send bz2 report with new mail text location 2017-10-08 11:26:36 +02:00
Enno Rehling a175c84232 create_mage sollte ein existierendes at_mage nicht überschreiben, nur evtl. aktualisieren. 2017-10-08 09:10:41 +02:00
Enno Rehling 06067655a3 Merge pull request #733 from ennorehling/develop 
BUG 2369 workaround: do not assert at_mage.
 2017-10-07 21:05:52 +02:00
Enno Rehling 9d1e1a2e32 BUG 2369 workaround: do not assert at_mage. 2017-10-07 20:44:50 +02:00
Enno Rehling 734c355ec3 Merge pull request #732 from ennorehling/develop 
refactor readorders
 2017-10-07 20:28:01 +02:00