Commit graph

5250 commits

Author SHA1 Message Date
Griatch
b8dc257b49 Merge branch 'master' into develop 2019-01-04 19:33:18 +01:00
Griatch
8721d8c157 Further clarifications in search docstring 2019-01-04 14:35:44 +01:00
Griatch
a7de87b42d Clarifying use_dbref docstring 2019-01-04 12:56:43 +01:00
Griatch
29f61c3c4d Merge branch 'master' into develop 2019-01-01 15:15:30 +01:00
Griatch
1b5da3e85d Make help command accept use without a session 2019-01-01 03:29:55 +01:00
Griatch
599838bee2 Merge branch 'master' into develop 2018-12-30 11:15:10 +01:00
Griatch
0f34519958 Cleanup of contrib readme 2018-12-30 11:14:16 +01:00
Griatch
dc9044351b
Merge pull request #1756 from Antrare/patch-1
BugFix - Delete Prototypes using spawn command
2018-12-19 00:04:41 +01:00
Antrare
3afe08a1cf
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
5e98127e22
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
ccdad894be
Merge pull request #1750 from vincent-lg/fr
Update the fr translation
2018-12-16 21:11:39 +01:00
Griatch
3685a666e3
Merge pull request #1752 from friarzen/master
Some Webclient bugfixes
2018-12-16 14:16:46 +01:00
Vincent Le Goff
b7893e7319 Fix #1754: WindowsError is replaced with OSError 2018-12-11 17:54:27 +01:00
Griatch
95839780fb Merge branch 'master' into develop 2018-12-02 16:28:45 +01:00
Griatch
811ab0045e Correct command name in doc 2018-12-02 16:28:31 +01:00
Griatch
c0f4dce2a4
Merge pull request #1749 from vincent-lg/fix-translation
Allow the 'makemessages' and 'compilemessages' commands
2018-12-02 16:08:06 +01:00
Griatch
d4cac059da
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
9492805234
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
5e266ddd8f
Merge pull request #1741 from strikaco/charlocks
Adds delete() lock to new character objects (#1729)
2018-12-02 15:58:16 +01:00
Griatch
b03c050dd3
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
0554f83b69 adjust so splithandler dialogs dont get trumped by default_in 2018-11-27 20:35:53 -05:00
friarzen
ce3a1da1dc open help popup when the option is set. 2018-11-27 08:29:49 -05:00
friarzen
57551c791d Modal dialogs should capture all keystrokes but not interfere with other onKeydowns 2018-11-27 04:20:22 +00:00
friarzen
21451d0f9b fix hotbuttons css/layout issues 2018-11-27 03:43:20 +00:00
friarzen
07663e6a27 whitespace cleanup 2018-11-27 03:42:37 +00:00
Vincent Le Goff
1ae112cbce Update the fr translation 2018-11-22 10:17:52 +01:00
Vincent Le Goff
354b54d369 Allow the 'makemessages' and 'compilemessages' commands 2018-11-22 08:46:54 +01:00
Vincent Le Goff
9d3938d0f5 Fix slight bugs that prevent a frozen version 2018-11-21 16:11:44 +01:00
Johnny
2748c94be6 Adds public point of contact email to settings and unloggedin help command. 2018-11-07 21:26:34 +00:00
Johnny
65387c59ae Adds delete() lock to characters by default. 2018-11-07 20:44:48 +00:00
Griatch
4be8a1462c Merge branch 'master' into develop 2018-11-07 18:59:06 +01:00
Griatch
40e4a6a59f
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
40b8108ef5 split.min.js path update 2018-11-06 18:24:24 -05:00
Henddher Pedroza
70eeb6f6be Move regex out of protofunc to prevent recompilation on each call. 2018-11-05 18:44:12 -06:00
Henddher Pedroza
419045fef4 Update test 2018-10-30 20:10:36 -05:00
Henddher Pedroza
0736485298 Remove prototypes._RE_DBREF and add new dbref() to protfuncs 2018-10-30 19:50:40 -05:00
Griatch
09e691f8bf
Merge pull request #1724 from strikaco/charlist
Adds CharacterListView
2018-10-30 22:19:39 +01:00
Griatch
cc7dbfbfd6
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
740d20537a
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
cd9e3bfb10 Returns 404 if webclient is supposed to be disabled. 2018-10-30 20:14:58 +00:00
Johnny
12d55df268 Removes 'safe' template tag from help detail page (vulnerability). 2018-10-30 06:46:52 +00:00
Johnny
274cd7661a Changes all reference from view.modelto view.typeclass. 2018-10-30 01:38:54 +00:00
Johnny
aa0cf7defe Merge branch 'develop' into charlist 2018-10-30 01:13:36 +00:00
Griatch
17dab6ec85
Merge pull request #1727 from strikaco/cosmeticfixes
Minor cosmetic fixes to web templates and assets
2018-10-29 20:57:32 +01:00
Griatch
596fc42c21
Merge pull request #1726 from strikaco/changelog
Updates CHANGELOG to reflect web development efforts
2018-10-29 20:55:58 +01:00
Griatch
706807a8af
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
77f46b54e2 Changes admin link. 2018-10-29 09:12:55 +00:00
Johnny
de14d8621f Modifies the login link to redirect the user to the current page after authentication. 2018-10-29 04:02:30 +00:00
Henddher Pedroza
dab2e3c577 Harden mocked _obj_search() calls with passed in when applicable 2018-10-28 20:52:19 -05:00
Henddher Pedroza
d70246d22f Assert protfuncs._obj_search is called ONLY when (), () and () are called.
Group tests according to protfuncs._obj_search() calls
2018-10-28 20:43:14 -05:00