php/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity
4,314 Commits 2 Branches 42 Tags
78d7c4984cebf18bce1c95a66ba27da36a8b39f6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Garvin Hicking a8e61fe115 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2015-01-15 15:39:17 +01:00
Garvin Hicking 1b9e5de787 * Prevent entryproperties from saving/displaying a browser-side 
stored password that was actually not set.
[THIS BUGGED ME FOR A SOOOOO LONG TIME!]

    * Stronger check for existing logger interface to prevent errors
      when it is not actively used.
 2015-01-15 15:39:00 +01:00
Garvin Hicking b07a835629 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2015-01-15 10:17:03 +01:00
Garvin Hicking 8b51c37b98 Address issue #261 
Prevent resetting entryproperties when using serendipity_updertEntry
 2015-01-15 10:13:53 +01:00
Garvin Hicking 0cce75c47c more debugging for @yellowled 2015-01-12 13:43:57 +01:00
Garvin Hicking d6ac2aacf0 document 2015-01-12 13:26:19 +01:00
Garvin Hicking 7f6194e195 * Patch PEAR.php to use "static" isError declaration to prevent 
PHP error messages
 2015-01-05 12:44:58 +01:00
Garvin Hicking adfb237b4a fix wrong IF-order 
We'll need to also apply that to all additional_themes
 2015-01-05 11:37:29 +01:00
Garvin Hicking afa74da11c fix fulltext search for types other than mysql 2015-01-05 11:22:22 +01:00
Garvin Hicking 2944725b69 language constants 2015-01-02 09:26:43 +01:00
Garvin Hicking ff3cd29f2a document past changes, did I miss anything? 2015-01-01 15:01:02 +01:00
Garvin Hicking d35b4d127d Fix wrong parameters to serendipity_entity_decode() 2014-12-23 11:33:41 +01:00
Garvin Hicking 2f631807fe Fix conflicts. 
Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Conflicts:
	docs/NEWS
 2014-12-19 09:56:10 +01:00
Garvin Hicking c8e147874b Move around searchTerm escaping, document. 2014-12-19 09:55:34 +01:00
garvinhicking c3d060c973 Move logger init to seperate funtion so that its PHP 5.3+ syntax does 
not fatally break the serendipity_config.inc.php parsing on PHP5 5.3-.
Also create a reasonable error message when running on an old version.
 2014-12-15 10:13:10 +01:00
Garvin Hicking 3010116e97 New lang constant for PHP version bail 2014-12-15 09:58:36 +01:00
Garvin Hicking 48c9089f77 pre release again 2014-12-11 13:26:12 +01:00
Garvin Hicking 698c6ce698 update our changelog with some recent changes 2014-12-10 10:11:16 +01:00
Garvin Hicking b835364dfd remove wysiwyg note 2014-12-02 13:42:25 +01:00
Garvin Hicking 21b277bd1c Add missing i18n constants 
prepare rc1
 2014-11-29 11:59:47 +01:00
Garvin Hicking cc6e5ec94d Fix wrong constants being utilized, thanks @yellowled 
References #148
 2014-11-27 09:37:52 +01:00
Garvin Hicking 325de34183 Only remove "system32" and not paths like "imagemagicksystem32", we don't want to strip parts here that a user COULD possibly pick. 
Also remove my check, because it's obsolete now.
 2014-11-24 11:52:52 +01:00
Garvin Hicking affa3a3638 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2014-11-24 11:48:27 +01:00
Garvin Hicking 4d17c0ae02 Added SQLite3 OO layer, old one did not work for PHP 5.4+ 
PDO SQlite3 is preferrable though
 2014-11-24 11:48:16 +01:00
Garvin Hicking 2e1240ba22 1. Reject system32\convert.exe calls 
2. Make mysqli be the selected default when installing (PHP at some point will deprected mysql, so better start now to advertise mysqli)
3. Prepare SQLite3 DB Layer
 2014-11-24 11:26:44 +01:00
Garvin Hicking 73f417fe39 Check for ENT_HTML401 existance to make the patch work with PHP 5.3 2014-11-24 11:18:21 +01:00
Garvin Hicking eab43b12f5 Adjust remaining htmlspecialchars() accordingly 2014-11-24 10:13:40 +01:00
Garvin Hicking 26535ec09c Patch remaining usages of html_entity_decode 
Document
 2014-11-24 09:57:47 +01:00
Garvin Hicking b41bda08bd Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2014-11-21 09:41:21 +01:00
Garvin Hicking 313a843836 i18n, fix dutch file, add missing recode files, adjust names/titles of the wysiwyg toolbar options 
german translation
 2014-11-21 09:40:42 +01:00
Garvin Hicking 4bac189d6d Patch #233 manually applied 2014-11-20 13:18:47 +01:00
Garvin Hicking 33dafbd085 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2014-11-18 12:33:11 +01:00
Garvin Hicking c0daacc6dc Added i18n files 
(hopefully complete?)
 2014-11-18 12:32:42 +01:00
Garvin Hicking ec09fa2607 document 2014-11-18 12:27:49 +01:00
Garvin Hicking a24940a095 pointer to document this 2014-11-18 12:27:14 +01:00
Garvin Hicking 50c42997cf Move default-php and default-xml to spartacus 2014-11-17 09:41:48 +01:00
Garvin Hicking d414125098 Remove test template, obsolete 2014-11-03 10:20:56 +01:00
Garvin Hicking 35628a3e2c Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 
Conflicts:
	docs/NEWS
 2014-11-02 15:21:23 +01:00
Garvin Hicking 9944cbb0a7 Make PAT_JS mod_rewrite pattern be recognized to .htaccess to prevent ErrorLog entries for looking up such URLs. 
Bumps version to beta6 and will recreate .htaccess file
 2014-11-02 15:20:21 +01:00
Garvin Hicking 55c321b678 Added "archives" path to release structure 2014-10-26 20:34:19 +01:00
Garvin Hicking feb1a8325d Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2014-09-12 13:49:40 +02:00
Garvin Hicking dc53c4f0dc check autosave also here 2014-09-11 13:02:01 +02:00
Garvin Hicking 971b993a52 Re-add check if serendipityPath is writable in installer. Don't remember why we declared this as bogus. 2014-09-09 15:07:43 +02:00
Garvin Hicking 5c12922510 Personal preferene for autosave 
References #213
 2014-09-09 14:34:46 +02:00
Garvin Hicking da82fd3a16 support imagemagick thumb parameters, slightly reworked 
references pull request #205
 2014-09-09 13:58:09 +02:00
Garvin Hicking b606b91272 Proper SQLite PDO filenames in shared installations (Issue #214) 
References #214
 2014-09-09 13:17:34 +02:00
Garvin Hicking 9b89c3d815 Another stab at fixing Issue #201 
When no categories are delivered to serendipity_updertEntry this can mean two things:
- categories need to be un-assigned
- categories where not addressed/fetched/passed to the function [see include/admin/overview.inc.php for publishing a post! Or plugins like freetag, using serendipity_updertEntry]

To address this a new serendipity[had_categories] is added to the backend template, which can be checked for.

Feedback appreciated!
 2014-08-08 14:23:19 +02:00
Garvin Hicking f9bddffc3e Rework code to work with array. 
References Issue #201
 2014-08-08 10:59:40 +02:00
Garvin Hicking e4a44c3663 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2014-08-08 10:56:16 +02:00
Garvin Hicking 5fdff4c671 Bugfix for not properly setting entry.cats in entry overview 
References #201
 2014-08-07 10:53:18 +02:00
Garvin Hicking b85e007b85 Add missing constants 2014-08-04 13:36:18 +02:00
Garvin Hicking 938d7144c5 implement patch by @fugue88 
References #199
 2014-08-04 12:11:07 +02:00
Garvin Hicking 2217826e56 pre next 2014-07-25 10:47:37 +02:00
Garvin Hicking c920aff4c7 Added i18n for new strings 2014-07-25 10:22:20 +02:00
Garvin Hicking da1bf30532 Prepare beta3 for tomorrow. Speak up if you see anything against this. 2014-07-24 11:06:20 +02:00
Garvin Hicking 626d984054 Fix #198 - entry pagination off by one 2014-07-23 09:25:13 +02:00
Garvin Hicking 9459c393df Use proper "generator" metatag. Do not expose version number if not configured. 2014-07-21 12:11:55 +02:00
Garvin Hicking 41388a4a7e we have a problem with a required "PEAR5.php" since this upgrade. 
We need to bundle this. I'm short on time, need to remember creating
an issue for this please.
temporary hotfix: Always use PEAR and not PEAR5
 2014-07-13 18:51:49 +02:00
Garvin Hicking 83d19d183d stricter array check, thanks to wesley 2014-07-11 11:58:07 +02:00
Garvin Hicking 12e9171e7d Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2014-06-25 13:23:15 +02:00
Garvin Hicking 63f7510ebd References #134 
Fixes thumbnail regeneration, only a problem with proper execution order
 2014-06-25 13:22:39 +02:00
Garvin Hicking 6b1b4f2448 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2014-06-25 13:07:52 +02:00
Garvin Hicking c2e3b5a038 should fix the parse error at least 2014-06-25 13:07:21 +02:00
Garvin Hicking 33193806ed References #189 
Combine additional jquery/plugin files into one
Remove single file references
Moved dragdrop.js to serendipity_Editor.js.

Please test. Might make trouble in the installer/upgrader?
 2014-06-25 12:28:59 +02:00
Garvin Hicking 32b7bb9679 * Adapted database table structure change for statistics, shoutbox, 
karma and spamblock plugin (for new field definition of "ip" field)
      Thanks to rohdef!
 2014-06-23 09:37:52 +02:00
Garvin Hicking c0047ebf97 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2014-06-17 12:26:01 +02:00
Garvin Hicking 6fe42449dd support pgsql 2014-06-17 12:25:44 +02:00
Garvin Hicking f5693b0b86 Added "clean" new option for using backend popups (disabled by default) as a per-user option 
References #183
 2014-06-17 09:50:26 +02:00
Garvin Hicking 3079caf246 The js/backend_js will not get properly executed when the staticpage plugin is used, 
as this generates a 404 error header. Browsers do not execute JS when the header is 404.
Fixes bernd's problem with the freetag autocompletion.
Things always get funny. :-)
 2014-06-16 13:50:18 +02:00
Garvin Hicking 6886e38103 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2014-06-12 15:52:34 +02:00
Garvin Hicking cbcb4ef59a change enablePopup description to clarify, added new lang constants 2014-06-12 15:52:17 +02:00
Garvin Hicking 47b768b7d7 Merge pull request #181 from th-h/thh-htmlvalidation 
Some changes for valid HTML5/HTML5.
 2014-06-12 15:08:55 +02:00
Garvin Hicking 7f24732078 also block wayback 2014-06-12 15:06:12 +02:00
Garvin Hicking bbf1456fd8 also block archive.org bot 2014-06-03 14:03:42 +02:00
Garvin Hicking 20cf96e969 move "smarty preview" to actual case, should fix the "entry saved" missing message 2014-06-03 11:09:00 +02:00
Garvin Hicking 35c3541d70 Remove approve-button 
Add current karma to output
 2014-06-02 10:09:29 +02:00
Garvin Hicking 4471b1ac32 * Improved installer to forbid using database table prefixes with 
special characters
 2014-05-28 14:27:00 +02:00
Garvin Hicking 93d117b45d Move serendipity_html5time definition to usual function scope for better structure 2014-05-28 12:01:26 +02:00
Garvin Hicking 1b37e41e00 Issue #165 - allow to set configuration of children to their parents config, but on their own names. 
Global options (navigation) are even carried through so that they use the central part.
This falls back in place rather nicely, I hope it REALLY works. My first tests showed no issues.
 2014-05-28 11:48:56 +02:00
Garvin Hicking d1881e474f i18n 2014-05-28 10:38:04 +02:00
Garvin Hicking 0d43f5dea7 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2014-05-28 10:37:16 +02:00
Garvin Hicking ffb1a0769a fix typo, i81n 2014-05-28 10:37:00 +02:00
Garvin Hicking dab92bdca6 * Adapted serendipity_editor.js to provide more global (though 
deprecated) API access methods for plugins like amazonchooser
      and linktrimmer, to perform insertion. Also fixed the
      insertion of text when the ID of the element is not prefixed

(You may need to reload your browsercache to get the new JS)
 2014-05-26 12:07:29 +02:00
Garvin Hicking 4c965bd2d5 Rephrased this to make it a bit shorter, more suitable for the NEWS-file IMO. 
More details could better be added to the Wiki at some place/point for proper documentation (duh).
 2014-05-23 17:35:29 +02:00
Garvin Hicking 0e008d0885 This should make jquery.js of a theme no longer be included for the default backend. 
Custom backends would now use jquery_backend.js if they really wanted to provide their own.

References #166
 2014-05-22 11:59:50 +02:00
Garvin Hicking e8bae220e6 A proposal on how 2k11 could utilize pre-event hooks. Now per-event so that the function name no longer 
clashes with child-themes that need to include the 2k11 config.inc.php.
 2014-05-22 11:44:25 +02:00
Garvin Hicking f96f0da3f8 Added dev test templates for specific scenarios. 
Please read http://board.s9y.org/viewtopic.php?f=11&t=19916

Choosing those templates will probably currently result in errors that need to be addressed.
 2014-05-22 11:20:12 +02:00
Garvin Hicking e6320100e8 Provide language constant. 2014-05-22 10:49:36 +02:00
Garvin Hicking 13d8f5fd7c addlang execute, reset textfile 2014-05-19 11:14:11 +02:00
Garvin Hicking 6c06651759 add languages 2014-05-19 11:13:53 +02:00
Garvin Hicking eb07593088 Change logger to only be instantiated when explicitly enabled to not cause unneccessary debugging 
especially in dev-installations
References #131
 2014-05-19 11:12:47 +02:00
Garvin Hicking 2c5c3eddbf Switch back versions to release versions (also show CVS ids), re-added patch for PEAR 2014-05-14 14:38:04 +02:00
Garvin Hicking a7fdf52eaf Fixed wrong local documentation URL in plugin configuration 2014-05-14 13:37:27 +02:00
Garvin Hicking 1100364efd Added {serendipity_hookPlugin hook="backend_dashboard" hookAll="true"} hook. 2014-05-14 13:21:50 +02:00
Garvin Hicking d4fb7207aa Port fix from wordpress to this 2014-05-14 13:02:29 +02:00
Garvin Hicking 6f0a9b7123 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2014-05-14 12:59:42 +02:00
Garvin Hicking dd83225447 This is my proposal on implementing the ability to switch frontend and backend templates independently. 
- This introduces a new option "template_backend" that will be set to indicate the backend template, defaults to 2k11.
- The "Engine: xxx" line in info.txt still works, but only for the frontend
- The frontend fallback chain defaults to the old "default" template to ensure that themes will work that have "old-style" HTML output
- The backend fallback chain only falls back to 2k11 and then "default"
- In the future, we will remove templates/default/admin once the mechanism is proven stable

To test this in all cases you can:

- Copy 2k11/ to 2k11-custom, edit info.txt, give it a distinct name. Edit the admin/index.tpl file to add some code to ensure that you will see that template in the backend if you pick it, or adjust the style.css or whatever.
- Copy idea/ to idea-custom, edit info.txt, add a "Engine: 2k11" line. Now you can test how a template would look like that fallsback on 2k11 instead of "default"

Those permutations can be checked and come to my mind:

- Backend: 2k11, Frontend: 2k11
- Backend: 2k11-custom, Frontend: 2k11
- Backend: 2k11, Frontend: 2k11-custom

- Backend: 2k11, Frontend: idea
- Backend: 2k11, Frontend: idea-custom

- Backend: 2k11-custom, Frontend: idea
- Backend: 2k11-custom, Frontend: idea-custom

They seem to work.

Currently the display of backend and frontend theme in templates.inc.tpl takes up some larger space. Maybe it could be prettified somehow, maybe put frontend and backend template next to each other, not beneath each other? Maybe @yellowled has some suggestions.

@onli and @ophian - please have a look at this, since you both also worked on the fallback chains. Please tell me if you have issues with this. We can easily revert, if you see this approach as not workable. This is more a "proof of concept" draft.
 2014-05-14 12:58:06 +02:00
Garvin Hicking a6b20ad398 UTF-8 versions 2014-05-14 12:57:57 +02:00
Garvin Hicking 02d2fff162 Language commit for frontend/backend distiction 2014-05-14 12:57:37 +02:00
Garvin Hicking 3bde48937f damnit garvin, it's THEMES now for a collection of template files, no longer TEMPLATE. :D 2014-05-12 16:48:03 +02:00