Commit graph

5252 commits

Author SHA1 Message Date
Griatch
b45cdcf8c2 Fix nix traceback. Resolves #1761. 2019-01-04 19:51:26 +01:00
Griatch
855e7f32b0 Re-add missing fix for candidates removed in refactor
Resolves #1763.
2019-01-04 19:36:31 +01:00
Griatch
598126d25c Merge branch 'master' into develop 2019-01-04 19:33:18 +01:00
Griatch
2bea75c27d Further clarifications in search docstring 2019-01-04 14:35:44 +01:00
Griatch
692266d1bb Clarifying use_dbref docstring 2019-01-04 12:56:43 +01:00
Griatch
e016ba921e Merge branch 'master' into develop 2019-01-01 15:15:30 +01:00
Griatch
352582541f Make help command accept use without a session 2019-01-01 03:29:55 +01:00
Griatch
daa9c55653 Merge branch 'master' into develop 2018-12-30 11:15:10 +01:00
Griatch
9a556aa57b Cleanup of contrib readme 2018-12-30 11:14:16 +01:00
Griatch
0779fd6c67 Merge pull request #1756 from Antrare/patch-1
BugFix - Delete Prototypes using spawn command
2018-12-19 00:04:41 +01:00
Antrare
e102782ab0 BugFix - Delete Prototypes using spawn command
Spawn/delete <prototypekey> was not actually deleting anything.  This enables the command to work as expected.
2018-12-18 20:31:14 +11:00
Griatch
92726040e7 Merge pull request #1755 from vincent-lg/fix_1754
Fix #1754: WindowsError is replaced with OSError
2018-12-17 09:15:02 +01:00
Griatch
532fe8eb5a Merge pull request #1750 from vincent-lg/fr
Update the fr translation
2018-12-16 21:11:39 +01:00
Griatch
47bda92a97 Merge pull request #1752 from friarzen/master
Some Webclient bugfixes
2018-12-16 14:16:46 +01:00
Vincent Le Goff
03d0d015d7 Fix #1754: WindowsError is replaced with OSError 2018-12-11 17:54:27 +01:00
Griatch
9b2ae6caed Merge branch 'master' into develop 2018-12-02 16:28:45 +01:00
Griatch
1ac0b38984 Correct command name in doc 2018-12-02 16:28:31 +01:00
Griatch
f0bb6b91ef Merge pull request #1749 from vincent-lg/fix-translation
Allow the 'makemessages' and 'compilemessages' commands
2018-12-02 16:08:06 +01:00
Griatch
941ac1db45 Merge pull request #1748 from vincent-lg/frozen
Fix slight bugs that prevent a frozen version
2018-12-02 16:05:15 +01:00
Griatch
54843dfa71 Merge pull request #1742 from strikaco/admincontact
Adds STAFF_CONTACT_EMAIL setting and value to unloggedin help command
2018-12-02 15:59:22 +01:00
Griatch
df47eb8cc7 Merge pull request #1741 from strikaco/charlocks
Adds delete() lock to new character objects (#1729)
2018-12-02 15:58:16 +01:00
Griatch
8ba00beef1 Merge pull request #1716 from Henddher/bug_1704
#1704: traceback when prototype key contains `#Number` [READY FOR REVIEW/MERGE]
2018-12-02 14:53:12 +01:00
Brenden Tuck
8f15256dff adjust so splithandler dialogs dont get trumped by default_in 2018-11-27 20:35:53 -05:00
friarzen
b91504110f open help popup when the option is set. 2018-11-27 08:29:49 -05:00
friarzen
303fc584c9 Modal dialogs should capture all keystrokes but not interfere with other onKeydowns 2018-11-27 04:20:22 +00:00
friarzen
ad05ca1515 fix hotbuttons css/layout issues 2018-11-27 03:43:20 +00:00
friarzen
69ef732caf whitespace cleanup 2018-11-27 03:42:37 +00:00
Vincent Le Goff
650029a09e Update the fr translation 2018-11-22 10:17:52 +01:00
Vincent Le Goff
1788cc8e19 Allow the 'makemessages' and 'compilemessages' commands 2018-11-22 08:46:54 +01:00
Vincent Le Goff
ddbd39fce5 Fix slight bugs that prevent a frozen version 2018-11-21 16:11:44 +01:00
Johnny
81de57adfd Adds public point of contact email to settings and unloggedin help command. 2018-11-07 21:26:34 +00:00
Johnny
7be0ef60ad Adds delete() lock to characters by default. 2018-11-07 20:44:48 +00:00
Griatch
fc8abd8589 Merge branch 'master' into develop 2018-11-07 18:59:06 +01:00
Griatch
b529072d0b Merge pull request #1740 from chainsol/fix_1737
Update split.min.js CDN URL - fixes #1737
2018-11-07 15:41:50 +01:00
Nicholas
88a8f89d6d split.min.js path update 2018-11-06 18:24:24 -05:00
Henddher Pedroza
6014d5eba4 Move regex out of protofunc to prevent recompilation on each call. 2018-11-05 18:44:12 -06:00
Henddher Pedroza
cd9a91c377 Update test 2018-10-30 20:10:36 -05:00
Henddher Pedroza
979d24a12f Remove prototypes._RE_DBREF and add new dbref() to protfuncs 2018-10-30 19:50:40 -05:00
Griatch
612c672ff6 Merge pull request #1724 from strikaco/charlist
Adds CharacterListView
2018-10-30 22:19:39 +01:00
Griatch
ec2a5507fe Merge pull request #1730 from strikaco/safehelp
Removes 'safe' template tag from help detail page (vulnerability).
2018-10-30 22:18:38 +01:00
Griatch
d8351d2a8d Merge pull request #1733 from strikaco/webclientdisable
Returns 404 if webclient is supposed to be disabled (fixes #1731)
2018-10-30 22:17:37 +01:00
Johnny
09d982eb48 Returns 404 if webclient is supposed to be disabled. 2018-10-30 20:14:58 +00:00
Johnny
19638b3946 Removes 'safe' template tag from help detail page (vulnerability). 2018-10-30 06:46:52 +00:00
Johnny
bf3a012686 Changes all reference from view.modelto view.typeclass. 2018-10-30 01:38:54 +00:00
Johnny
c9b7c174ec Merge branch 'develop' into charlist 2018-10-30 01:13:36 +00:00
Griatch
d584fda9e6 Merge pull request #1727 from strikaco/cosmeticfixes
Minor cosmetic fixes to web templates and assets
2018-10-29 20:57:32 +01:00
Griatch
6309c8668d Merge pull request #1726 from strikaco/changelog
Updates CHANGELOG to reflect web development efforts
2018-10-29 20:55:58 +01:00
Griatch
d5baa8b01c Merge pull request #1725 from strikaco/sharedloginfix
Fixes failure to pass credentials to website when authenticating through webclient (#1723)
2018-10-29 20:54:59 +01:00
Johnny
8fc39108dc Changes admin link. 2018-10-29 09:12:55 +00:00
Johnny
1b72f79456 Modifies the login link to redirect the user to the current page after authentication. 2018-10-29 04:02:30 +00:00