1
0
mirror of https://github.com/e107inc/e107.git synced 2025-02-21 06:52:28 +01:00

8574 Commits

Author SHA1 Message Date
Cameron
c16939639e Merge pull request #2036 from rica-carv/rica-carv-patch-forum-sc_search
Patch forum search shortcode
2016-11-17 13:03:02 -08:00
Cameron
6cddc2dde1 Merge pull request #2035 from lonalore/2034
Issue #2034 - Fixing PHP Fatal error: Can't use function return value…
2016-11-17 12:37:38 -08:00
Cameron
1a2e1bf2f9 Merge pull request #2038 from rica-carv/rica-carv-viewforum_caption
Enable templating of viewforum caption
2016-11-17 12:36:32 -08:00
Cameron
6f24cbb997 Issue #2040 - Max-upload-size pref is now respected by the Media-Manager. 2016-11-17 12:34:09 -08:00
Cameron
87487bfaf7 Issue #2029 - Shortcodes inside wrappers. 2016-11-16 13:12:27 -08:00
rica-carv
26827d410a Update forum_viewforum_template.php 2016-11-16 20:44:40 +00:00
rica-carv
e763b90237 Enable templating of viewforum caption
Enable templating of viewforum caption
2016-11-16 20:43:18 +00:00
rica-carv
200325f374 Patch forum search shortcode
Patch forum search shortcode
2016-11-16 20:21:43 +00:00
Lóna Lore
e41831d807 Issue #2034 - Fixing PHP Fatal error: Can't use function return value in write context. 2016-11-16 21:21:12 +01:00
rica-carv
ba5ac3da18 Merge pull request #24 from e107inc/master
.
2016-11-16 17:42:30 +00:00
Cameron
16a03d955f Possible fix for inline-editing on news. 2016-11-15 12:33:16 -08:00
Cameron
5ddff50320 Merge pull request #2031 from lonalore/dashboard
New Dashboard feature. "Flexpanel" for a movable configurable dashboard.
2016-11-15 11:31:59 -08:00
Lóna Lore
e4aefdb6b1 Resolve conflict with merging upstream repository changes into this fork. 2016-11-15 20:19:10 +01:00
Cameron
3089cecf26 Issue #2029 Allow wrappers to contain core shortcodes. 2016-11-15 11:11:19 -08:00
lonalore
407b6fe939 Fix for panel icon size. 2016-11-15 15:20:31 +01:00
lonalore
678a16a3b1 Use $ADMIN_HEADER for flexpanel too. 2016-11-15 09:28:59 +01:00
Cameron
d2a0685a67 Issue #6 #2005 Minor adjustment to LAN names. 2016-11-14 16:41:07 -08:00
Cameron
8e95099227 Merge pull request #2005 from yesszus/patch-18
Update e107_languages/English/admin/lan_admin.php
2016-11-14 16:35:39 -08:00
Cameron
69e41fa93a Issue #2023 - Corrected loading of forum template for wrapper use. 2016-11-14 16:14:47 -08:00
Cameron
6207b446df Merge pull request #2002 from MikeyGMT/mikey20161105
Minor Error detected in e107_e107_admin/header.php Viewport Content Fixes #1998
2016-11-11 18:02:06 -08:00
Cameron
38a1d8399f Issue #2018 - Figcaption problem when not using WYSIWYG. 2016-11-11 17:48:46 -08:00
Cameron
d1ba7f8f7b Issue #2023 - Main Forum template missing wrapper identifiers. 2016-11-11 17:10:08 -08:00
lonalore
106e186cb7 Flexpanel and infopanel behavior now depends on "Apply dashboard preferences to all administrators" setting. 2016-11-11 13:44:20 +01:00
lonalore
6306963fd0 "Apply dashboard preferences to all administrators" option added to admin theme settings. 2016-11-11 10:10:04 +01:00
Gábor
a4f4f205e7 Update admin_ui.php 2016-11-11 08:10:56 +01:00
Cameron
fc45e1d37a Merge pull request #2021 from rica-carv/rica-carv-patch-forum.php
Patch forum.php for override shortcodes
2016-11-10 13:56:32 -08:00
Cameron
a04ca9639a Merge pull request #2024 from rica-carv/rica-carv-patch-forumview-shortcodes
Viewable_by shortcode wrapper enabled
2016-11-10 13:50:09 -08:00
rica-carv
739b84d6c2 Update forum_viewforum_template.php 2016-11-10 20:56:06 +00:00
rica-carv
ee3735bfaa Viewable_by shortcode wrapper enabled
Viewable_by shortcode wrapper enabled
2016-11-10 20:51:24 +00:00
rica-carv
c22f5376f2 Forum overrides bug... 2016-11-10 19:41:38 +00:00
rica-carv
ff0b4b1f96 Merge pull request #22 from e107inc/master
.
2016-11-10 19:40:09 +00:00
lonalore
c9f1d419ca Flexpanel layouts with preview images. 2016-11-10 12:22:40 +01:00
lonalore
d308c98b83 Flexpanel: If Layout has been changed, we clear previous arrangement in order to use defaults. 2016-11-09 16:46:12 +01:00
lonalore
93b993bbb1 Flexpanel layout picker. 2016-11-09 16:06:53 +01:00
lonalore
e5b9d71943 Drag-and-drop panel moving/sorting now works fine. 2016-11-09 12:44:03 +01:00
lonalore
8c2c60fefd Merged upstream repository changes into this fork. 2016-11-09 11:11:33 +01:00
Gábor
81ff24a75b Update lan_admin.php 2016-11-09 09:27:01 +01:00
Gábor
54b028a85b Update lan_admin.php 2016-11-09 08:36:33 +01:00
Gábor
dd069b0477 Update admin_ui.php 2016-11-09 08:31:29 +01:00
Cameron
1bed9da9ab Option added to set unique IDs for each tablerender() instance. 2016-11-08 19:01:26 -08:00
Cameron
593533298b Issue #2003 Remove old files. 2016-11-08 11:04:12 -08:00
Cameron
9eba6b5a23 Fixes #2008 - Search Form URL 2016-11-08 10:14:27 -08:00
Cameron
1c156cd8fb admin Notify finally using the adminUI. 2016-11-08 10:00:33 -08:00
Cameron
41d873a9ba Fixes #2007 #2014 - Search template path. 2016-11-08 09:27:37 -08:00
Cameron
c94655a5e9 Fixes #1967 - Allow for display of page which doesn't contain a page title. 2016-11-07 12:10:25 -08:00
Cameron
a3fff13d7f Merge pull request #2009 from lonalore/master
Fix for Dashboard infopanel-menus.
2016-11-07 11:45:00 -08:00
lonalore
7ccfe297dc Merge branch 'master' into dashboard 2016-11-07 16:11:33 +01:00
lonalore
ca61dc9ef2 Fix for Dashboard infopanel-menus. 2016-11-07 16:10:05 +01:00
lonalore
8258058b22 Merge branch master into dashboard. 2016-11-07 16:07:36 +01:00
lonalore
2ebd60821d Fix for Dashboard infopanel-menus. 2016-11-07 16:01:12 +01:00