Commit graph

5231 commits

Author SHA1 Message Date
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
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
Henddher Pedroza
f6d62e2f69 Harden mocked _obj_search() calls with passed in when applicable 2018-10-28 20:52:19 -05:00
Henddher Pedroza
bfeebc47ba 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
Johnny
a19d5d94a6 Adds link to return to index after forgot-password request. 2018-10-29 00:35:15 +00:00
Johnny
69ee992131 Fixes incorrect label on button. 2018-10-29 00:34:38 +00:00
Johnny
496f0d6f5d Fixes alignment inconsistency in Accounts column. 2018-10-29 00:34:12 +00:00
Johnny
d174f7121f Fixes spelling error. 2018-10-29 00:33:42 +00:00
Johnny
a5779f5a30 Update. 2018-10-29 00:19:57 +00:00
Johnny
b6c0ae8585 Fixes mispelling of my name :) / updates changelog to reflect recent web development efforts. 2018-10-29 00:09:10 +00:00
Johnny
4fdcac0f6c Fixes #1723. 2018-10-28 22:57:34 +00:00
Johnny
0459d0412d Merges develop. 2018-10-28 22:17:26 +00:00
Johnny
287d7a999c Adds generic CharacterListView and unit test. 2018-10-28 22:12:29 +00:00
Griatch
cd3af403a7 Merge pull request #1722 from strikaco/channelsurfing
Adds ChannelViews
2018-10-28 21:58:21 +01:00
Griatch
4b51e78d00 Merge pull request #1711 from strikaco/detailviews
Implements generic CharacterDetailView and documents all existing views
2018-10-28 18:11:25 +01:00
Henddher Pedroza
c2ccc5d297 #1704: Update _RE_DBREF to match '(#Number)' so that it aliases to '(#Number)' 2018-10-28 09:43:01 -05:00
Johnny
dbf23b852f Adds unit test for channel views. 2018-10-28 13:30:26 +00:00
Johnny
c18df55b4f Better handling of blank lists. 2018-10-28 13:16:05 +00:00
Johnny
b8f89c5ee3 Fixes margin. 2018-10-28 13:12:42 +00:00
Johnny
089b734782 Tweaks to Admin buttons. 2018-10-28 13:12:08 +00:00
Johnny
9ad162ec2c Adds web_get_*_url methods to Channel typeclass. 2018-10-28 13:11:23 +00:00
Johnny
634d842dc9 Implements ChannelViews. 2018-10-28 13:10:28 +00:00
Griatch
431a3f743c Update changelog 2018-10-28 09:28:32 +01:00