Commit graph

995 commits

Author SHA1 Message Date
Hypolite Petovan 616edd0600 Move mod/delegate to src/Module/Settings/Delegation
- Move templates/delegate to templates/settings/delegation
2019-10-09 22:17:09 -04:00
Hypolite Petovan 22598fc7e8 Improve search box
- Use new saved search module
- Use dynamic search option loop
- Use "q" instead of "search" for search query string parameter
2019-10-07 14:27:46 -04:00
Hypolite Petovan cdefa7f32a Add new module and widget for managing saved searches 2019-10-07 14:27:46 -04:00
Hypolite Petovan 8f20e2054b Move /acl module to src/
- Move Core\ACL::contactAutocomplete to Module\Search\Acl
- Rename module path to /search/acl
2019-10-03 22:40:42 -04:00
Tobias Diekershoff 8db7934a30 add option 'require' for textarea form elements 2019-10-02 07:33:30 +02:00
Hypolite Petovan cba40dc9fd Prevents Enter from submitting the jot form in the ACL search field
- Disable browser autocomplete in jot ACL search field
2019-08-25 21:03:29 -04:00
Hypolite Petovan 341046e3a0 [frio] Prevent Enter from sending the form in ACL tags input in /compose 2019-08-25 21:01:59 -04:00
Hypolite Petovan 0a9ed707b5 Add hashtag mark to trending tags display 2019-08-06 20:55:40 -04:00
Hypolite Petovan a947bd0889 Add Trending Tags widget + template 2019-08-06 07:09:04 -04:00
Hypolite Petovan c25527cbe8 Replace obsolete #comment-preview-inp field by query string append 2019-07-29 21:58:37 -04:00
Hypolite Petovan 9d20705700 Improve compose page template
- Update title and description of the limited/private panel
- Move CC email addresses outside of the visibility panels
2019-07-29 20:31:49 -04:00
Hypolite Petovan 496b02bdd2 [frio] Accessibility: enable keyboard action on visibility panels in compose page 2019-07-29 20:31:48 -04:00
Hypolite Petovan 4f4b538bcf [frio] Add jotnet fields to compose page
- Move hardcoded descriptions to translation strings
2019-07-29 20:31:47 -04:00
Hypolite Petovan c24ca57f21 Add frio-specific /compose module 2019-07-29 20:31:46 -04:00
Hypolite Petovan 816eba5164 Unescape stream event title 2019-07-28 21:46:43 -04:00
Hypolite Petovan c32d635326 Revert heading changes in admin/blocklist/server.tpl 2019-07-26 21:16:15 -04:00
Hypolite Petovan eaf217ef7d Update server block admin page to reflect the addition of shell wildcard syntax 2019-07-25 22:37:30 -04:00
Hypolite Petovan 4821fe1b98 Use template-displayed errors in TwoFactor\Verify
- Remove the page dependency on jGrowl notices
2019-07-23 20:02:26 -04:00
Hypolite Petovan 1a164b0dc5 Add two-factor app-specific password settings page
- Add two-factor app-specific model
- Add link to new page from 2fa settings index page
2019-07-22 07:56:00 -04:00
Michael a11206dbcd Issue 6675: Improved check for follower, removed global setting 2019-07-21 05:56:57 +00:00
Michael e247a14d2b Added the option to only receive top level posts from people you follow 2019-07-17 21:37:13 +00:00
Philipp Holzer 92fb0a82ca
Dynamic config loading
- Move settings, defaults and dbstructure to directory 'static'
- Dynamic loading of config files (after the static loading)
- Filter out '-sample.config.php' and '-sample.ini.php' files
- Remove unnecessary ConfigFileManager
- Move ConfigFileLoader to Utils
- Add tests for multi-loading for INI, config and sample-filtering
2019-07-16 20:16:43 +02:00
Jeroen De Meerleer aff60da1af Nofilter 2019-07-13 22:45:54 +02:00
Michael 4ab772ed67 Issue 6477: Automatically repair self contact avatar 2019-06-19 17:05:29 +00:00
Hypolite Petovan b00bcbb1c1 Normalize the contact sidebar with the profile sidebar
- Remove un/follow text links in contact status window
2019-06-10 21:56:06 -04:00
Hypolite Petovan 3aebb92cf3 Rework Profile::sidebar profile link conditions
- Now show Follow, Unfollow, Atom Feed and Message in profile sidebar more consistently with the status of the current visitor
- Remove pseudo-field contact.remoteconnect
2019-06-10 21:56:03 -04:00
Hypolite Petovan 9ac7d20df3 [frio] Add .add-to-modal delegated event on anchors
- Improve hovercard button accessibility
2019-06-03 08:31:43 -04:00
Hypolite Petovan ed768c71ee Remove "f=&" nonsense from network module
- Fixes wrong redirect when using the sidebar filters
2019-05-27 17:45:27 -04:00
Philipp Holzer 78a20e5acb
Fix hovercard vanish 2019-05-26 21:42:49 +02:00
Hypolite Petovan d27d4d8927 Move posted date widget to Content\Widget 2019-05-25 19:08:15 -04:00
Hypolite Petovan 709eba6ce3 Move /viewcontacts to /profile/{nickname}/contacts[/{type}]
- Add contact relationship filter to profile contacts page
- Include feed contacts in contacts page and contact widget
2019-05-20 14:50:09 -04:00
Hypolite Petovan 0c9b76a585
Merge pull request #7173 from nupplaphil/task/mod_newmember
Move mod/newmember to src/Module/Welcome
2019-05-20 14:14:58 -04:00
Philipp Holzer f97b72eb9f
Move mod/newmember to src/Module/Welcome 2019-05-20 20:12:20 +02:00
Hypolite Petovan 6f0c6e8926
Merge pull request #7160 from nupplaphil/task/mod_probe
Move mod/probe to src/Module/Probe
2019-05-19 15:06:13 -04:00
Philipp a758671a1b
Merge pull request #7154 from MrPetovan/task/refactor-widgets
Refactor widgets
2019-05-19 20:52:00 +02:00
Philipp Holzer 48bba87abe
Move mod/probe to src/Module/Probe 2019-05-19 04:24:18 +02:00
Philipp Holzer 9f13ae6e73
Move mod/opensearch to src/Module/OpenSearch 2019-05-18 17:43:58 +02:00
Hypolite Petovan 71ae8d07a6 Refactor widgets
- Move widget templates to subfolder
- Add new generic filter widget templates to replace category, network and filer filters
- Update styles
2019-05-18 11:33:35 -04:00
Hypolite Petovan 0c63f8aa42 Add contact block reason form and display in admin page 2019-05-15 19:30:13 -04:00
Hypolite Petovan 8e885f5b97 Add two-factor authentication settings
- Add settings aside menu entry
- Add two-factor authentication documentation
2019-05-13 01:52:01 -04:00
Hypolite Petovan d7e9b91181 Add two-factor authentication
- Add 2FA login interception in Session::setAuthenticatedForUser
- Add 2fa session variable holding the last auth code
2019-05-13 01:52:01 -04:00
Philipp 2a2b147758
Merge pull request #7127 from tobiasd/20190510-pwdresetescape
pwdreset templated fixed HTML escaping
2019-05-10 11:37:12 +02:00
Tobias Diekershoff 782037a611 HTML escaping 2019-05-10 10:52:53 +02:00
Tobias Diekershoff 3812cdf123 make the addon listing in the admin panel aside working again 2019-05-10 10:38:09 +02:00
Philipp 7c62a4e02b
Merge pull request #7104 from annando/separated-confirm
The follow confirmation process is now separated
2019-05-06 21:40:11 +02:00
Philipp Holzer 8ac1cf926c
remove superfluous tpl action 2019-05-06 20:40:53 +02:00
Hypolite Petovan 20c9d5fe1d
Merge pull request #7103 from nupplaphil/task/mod_smilies
Move mod/smilies to src/Module/Smilies
2019-05-06 12:53:45 -04:00
Michael 37f9af2f24 Merge remote-tracking branch 'upstream/develop' into separated-confirm 2019-05-06 05:54:51 +00:00
Michael 5da3e17a12 The follow confirmation process is now separated between DFRN and the rest 2019-05-06 05:46:13 +00:00
Philipp 14d8c12130
Merge pull request #7092 from MrPetovan/task/7047-theme-error-page
Add style to exception page
2019-05-06 07:33:42 +02:00
Hypolite Petovan bb8d297ae4
Merge pull request #7097 from nupplaphil/task/mod_after_PR_fixing
Fixings for Mod-Refactorings
2019-05-05 20:28:57 -04:00
Hypolite Petovan 8af0ae171e
Merge pull request #7083 from nupplaphil/task/mod_friendica
Move mod/friendica to src/Module/Friendica
2019-05-05 14:19:57 -04:00
Philipp Holzer e90876cd86
Move mod/smilies to src/Module/Smilies 2019-05-05 19:39:02 +02:00
Philipp Holzer f6af90fa32
Create XML output for RSD with XML::fromArray() 2019-05-05 18:15:39 +02:00
Philipp Holzer 5d1a12d9b3
add feedback 2019-05-05 17:02:17 +02:00
Philipp Holzer 06ce74c7c9
add feedback 2019-05-05 17:01:51 +02:00
Philipp Holzer 9123361d61
added feedback 2019-05-05 10:00:28 +02:00
Hypolite Petovan c969635bbc Add style to exception page 2019-05-04 21:54:05 -04:00
Philipp Holzer a1f332aaa5
Move mod/rsd_xml to src/Module/ReallySimpleDiscovery 2019-05-04 21:37:32 +02:00
Philipp Holzer 708ffaff51
Move mod/home to src/Module/Home 2019-05-04 13:08:31 +02:00
Philipp Holzer 3fca00d1d5
forgot nofilter 2019-05-04 10:17:04 +02:00
Philipp Holzer 6f787f2422
Move mod/friendica to src/Module/Friendica 2019-05-04 10:14:29 +02:00
Hypolite Petovan 70bef12fd2 Fix Proxy module routes
- Fix EOL in view/templates/exception.tpl
2019-05-02 21:35:37 -04:00
Philipp 2628da422a
Merge pull request #7068 from MrPetovan/task/7047-theme-error-page
Themed error page redux
2019-05-02 21:15:29 +02:00
Philipp 774d04cd2f
Merge pull request #7044 from MrPetovan/task/router
Move mod/admin to src/Module/Admin
2019-05-02 18:26:30 +02:00
Hypolite Petovan 358baa9f62 Add themed error pages
- Module init, post and rawContent-triggered HTTPException generate the classic bare HTTP status page
- Module content-triggered HTTPException generate themed error pages
- Trim System::httpExit to the bare minimum
2019-05-02 11:26:56 -04:00
Philipp 07cb887885
Merge pull request #7067 from MrPetovan/task/remove-app-error
Remove App->error
2019-05-02 17:24:56 +02:00
Hypolite Petovan 9774c95b80 Remove duplicate $baseurl template variable
- Remove unused $overwriteURL parameter in Renderer::replaceMacros
2019-05-02 09:55:48 -04:00
Hypolite Petovan d8125eb3db Make the site admin theme setting link go to the currently selected theme 2019-05-02 09:52:55 -04:00
Hypolite Petovan ad02fd140a Move /itemsource to src/Module/Admin 2019-05-02 09:52:53 -04:00
Hypolite Petovan bc5d1384e1 Move admin/deleteitem to src/Module/Admin 2019-05-02 09:52:52 -04:00
Hypolite Petovan a201391d11 Move admin/dbsync to src/Module 2019-05-02 09:52:51 -04:00
Hypolite Petovan df947ba9db Move admin/logs to src/Module 2019-05-02 09:52:51 -04:00
Hypolite Petovan 740723534f Move admin/site to src/Module
- Replace default theme settings modal with simple link to admin/themes
2019-05-02 09:52:50 -04:00
Hypolite Petovan d0b40cda4c Move admin/themes/{theme} to src/Module
- Remove now unused templates/admin/addon_detail.tpl
- Remove references to themes admin in mod/admin.php
2019-05-02 09:52:50 -04:00
Hypolite Petovan a5da0fd98f Add admin/themes/{theme}/embed module
- This module allows editing the site settings for a theme with a different user theme
2019-05-02 09:52:49 -04:00
Hypolite Petovan 5a01c53781 Move admin/queue to src/Module
- Add Module\Admin\Queue class
- Add route for admin/queue[/deferred]
- Add queue admin aside menu entry
- Remove obsolete templates/admin/queue.tpl from base and frio
- Move templates/admin/workerqueue.tpl to templates/admin/queue.tpl
- Remove admin_page_workerqueue and admin_page_workerqueue_post from mod/admin.php
- Update admin/summary.tpl with new queue admin paths
2019-05-02 09:52:48 -04:00
Hypolite Petovan 5750623b48 Move admin/blocklist/server to src/Module
- Add Module\Admin\Blocklist\Server class
- Add route for admin/blocklist/server
- Add server blocklist admin aside menu entry
- Move templates/admin/blocklist.tpl to templates/admin/blocklist/server.tpl
- Remove admin_page_blocklist and admin_page_blocklist_post from mod/admin.php
2019-05-02 09:52:47 -04:00
Hypolite Petovan cf885841c8 Move admin/blocklist/contact to src/Module
- Add Module\Admin\ContactBlock\Contact class
- Add route for admin/blocklist/contact
- Add contact blocklist admin aside menu entry
- Move templates/admin/contactblock.tpl to templates/admin/blocklist/contact.tpl in base and frio
- Remove admin_page_contactblock and admin_page_contactblock_post from mod/admin.php
2019-05-02 09:52:46 -04:00
Hypolite Petovan 446cb905e4 Move admin/features to src/Module
- Add Module\Admin\Features class
- Add route for admin/features
- Add features admin aside menu entry
- Move templates/admin/settings_features.tpl to templates/admin/features.tpl
- Remove admin_page_features and admin_page_features_post from mod/admin.php
2019-05-02 09:52:46 -04:00
Hypolite Petovan f3f055758c Move admin/users to src/Module
- Add Module\Admin\Users class
- Add route for admin/users[/{action}/{uid}]
- Add users admin aside menu entry
- Remove admin_page_users and admin_page_users_post from mod/admin.php
2019-05-02 09:52:45 -04:00
Hypolite Petovan 87e51ddd67 Move admin/addons/{addon} to src/Module
- Add Module\Admin\Addons\Details class
- Add route for admin/addons/{addon}
- Remove addons pages from mod/admin
2019-05-02 09:52:44 -04:00
Hypolite Petovan 9bbb438534 Move admin/addons to src/Module
- Add Module\Admin\Addons\Index class
- Add route for admin/addons
- Add addons admin aside menu entry
- Remove unused template admin/addons.tpl from base and frio
- Remove addon list from mod/admin
2019-05-02 09:52:44 -04:00
Hypolite Petovan a13bc14933 Move admin/themes to src/Module
- Add Module\Admin\Themes\Index class
- Add route for admin/themes
- Add themes admin aside menu entry
- Add admin/addons/index.tpl template
- Remove theme list from mod/admin
2019-05-02 09:52:43 -04:00
Hypolite Petovan 6387a77b52 Move admin summary to src/Module
- Add BaseAdminModule class
- Add Module\Admin\Summary class
- Add Route for Admin\Summary module
- Remove admin_page_summary() in mod/admin
- Remove $showwarning variable from admin/summary.tpl
2019-05-02 09:52:41 -04:00
Hypolite Petovan 5dd6e6b5fb Reworked /photos module without App->error
- Moved confirm dialogs to photos_content()
- Removed comments/interactions from photo edit page
2019-05-01 19:36:14 -04:00
Philipp Holzer 2ae4b9f7e9
Last refactoring :-) / refactor due feedback 2019-05-01 19:17:52 +02:00
Philipp Holzer 8581fbb40f
refactor caused by feedback 2019-05-01 18:25:07 +02:00
Philipp Holzer 90a38a00d8
Adding basepath, urlpath, hostname and ssl_policy to installation 2019-04-14 14:23:06 +02:00
Hypolite Petovan 608c80819c Remove obsolete hack in file browser template 2019-04-13 19:05:14 -04:00
Michael 46a99a05a1 Remove the queue from the core 2019-04-05 18:04:39 +00:00
Hypolite Petovan 898f7e7e38 Add connector collapsible panel in permission
- Replace HTML string by structured array in jot_networks hook
- Add collapsed panel when there are more than two connectors
2019-03-24 22:40:50 -04:00
Philipp Holzer fa31bb6dde
remove basepath and hostname from admin panel and add update path 2019-03-24 13:47:31 +01:00
Philipp Holzer 69fa6161e5 Refactor installer 2019-03-22 23:31:45 -04:00
Tobias Diekershoff 988506f192 remove autofocus from search box 2019-03-16 17:09:37 +01:00
Michael Vogel fa5525d084
Merge pull request #6726 from MrPetovan/task/6676-fix-implicit-mentions
Fix last batch of implicit mentions issues
2019-02-24 15:40:11 +01:00
Hypolite Petovan 0a58e4c952 Improve contactgroupChangeMember() javascript function
- Add usage of new /group/123/add|remove/123 URL
- Add checkbox revert in case of error
2019-02-23 17:32:41 -05:00
Hypolite Petovan cd53585101 Improve /itemsource display
- Add Item Id
- Add Item Terms
2019-02-23 17:32:10 -05:00
rabuzarus 2b7c331afb forumdirectory: some polishing 2019-02-18 13:03:21 +01:00
rabuzarus 85f0508494 own function for processing data of directory entries 2019-02-18 03:00:10 +01:00
Hypolite Petovan 281d6fe055 Remove superfluous call to focus() in global commentExpand() function 2019-02-14 22:25:42 -05:00
Hypolite Petovan d7dbc632f8 Improved comment hiding interaction
- Remove global window.showMore and window.showFewer
- Improve global showHideComments function
- Remove frio-specific showHideComments function
2019-02-14 22:24:34 -05:00
Hypolite Petovan c8a7c95279 Unescape $ispublic variable for jot display 2019-02-14 22:11:00 -05:00
rabuzarus ecc393e1c3 frio - some small styling fixes for the manage page (badges, center name, paddings) 2019-02-14 03:06:57 +01:00
Tobias Diekershoff d2243a1c35 tagged the inline JS in head.tpl with the license 2019-02-12 11:30:45 +01:00
Michael Vogel c7308d98fa
Merge pull request #6614 from MrPetovan/task/6552-add-explicit-mentions
Add explicit mentions to ActivityPub/Diaspora comments
2019-02-10 00:52:40 +01:00
Hypolite Petovan 7c58944449 Add "delivery done" label 2019-02-08 23:19:26 -05:00
Hypolite Petovan 6577b1abb0 Add alias field to mod/crepair
- Replace deprecated q() call by DBA::update
2019-02-08 22:38:23 -05:00
Hypolite Petovan 8c9ef56a71 Normalize field_*.tpl formatting 2019-02-03 15:33:59 -05:00
Hypolite Petovan ba7ffab3c2 Add nofilter to field_input attribute parameter 2019-02-03 15:32:52 -05:00
Michael f226464acc Don't auto mention yourself or forums, don't do it in the firstlevel post 2019-01-30 03:36:24 +00:00
Hypolite Petovan bd03278ee9 Put cursor at end of default mentions in comment box 2019-01-29 09:25:22 -05:00
Hypolite Petovan 8d84f33f15
Merge pull request #6541 from annando/mentions
Display mentioned users and in the comment box by default
2019-01-29 07:56:30 -05:00
Hypolite Petovan 0c12d8af5f Rename conflicted variable $info in admin settings 2019-01-28 21:45:43 -05:00
Michael d40b2792b6 Display mentioned users and in the comment box by default 2019-01-28 21:22:03 +00:00
Hypolite Petovan 043521fb47 Switch to supported HTML entity for bullet in delivery indicator 2019-01-26 19:42:13 -05:00
Jeroen De Meerleer 6fb2383116 Added nofilter to geotag
Fixes issue GH-6511
2019-01-24 17:23:25 +01:00
Michael Vogel 48e0b943a3
Merge pull request #6336 from MrPetovan/bug/6334-get-app-namespace
Move mod/register to Module\Register
2019-01-23 07:40:58 +01:00
Hypolite Petovan e2d32caa78 Update delivery count display
- Hide display when item is preceding the feature
- Wrap the display in its own span
- Remove delivery bullet from wall_thread.tpl
- [frio] Make delivery icon fainter
2019-01-23 00:05:53 -05:00
Hypolite Petovan cef6757c92 Replace REGISTER_* constants by Module\Register::* ones 2019-01-22 22:24:15 -05:00
Hypolite Petovan 0ccb6afdb5 Add Register module in src/
- Update REGISTER_* constants definition
- Update register template variable name
2019-01-22 22:22:04 -05:00
Tobias Diekershoff 66284a17a7 unescaping the HTML in the hint 2019-01-22 14:02:56 +01:00
Hypolite Petovan 6538a8eaca Add delivery queue display in frio and vier
- Add new $item.owner_self and $item.delivery keys for display
- Add new sub/delivery_count.tpl template
2019-01-21 09:39:13 -05:00
fabrixxm fdc6608af8 Add storage options form in admin/site page 2019-01-21 09:11:39 -05:00
Tobias Diekershoff 6e258fc760 HTML unescape existing albums
When uploading a new photo the selection list for chosing existing albums was not shown. With this PR it is now again.xj

Part of #6208
2019-01-20 18:47:20 +01:00
Hypolite Petovan 3b80f335fa
Merge pull request #6412 from annando/issue-6149
Issue 6149: Making OWA (hopefully) compatible with Hubzilla
2019-01-08 09:17:05 -05:00
Michael 8c6df8f156 Issue 6149: Making OWA (hopefully) compatible with Hubzilla 2019-01-08 11:17:05 +00:00
Hypolite Petovan e447375cdd
Merge branch '2019.01-rc' into bug/6334-escape-get-app 2019-01-06 16:38:48 -05:00
Hypolite Petovan 4bf2701912
Merge pull request #6400 from annando/issue-6394
Issue 6394: The contact location has to be BBEncoded
2019-01-06 16:37:43 -05:00
Michael 7e19506435 Issue 6394: The contact location has to be BBEncoded 2019-01-06 21:04:10 +00:00
Hypolite Petovan f2b784e654 Strip base url from links before determining anchor status for iOS linker 2019-01-04 20:36:36 -05:00
Hypolite Petovan b3f8a24819 Unescape infinite scroll URL 2019-01-03 21:30:10 -05:00
Hypolite Petovan 935b86749d Unescape invite_desc template variable 2019-01-03 21:29:30 -05:00
Michael Vogel 0eef382e82
Merge pull request #6365 from MrPetovan/bug/6363-unescape-prev-next-link
Unescape $prevlink and $nextlink template variables
2019-01-03 04:54:12 +01:00
Hypolite Petovan ff50f2bb65 Unescape $prevlink and $nextlink template variables 2019-01-02 19:06:23 -05:00
Hypolite Petovan 2f15f1c477 Unescape profiles template variables 2019-01-01 11:45:36 -05:00
Hypolite Petovan 0dc06d66a0 Unescape $invite_desc in follow/register templates 2019-01-01 02:50:37 -05:00
Michael Vogel dc05ada059
Merge pull request #6351 from MrPetovan/bug/6350-unescape-admin-warning-text
Unescape admin warning text
2018-12-30 16:41:05 +01:00
Hypolite Petovan 5db5cc904a Unescape plaintext email body 2018-12-30 10:20:38 -05:00
Hypolite Petovan e0a763b07f Unescape admin warning text 2018-12-30 10:12:13 -05:00
Hypolite Petovan 838c0f96de Use minimal mode to change site theme settings
- Use textarea in colorbox instead of inline HTML
- Add mode propagation to site theme setting form
- Set theme for site theme settings form to load JS dependencies
2018-12-29 15:40:05 -05:00
Hypolite Petovan 62f5438bb3 Remove useless trailing slash in admin/addon_details.tpl 2018-12-29 15:40:05 -05:00
Hypolite Petovan 620395378e Normalize uses of Strings::formatNetworkName to $network_link
- Unescape HTML template variable $network_link
2018-12-26 11:11:38 -05:00
Hypolite Petovan 52ca6f34cd Unescape babel result panel content 2018-12-25 11:37:57 -05:00
Hypolite Petovan b56aec9a29 Add page wrapper to wallmessage.tpl 2018-12-25 11:37:56 -05:00
Hypolite Petovan c5a3cdcf82 Unescape aes_allow in dfrn_req_confirm.tpl 2018-12-24 23:14:30 -05:00
Hypolite Petovan 4285f2f8bb Remove unused template variable in dfrn_req_confirm
- Replace killme() by exit() in mod/dfrn_request
2018-12-24 23:14:09 -05:00
Hypolite Petovan b1e85ba605 Fix template escaping in photo gallery view 2018-12-23 10:51:18 -05:00
Hypolite Petovan 3fc5c1ad84 Fix escaping in email notification template 2018-12-23 10:51:00 -05:00
Hypolite Petovan 92214b8867
Merge pull request #6302 from annando/issue-6300
Isse 6300: And again templates ...
2018-12-21 19:04:45 -05:00