Commit graph

260 commits

Author SHA1 Message Date
Griatch
981119b640 Fix merge conflicts 2019-01-01 15:19:20 +01:00
Griatch
daa9c55653 Merge branch 'master' into develop 2018-12-30 11:15:10 +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
Griatch
fc8abd8589 Merge branch 'master' into develop 2018-11-07 18:59:06 +01:00
Nicholas
88a8f89d6d split.min.js path update 2018-11-06 18:24:24 -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
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
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
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
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
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
634d842dc9 Implements ChannelViews. 2018-10-28 13:10:28 +00:00
Griatch
cf86467557 Merge pull request #1713 from strikaco/helpview
Implements Help views
2018-10-28 09:24:37 +01:00
Johnny
3ab6dbf3b5 Makes intro text less verbose. 2018-10-28 08:13:51 +00:00
Johnny
c22bfaa484 Adds a TypeclassMixin to the base views and mixins. 2018-10-28 06:04:58 +00:00
Johnny
864aec3c52 Corrects unit test check (registerview should always return 200 regardless of authentication) 2018-10-27 11:42:30 +00:00
Johnny
d20bd3de7d Fixes bug with register view because of improper scrubbing. 2018-10-27 11:07:54 +00:00
Johnny
0bd9d9a647 Implements HelpViews. 2018-10-27 11:07:25 +00:00
Johnny
bb3cb9ed58 Makes generic object list more useful. 2018-10-27 11:05:28 +00:00
Johnny
74b4cd286b Adds help list view. 2018-10-27 00:10:29 +00:00
Johnny
1799497c2f Restores missing object_detail template. 2018-10-26 23:27:54 +00:00
Johnny
16266ff0ee Doc updates. 2018-10-26 22:29:12 +00:00
Johnny
5f7e2a179e Fixes to chargen form docs. 2018-10-26 22:22:03 +00:00
Johnny
664be38680 Adds documentation. 2018-10-26 22:19:02 +00:00
Johnny
1483a75564 Merge branch 'develop' into middleware 2018-10-26 11:53:24 -07:00
Johnny
0e4323cdde Merge branch 'develop' into detailviews 2018-10-26 18:40:51 +00:00
Johnny
ed1f9f0570 Fixes margins on paginator to be more consistent with rest of site. 2018-10-26 00:43:58 +00:00
Johnny
659ce7c879 Adjusts margins and adds missing password change completion page. 2018-10-26 00:39:16 +00:00
Johnny
df7cf0903d Adjusts margins to make layout more consistent with rest of site. 2018-10-26 00:32:13 +00:00
Johnny
59610ffffe Adds padding to the Evennia Admin page to make layout more consistent with rest of site. 2018-10-26 00:29:12 +00:00