mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-28 00:30:09 +02:00
Code Issues Releases Wiki Activity
12,818 Commits 2 Branches 22 Tags
c9ce6e1bd03f53b394f7ef10b98fbd2bafc00928
Commit Graph

12818 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
oudoken
708e26d97a Issue #3150 
The current user can view his email on user profile page
 2018-06-21 09:27:43 +02: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
Deltik
e6a098cc33 C locale applied to all of e_dateTest 2018-06-09 22:34:49 -05:00
Cameron
f8d74ce2e5 Form select() and option() tests. 2018-06-08 18:55:42 -07: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
68444cdee0 db_verify test placeholders added. 2018-06-07 14:45:19 -07: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
a63b555fd2 Comment out incomplete tests. 2018-05-25 08:52:24 -07:00
Cameron
3e19cca607 Merge branch 'master' of https://github.com/e107inc/e107-test 2018-05-25 08:49:12 -07:00
Cameron
f120fbac7e datepicker test update 2018-05-25 08:48:45 -07:00
Cameron
d023cfc63c datepicker timezone fix. 2018-05-25 08:47:47 -07:00
Deltik
3a05a1d829 Merge branch 'master' of github.com:e107inc/e107-test 2018-05-24 19:43:12 -05:00
Deltik
c0cc29d830 C locale in e_dateTest::testConvert_date() 
Standardized locale in e_dateTest::testConvert_date()
 2018-05-24 19:43:04 -05: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
Nick L
b545736083 Merge pull request #5 from SimSync/master 
Updated testStrptime() to match the result of strptime on linux.
 2018-05-24 20:18:14 +00: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
fc0e302013 Updated testStrptime() to match the result of strptime on linux. 
Should also run fine on windows with the updated e_date::strptime() function.
 2018-05-24 22:04:57 +02:00
Achim Ennenbach
8a6f1f5199 Fix for missing entries in strptime result array on Windows 2018-05-24 21:25:51 +02:00
Cameron
f81fd805a9 additional date mask checks. 2018-05-24 11:50:13 -07: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
6fe881a94f Tests added for e_form renderElement() 2018-05-23 18:50:01 -07:00