mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-18 13:14:55 +01:00
Code Issues Releases Wiki Activity
10,734 Commits 2 Branches 22 Tags
Commit Graph

10734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cameron
1b4e0af07a
Merge pull request #3257 from SimSync/fix_3065 
Fixes #3065 Added a method to translate wildcards to mysql counterparts
 2018-07-07 15:46:14 -07:00
Achim Ennenbach
0e9f9d4e46 fixes #3065 Added a method to translate wildcards to mysql counterparts 2018-07-06 08:36:35 +02:00
Cameron
31e16310e7
Merge pull request #3237 from Jimmi08/patch-2 
partial fix #3235
 2018-07-04 17:50:50 -07:00
Cameron
f3393f9d7e
Merge pull request #3236 from Jimmi08/patch-1 
partial fix #3235
 2018-07-04 17:50:41 -07:00
Cameron
d4cc9a47b4
Merge pull request #3254 from SimSync/fix_3051 
fixes #3051 broken image links
 2018-07-04 17:47:15 -07:00
Cameron
3b635ee960
Merge pull request #3253 from SimSync/fix_3059 
fixes #3059 Language list was empty, even if languages were available
 2018-07-04 17:46:16 -07:00
Cameron
77edce4da4
Merge pull request #3251 from SimSync/fix_3087 
fixes #3087 Missing forum id prevented pagination
 2018-07-04 17:44:28 -07:00
Cameron
23e97e058c
Merge pull request #3250 from SimSync/fix_3120 
Fixes #3120 Added tools sections to comment manager to recalculate comment count
 2018-07-04 17:42:54 -07:00
Cameron
1b8f698b4c
Merge pull request #3247 from SimSync/fix_3126_3143 
Fixes #3126 & #3143 Backend used wrong field to hashword
 2018-07-04 17:41:46 -07:00
Cameron
253ae3b6ba
Merge pull request #3246 from SimSync/fix_3228 
Fixes #3228 show extended user field also in non bootstrap themes
 2018-07-04 17:39:49 -07:00
Cameron
56d79a4657
Merge pull request #3226 from SimSync/fix_3221 
Fixes #3221 Switched font urls from http to https
 2018-07-04 17:39:04 -07:00
Cameron
6a04082651
Merge pull request #3225 from SimSync/fix_2887 
Fixes #2887 added missing "sent()" method
 2018-07-04 17:38:21 -07:00
Cameron
fd8772f88a
Merge pull request #3223 from SimSync/checkBan 
Fixed an issue in iphandler::checkBan()
 2018-07-04 17:37:12 -07:00
Cameron
3f64d29bd9
Merge pull request #3217 from SimSync/fix_3163 
Fixes #3163 Strip the title "News" if page is the frontpage
 2018-07-04 17:31:09 -07:00
Cameron
feba5002dd
Merge pull request #3215 from SimSync/fix_3161 
Fixes #3162 Fixes double encoding of the param values.
 2018-07-04 17:30:12 -07:00
Cameron
89731bed82
Merge pull request #3214 from SimSync/fix_3162 
Fixes #3161 Fixes htmlized shortcode parameters
 2018-07-04 17:29:05 -07:00
Achim Ennenbach
d8c63724b2 fixes #3051 broken image links 
The image browser always returns image path relative to admin directory,
which doesn't work in case the target is a plugin.
Added a check for the target and modify the preview url in case
it is a plugin.
 2018-07-04 13:28:45 +02:00
Achim Ennenbach
047b7f8f7d fixes #3059 Language list was empty, even if languages were available 
download and info link returned from languagepacks.xml contain wrong links
 2018-07-04 12:09:25 +02:00
Achim Ennenbach
ed17213698 fixes #3087 Missing forum id prevented pagination 2018-07-03 15:41:01 +02:00
Achim Ennenbach
cce333550f fixes #3120 added tools sections to recalculate comment count to comment manager 2018-07-03 14:54:45 +02:00
Achim Ennenbach
bc7b801054 fixes #3126, fixes #3143 Backend used wrong field to hashword 
Instead of user_loginname (as used in usersettings),
the backend used user_login and didn't escape the result.
This made the login impossible.
 2018-07-03 12:24:57 +02:00
Achim Ennenbach
623fbe607c fixes #3228 show extended user field also in non bootstrap themes 2018-07-03 11:30:30 +02:00
Jimako
9b8cc13019
partial fix for problem with breadcrumbs in forum_viewforum.php 
https://github.com/e107inc/e107/issues/3235
 2018-06-30 13:30:18 +02:00
Jimako
5b4cc2f11c
partial fix for problem with breadcrumbs in forum_viewforum.php 
https://github.com/e107inc/e107/issues/3235
 2018-06-30 13:28:06 +02:00
Achim Ennenbach
b833529d56 Fixes #3221 Switched font urls from http to https 2018-06-28 13:32:54 +02:00
Achim Ennenbach
cea035a33e Fixes #2887 added missing "sent()" method 2018-06-28 13:18:54 +02:00
Achim Ennenbach
724651376e Fixed an issue in iphandler::checkBan() which caused the script to stop 
without any message instead of returning a value (true or false) in case
the submitted email adress is blocked
 2018-06-27 21:34:19 +02:00
Tijn Kuyper
89e3716c3f
Closes #3040 - NFP template update 2018-06-27 11:40:56 +02:00
Tijn Kuyper
9ce050b995
Newforumposts menu template update 2018-06-27 11:39:38 +02:00
Tijn Kuyper
439e66d271
Merge pull request #3220 from SimSync/fix_3132 
Fixes #3132 Fixes issue with new forum posts menu
 2018-06-27 11:08:13 +02:00
Achim Ennenbach
bd02bd26f7 Fixes #3132 Fixes issue with new forum posts menu not displaying 
title and post excerpt properly
Added menu config default values, in case some are not properly defined
Added default values to the new forum posts config menu
 2018-06-26 21:20:33 +02:00
Tijn Kuyper
7570b7ce4e
Merge pull request #3213 from SimSync/fix_3132 
Fixes #3132 after adding the menu to the menu area, the wrong
 2018-06-26 13:31:57 +02:00
Tijn Kuyper
5689e8044e
Fixes #1746 - Allow to set time for download item 2018-06-25 16:39:26 +02:00
Tijn Kuyper
20f35e6186
#3053 - Wrong pref for comment sorting 2018-06-25 14:26:50 +02:00
Achim
c93789b1b7
Update header_default.php 2018-06-25 13:59:47 +02:00
Achim
1b3460cf3d
Fixes #3163 Strip the title "News" if page is the frontpage 
Removes any additional title (like "News - ") when current page is the frontpage.
e.g. `<title>News - My great website</title>` will become `<title>My great website</title>` if the page is opened as frontpage (Admin -> Settings -> Frontpage)
 2018-06-25 13:58:10 +02:00
Achim Ennenbach
bfd2ae42d1 Fixes #3162 Fixes double encoding of the param values. 2018-06-24 22:09:37 +02:00
Achim Ennenbach
d8c4ed3444 Fixes #3162 Fixes htmlized shortcode parameters 
When entering shortcodes via TinyMCE, the & sign will be converted
automatically to &amp; without any chance to prevent this behaviour.
The fix just corrects this error right before running the shortcode.
 2018-06-24 21:38:06 +02:00
Achim Ennenbach
d1a90cb0e8 Fixes #3132 after adding the menu to the menu area, the wrong 
query was executed because no layout was defined. Setting "default"
as default layout if nothing is defined.
 2018-06-24 20:11:59 +02:00
Cameron
1edd4a008f
Merge pull request #3210 from Deltik/fix-3198 
Fixes #3198 - Legacy prefs, missing forums
 2018-06-23 17:10:13 -07:00
Cameron
2978646db8
Merge pull request #3209 from Deltik/fix-3204 
Disable tree format if model has filters
 2018-06-23 17:09:30 -07:00
Nick Liu
b471626fdb
Fixed missing tree nodes for some tree structures 
There were two cases that led to missing tree nodes:

* If one node at the same depth as another node had a higher primary
key ID but showed up in the rows before, the lower primary key ID node
will go missing.

* If an unmatching row for the current node in moveRowsToTreeNodes
appeared between a matching row, the matching row would never be
reached and would not be added to the tree.
 2018-06-22 14:00:13 -05:00
Nick Liu
32b844dad3
Grammar correction near previous commit 
Also cleaned up comments made in previous commit
 2018-06-21 23:33:46 -05:00
Achim Ennenbach
94cb469862
Removed the orphaned debug message 
concerning "legacy forum menu prefs detected. Upgrading ..." as it
actually doesn't detect or upgrade anything.
 2018-06-21 23:31:15 -05:00
Achim Ennenbach
e96aea8748
In case the 2 or more join aliases point to the same table, now 
the first alias get's saved instead of the last one.
 2018-06-21 23:28:16 -05:00
Nick Liu
41f8e78489
Disable tree format if model has filters 
Parent-child relationship tables (trees) can only be constructed if
the entire table is loaded. When WHERE filters are applied to the
table, the tree cannot be made, which causes #3204.

When a filter is active, a tree representation is no longer
appropriate because the filter can filter out parents of a matched
row, which breaks the concept of a tree.

To resolve this and restore search functionality, this commit disables
the sort_parent of the tree model in order to activate the
e_tree_model::getRowsList() method and avoid the tree logic entirely.

Fixes: #3204
Supersedes: #3208
 2018-06-21 23:24:57 -05:00
Cameron
0a3acb2f6d
Merge pull request #3197 from MikeyGMT/20180428 
Issue #6 ToDo Lans bounceLAN in handlers/login.
 2018-06-20 11:29:15 -07:00
MikeyGMT
79c14d66f6 #6 ToDo Lans bounceLAN in handlers/login. 
ToDo Lans bounceLAN in handlers/login.
Tested login from login.php, from the login link in voux theme without issue. No bounced emails on test instance.
 2018-06-19 18:16:36 +01:00
MikeyGMT
2f7b080bd7
Merge pull request #1 from e107inc/master 
Merge e107inc/e107/master into Mikeygmt/e107
 2018-06-19 12:22:45 +01:00
Cameron
42f63a3be0
Merge pull request #3191 from SimSync/_blank_setup 
Blank SQL + Setup Documentation
 2018-06-15 12:55:49 -07:00