mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-02-20 06:24:42 +01:00
Code Issues Releases Wiki Activity
10,749 Commits 3 Branches 22 Tags
Commit Graph

10749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Cameron
a9a4781ef0
Merge pull request #3190 from SimSync/mysql_check_index 
Mysql check index, DB Verify
 2018-06-15 12:55:37 -07:00
Achim Ennenbach
e1920c740a toMySQL() added keyname to index if available 
getIndex() now supports also the INDEX keyword
 2018-06-15 19:05:15 +02:00
Achim Ennenbach
4f568aec52 Added a help block at the beginning of the file, 
which informs about how it works and what is supported.
 2018-06-15 18:58:15 +02:00
Cameron
52e02087ae Issue #3096 - user theme preference check. 2018-06-14 17:03:03 -07:00
Cameron
a909cb8097
Merge pull request #3183 from oudoken/master 
Fixes #3151 add an e_output option to plugin class
 2018-06-13 11:55:58 -07:00
Tijn Kuyper
a56ffe0e58
Allow for copying forum categories in admin area 2018-06-13 14:48:36 +02:00
oudoken
fbdbd4b1ca Issue #3151 add an e_end to plugin class 
V2 renamed based on Cameron suggestion
 2018-06-12 18:09:00 +02:00
oudoken
ff3dc03a81 Issue #3151 add an e_end to plugin class 2018-06-12 11:07:21 +02:00
Cameron
2b24346a8a Form handler - select() - support for disabled items. 2018-06-08 18:55:04 -07:00
Achim Ennenbach
a7f1271eb4 Implemented upgrade_required() method as defined in forum_setup.php 
Added some documentation on how to check for tables, fields and indexes
and how to remove fields and indexes
 2018-06-08 23:02:36 +02:00
Achim Ennenbach
eeaa9b22a8 New method to check table indexes 2018-06-08 22:59:24 +02:00
Cameron
a1469aad5e Issue #3175 GDPR work. 2018-06-05 12:55:20 -07:00
Cameron
33f8b885fe
Merge pull request #3164 from SimSync/issue_3152_public_upload 
Fixes #3152 Download / Upload categories problem
 2018-06-02 12:47:45 -07:00
Cameron
ad3e416254
Merge pull request #3160 from SimSync/issue_3136 
Fixes #3136 insert media-manager glyph doesn't insert anything in tinymce editor
 2018-06-02 12:46:03 -07:00
Cameron
7ddd23712e
Merge pull request #3159 from SimSync/issue_3135 
Fixes #3154 Comments not refreshing on submission
 2018-06-02 12:45:28 -07:00
Achim Ennenbach
8d41cd6956 Fixes #3152 
Made category editable (dropdown)
Made screenshot not required on public upload
 2018-06-01 19:00:17 +02:00
Achim Ennenbach
3a228c0181 Possible fix for issue e107inc/e107#3152 
Makes the category field editable (dropdown) so a download category can be assigned.
 2018-06-01 18:16:48 +02:00
Achim Ennenbach
4978a0603d Fixes #3136 
Tinymce introduced with version 4.7.10 an issue that prevents the e107 media manager to work correctly.
Reverted back to Tinymce version 4.7.9
 2018-05-31 20:51:44 +02:00
Achim Ennenbach
7470aa4e0b Fixes #3154 
Added missing 6th argument which throwed an exception
 2018-05-31 20:48:03 +02:00
Cameron
82a662b13c
Merge pull request #3153 from SimSync/master 
Closes #2265 User Extended Field for Date does not allow entry
 2018-05-30 08:16:52 -07:00
Achim
a97d58ae44
Closes #2265 User Extended Field for Date does not allow entry 
This fix closes issue e107inc/e107#2265 which pops up only when the JS files are cached (compressed).
There was a ";" missing at the end of the file after (jQuery).
 2018-05-30 12:32:32 +02:00
Cameron
bab26e7762 datetimepicker() assumes the timezone to be that of the browser, which can pose problems in some situations. Now we can set a different timezone for the datepicker input and the UTC value will be automatically adjusted. eg. writeParms = array(type='datetime', 'timezone'=>'America/Los_Angeles') 2018-05-25 19:00:55 -07:00
Cameron
d023cfc63c datepicker timezone fix. 2018-05-25 08:47:47 -07:00
Cameron
78213c4a31
Merge pull request #3145 from SimSync/master 
Fix for missing entries in strptime result array on Windows
 2018-05-24 15:49:53 -07:00
Cameron
998a8fe7c3 JS datetimepicker() updated to latest version. Fixed datetimepicker() to respect the e107 timezone setting while saving as UTC. ie (admin > prefs > Date Display Options ) or the user's timezone setting (usersettings.php when the timezone user-extended field is enabled) . 2018-05-24 15:16:02 -07:00
Cameron
8327acb33e Tweak e_user.php 2018-05-24 13:14:48 -07:00
Cameron
171a914acf Experimental e_user.php code added. 2018-05-24 13:05:43 -07:00
Achim Ennenbach
8a6f1f5199 Fix for missing entries in strptime result array on Windows 2018-05-24 21:25:51 +02:00
Cameron
429413093e
Merge pull request #3142 from Deltik/fix-3135 
Downloads plugin compatibility with PHP 5.4, 5.5
 2018-05-24 10:46:02 -07:00
Cameron
b06d67d0a1 Date handler. Reduce usage of strptime(). Date format conversion from strftime() > DateTime added to toMask() method. 2018-05-24 07:39:54 -07:00
Cameron
0c1ab45835 Form Handler Fixed drop-down 'empty' value check. 2018-05-23 18:47:34 -07:00
Nick Liu
25310a901b
Downloads plugin compatibility with PHP 5.4, 5.5 
- FIX: Avoided use of PHP 5.6 feature in Downloads plugin's
       NginxSecureLinkMd5Decorator

Fixes: #3135
 2018-05-23 19:37:00 -05:00
Cameron
aa53328ef0 Issue #2222 - User Ranks experimental admin area moved to stable. 2018-05-23 17:02:33 -07:00
Cameron
d7e3caae83 Admin-ui: Improved adminMenu highlighting when custom uri in use. 
Plugin Builder: added menu divider example.
 2018-05-23 16:29:37 -07:00
Cameron
d512035eb6
Merge pull request #3130 from SimSync/master 
Fixed smaller issues in date_handler.php
 2018-05-16 14:07:34 -07:00