Commit graph

4737 commits

Author SHA1 Message Date
Griatch
fc6e97abb4 Resolve merge conflicts 2018-07-31 11:50:05 +02:00
Griatch
2cf26e9d09
Merge pull request #1639 from bookofportals/fix-docker-ps
Add procps dependency to Dockerfile
2018-07-31 11:47:25 +02:00
Griatch
075288cf67
Merge pull request #1640 from bookofportals/command-callable-check
Change callability check
2018-07-31 09:09:50 +02:00
Aris (Karim) Merchant
7f9a2930ad 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
7e6fa58260
Merge branch 'master' into fix-docker-ps 2018-07-28 16:47:49 -07:00
Griatch
4d2ce107d4
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
78e84200c5 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
77a1d0a5e9 Rework AMP data packet format and batch-handling. Resolves #1635 2018-07-23 21:09:06 +02:00
Johnathan
f21d625ae2
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
335109caf7 Fix display error when telnet disabled 2018-07-21 22:43:36 +02:00
Griatch
dabfbd11a5 Merge branch 'master' into develop 2018-07-21 14:14:43 +02:00
Griatch
37e2e309ef Fix to redirect default at_first_login msg to right session 2018-07-21 14:13:58 +02:00
Griatch
c063a5afb2
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
040a94b1ee 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
1872153c55
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
2cf8f3a97b 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
df866fb3f3 Add annotate method to TypedManager to filter by typeclass appropriately. 2018-06-28 08:23:52 -04:00
Griatch
8d8adbbc77
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
a6d0802202 Move query/unpickling out of loop for mutelist. 2018-06-19 04:12:46 -04:00
Griatch
68b9b3537b Merge branch 'master' into develop 2018-06-17 01:30:08 +02:00
Griatch
1c9cce7c2f Backport inlinefunc regex update from develop olc branch. Resolves #1498. 2018-06-17 01:26:18 +02:00
Griatch
8b5e653277 Merge branch 'master' into develop 2018-06-13 00:56:04 +02:00
Griatch
199325abaf Clarify channel log rotate setting is in bytes 2018-06-13 00:55:44 +02:00
Griatch
c211a5414f Patch out tickerhandler to avoid reactor testing issues 2018-06-12 23:50:50 +02:00
Griatch
e23ca1abf0 Fix unit tests after merge 2018-06-12 20:28:48 +02:00
Griatch
e1206b3b8f Fix unittests after merge 2018-06-12 20:20:20 +02:00
Griatch
b154e78070 Resolve merge conflicts 2018-06-12 20:13:22 +02:00
Griatch
3931d877ae
Merge pull request #1626 from TehomCD/fix_saverlist_add
Fix __add__ in SaverList
2018-06-12 19:00:40 +02:00
Griatch
831f2baacd
Merge pull request #1621 from TehomCD/fix_duplicate_scripts
Fix duplicate script calls
2018-06-12 18:59:51 +02:00
Griatch
b8e71fdeaf
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
26205acc39 Fix __add__ in SaverList 2018-05-29 23:05:34 -04:00
BattleJenkins
d550f3e476 Finish splitting TB test classes + adding setUp/tearDown 2018-05-21 19:27:43 -07:00
BattleJenkins
f7ae91238c More setUp/tearDown 2018-05-21 18:45:07 -07:00
BattleJenkins
f3031fee31 Start splitting unit tests, add setUp/tearDown 2018-05-21 18:27:04 -07:00
BattleJenkins
812d256225 Proper formatting for comments and notes 2018-05-21 18:06:29 -07:00
Tehom
058c65074e Handle scripts with negative intervals. 2018-05-10 19:40:58 -04:00
Tehom
9ee420458c Fix paused tasks. 2018-05-10 19:30:58 -04:00
Tehom
59d136f405 Add special handling for scripts when flushed from cache to avoid duplicate ExtendedLoopingCalls. 2018-05-10 19:23:59 -04:00
Griatch
5edea757c9 Fix lockhandler singleton implmentation with a dummyobj 2018-04-25 22:34:33 +02:00
Griatch
5335f21718
Update CODING_STYLE.md 2018-04-25 21:53:28 +02:00
Tehom
ebf0fcf0e3 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
b810ca8a1c Add check_lockstring as a function in locks/lockhandler.py 2018-04-22 22:28:43 +02:00
Rachel Blackman
84620256c6 Switch /contains to default, add /startswith switch instead. 2018-04-22 16:02:12 +02:00
Rachel Blackman
3b99e10a6a 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
895cc2de52 Add /contains switch to find. 2018-04-22 16:02:12 +02:00
Griatch
1518aaa6f2 Merge branch 'master' into develop 2018-04-22 15:04:59 +02:00
Griatch
24fc553784 Make EvTable respect col-widths while retaining total table width.
Resolves #1614.
2018-04-22 14:50:17 +02:00
Griatch
c97ba87e9b Fix error if sending string to list_node select callback 2018-04-22 13:39:47 +02:00
Tehom
b34920059b Add yet more hyphens. 2018-04-22 07:37:14 -04:00
Tehom
1480ac9acc Add hyphens to some tests. Probably more to come 2018-04-22 07:25:01 -04:00