Commit graph

4737 commits

Author SHA1 Message Date
Griatch
2127e2a6ef Resolve merge conflicts 2018-07-31 11:50:05 +02:00
Griatch
bdba1eacb1 Merge pull request #1639 from bookofportals/fix-docker-ps
Add procps dependency to Dockerfile
2018-07-31 11:47:25 +02:00
Griatch
9a7967f1ee Merge pull request #1640 from bookofportals/command-callable-check
Change callability check
2018-07-31 09:09:50 +02:00
Aris (Karim) Merchant
1feceea4e8 Change callability check
TypeErrors are thrown in a wide variety of situations, most of which
have nothing to do with calling an uncallable object. The appropriate
test is to use the built-in callable() function, which actually
tests if the object is callable.
2018-07-30 16:37:22 -07:00
Aris (Karim) Merchant
86badec4e4 Merge branch 'master' into fix-docker-ps 2018-07-28 16:47:49 -07:00
Griatch
3deb25773b Merge pull request #1638 from robotfactory/patch-1
Python dockerfile depends for telnet tls
2018-07-28 12:01:50 +02:00
Aris (Karim) Merchant
4eb765f155 Add procps dependency to Dockerfile
Certain evennia commands, such as the server command, rely upon
ps to run correctly. Unfortunately, alpine uses the BusyBox ps command,
which is somewhat idiosyncratic in its option handling. Adding
the procps dependency installs a more standard ps command, allowing
server maintenance commands to work correctly. This fixes #1635.

For further background, see gliderlabs/docker-alpine#173.
2018-07-23 17:16:40 -07:00
Griatch
c8dae28cdf Rework AMP data packet format and batch-handling. Resolves #1635 2018-07-23 21:09:06 +02:00
Johnathan
816c2b90b7 Python depends for telnet tls
Addresses feature request in issue #1637

Installs py2-openssl as well as cryptography, pyasn1, and service_identity
2018-07-23 07:12:47 -04:00
Griatch
20d1ab0f3d Fix display error when telnet disabled 2018-07-21 22:43:36 +02:00
Griatch
63cae2b187 Merge branch 'master' into develop 2018-07-21 14:14:43 +02:00
Griatch
27875ba04d Fix to redirect default at_first_login msg to right session 2018-07-21 14:13:58 +02:00
Griatch
14448219fe Merge pull request #1634 from jerryaldrichiii/add-space
Add space to the tutorial's CrumblingWall message
2018-07-09 17:41:56 +02:00
Jerry Aldrich
fe1aa30463 Add space to the tutorial's CrumblingWall message
Signed-off-by: Jerry Aldrich <jerryaldrichiii@gmail.com>
2018-07-09 08:33:47 -07:00
Griatch
f0ce2c8c0a Merge pull request #1631 from TehomCD/fix_annotate_typed_manager
Fix TypeclassManager filtering for annotate, values, values_list methods
2018-06-30 11:12:11 +02:00
Tehom
c729b6b916 Add on missing values and values_list methods while we're at it, for the same reasons. 2018-06-30 02:31:47 -04:00
Tehom
24bdf124f5 Add annotate method to TypedManager to filter by typeclass appropriately. 2018-06-28 08:23:52 -04:00
Griatch
02c70a4563 Merge pull request #1630 from TehomCD/mutelist_performance_fix
Move query/unpickling out of loop for mutelist.
2018-06-19 13:44:25 +02:00
Tehom
fb481c98fb Move query/unpickling out of loop for mutelist. 2018-06-19 04:12:46 -04:00
Griatch
5db3b2194f Merge branch 'master' into develop 2018-06-17 01:30:08 +02:00
Griatch
925529837e Backport inlinefunc regex update from develop olc branch. Resolves #1498. 2018-06-17 01:26:18 +02:00
Griatch
bb98e96e94 Merge branch 'master' into develop 2018-06-13 00:56:04 +02:00
Griatch
0b19902dcd Clarify channel log rotate setting is in bytes 2018-06-13 00:55:44 +02:00
Griatch
a31ac6b68f Patch out tickerhandler to avoid reactor testing issues 2018-06-12 23:50:50 +02:00
Griatch
5f238f2c34 Fix unit tests after merge 2018-06-12 20:28:48 +02:00
Griatch
41a1652fdc Fix unittests after merge 2018-06-12 20:20:20 +02:00
Griatch
e144672e74 Resolve merge conflicts 2018-06-12 20:13:22 +02:00
Griatch
e033e1713d Merge pull request #1626 from TehomCD/fix_saverlist_add
Fix __add__ in SaverList
2018-06-12 19:00:40 +02:00
Griatch
cf8a242c02 Merge pull request #1621 from TehomCD/fix_duplicate_scripts
Fix duplicate script calls
2018-06-12 18:59:51 +02:00
Griatch
5862351ad0 Merge pull request #1615 from TehomCD/fix_negative_numbers_in_commandtest
Fix regex in CommandTest breaking negative numbers
2018-06-12 18:57:44 +02:00
Tehom
315977c285 Fix __add__ in SaverList 2018-05-29 23:05:34 -04:00
BattleJenkins
a97383bc38 Finish splitting TB test classes + adding setUp/tearDown 2018-05-21 19:27:43 -07:00
BattleJenkins
17cedbfde7 More setUp/tearDown 2018-05-21 18:45:07 -07:00
BattleJenkins
1125dc92fc Start splitting unit tests, add setUp/tearDown 2018-05-21 18:27:04 -07:00
BattleJenkins
bf66bb7440 Proper formatting for comments and notes 2018-05-21 18:06:29 -07:00
Tehom
af558ede7c Handle scripts with negative intervals. 2018-05-10 19:40:58 -04:00
Tehom
f0bae25ca0 Fix paused tasks. 2018-05-10 19:30:58 -04:00
Tehom
b4283a642b Add special handling for scripts when flushed from cache to avoid duplicate ExtendedLoopingCalls. 2018-05-10 19:23:59 -04:00
Griatch
2f985c882b Fix lockhandler singleton implmentation with a dummyobj 2018-04-25 22:34:33 +02:00
Griatch
e31b9f0d27 Update CODING_STYLE.md 2018-04-25 21:53:28 +02:00
Tehom
80c6d401e5 Call parse_ansi on each returned message before passing to regex to handle individually colored characters. 2018-04-24 06:03:01 -04:00
Griatch
c9ecd3b997 Add check_lockstring as a function in locks/lockhandler.py 2018-04-22 22:28:43 +02:00
Rachel Blackman
bde11edaf0 Switch /contains to default, add /startswith switch instead. 2018-04-22 16:02:12 +02:00
Rachel Blackman
32ea0075e6 0.8 has switches defined in the command, need to make the change from the 0.7 changeset this originated from. 2018-04-22 16:02:12 +02:00
Rachel Blackman
04db9292ce Add /contains switch to find. 2018-04-22 16:02:12 +02:00
Griatch
a5136e41d7 Merge branch 'master' into develop 2018-04-22 15:04:59 +02:00
Griatch
9bbfc422ee Make EvTable respect col-widths while retaining total table width.
Resolves #1614.
2018-04-22 14:50:17 +02:00
Griatch
f57192f9f1 Fix error if sending string to list_node select callback 2018-04-22 13:39:47 +02:00
Tehom
cb0c2d11f2 Add yet more hyphens. 2018-04-22 07:37:14 -04:00
Tehom
459a26fd74 Add hyphens to some tests. Probably more to come 2018-04-22 07:25:01 -04:00