php/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity
3,878 Commits 2 Branches 42 Tags
6f0a9b7123327356503773ed5316c44b9815d1e8
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Garvin Hicking 26673810ec document 2014-05-09 16:35:17 +02:00
Garvin Hicking c49324eeff @mattsches @yellowled @ophian - Please try to remember documenting 
documentworthy changes in our docs/NEWS file. This is important for me
when I write up blog entries about the new changes.

I tried to document every commit up until now.
 2014-05-05 10:07:40 +02:00
Garvin Hicking 7223456b53 i18n title attributes, document some past changes 2014-05-05 10:00:59 +02:00
Garvin Hicking e4a0830ad1 this should maybe fix the error message in importer 2014-04-28 11:14:19 +02:00
Garvin Hicking c73f21ce0d pubdate/pubDate 2014-04-25 10:39:14 +02:00
Garvin Hicking 5e0c4c074e include upgrader timestamp 
document recent changes
i18n for upgrader
 2014-04-25 09:55:41 +02:00
Garvin Hicking 919674e25a i81n for categoryfilter 2014-04-25 09:30:21 +02:00
Garvin Hicking f89b34f2b0 Fix issue #128 2014-04-24 15:28:13 +02:00
Garvin Hicking 063b753892 Proof of concept idea for the "filter category" idea 
http://board.s9y.org/viewtopic.php?f=11&t=19862
 2014-04-24 15:21:25 +02:00
Garvin Hicking 6489cf7bf8 to the future 2014-04-15 11:01:53 +02:00
Garvin Hicking 5660f461e0 backdate 2014-04-15 00:13:03 +02:00
Garvin Hicking a42a7a8f00 Well, this will surely come... - hopefully rather later than earlier ;) 2014-04-14 09:27:09 +02:00
Garvin Hicking e34007c1b7 so it begins 2014-04-14 09:11:41 +02:00
Garvin Hicking 2fc551ac99 Fix serious issue with plugin migration. Config values where not renamed. :( 2014-04-08 11:29:25 +02:00
Garvin Hicking ce724611d5 Yeah, guess I cannot get used to "Themes". 2014-04-08 09:37:18 +02:00
Garvin Hicking 178371eed6 Prepare release 2014-04-08 09:22:30 +02:00
Garvin Hicking 3d92fb099f Prevent fatal error when directory does not exist 2014-04-08 09:13:47 +02:00
Garvin Hicking 78c7b11c36 Change the order, serendipity_editor provides an API that plugins might want to use, so it needs to be declared first in queue. 2014-03-11 15:11:35 +01:00
Garvin Hicking 7bcc9e2e5a addlang execute 2014-03-11 13:32:44 +01:00
Garvin Hicking 55f6786b2e fix #93 2014-03-10 17:41:57 +01:00
Garvin Hicking 50562d49a9 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2014-03-10 17:19:59 +01:00
Garvin Hicking 68b93fd1bc if plugins append to this, we need linebreaks 2014-03-10 12:13:43 +01:00
Garvin Hicking 5aa5b65662 addlang execute 2014-03-07 14:53:33 +01:00
Garvin Hicking a5bd6563dd re-renamed addLoadEvent 2014-03-06 16:00:20 +01:00
Garvin Hicking c3b4fe53e9 add language constants for maintenance 2014-03-05 16:17:24 +01:00
Garvin Hicking 38c19fc150 If updertEntry is called with an array structure, make sure it is usable 2014-03-05 15:37:22 +01:00
Garvin Hicking 8d0b1b79be Ah, the internal /admin hooks need this. Hardcoded check. Not optimal, but should work better than the old approach. 2014-03-05 15:29:31 +01:00
Garvin Hicking d208452096 Make external event plugins work properly again. Genpage should not be used? Will discuss on the forums. 
Also add inactive/active placements to backend
 2014-03-05 14:23:19 +01:00
Garvin Hicking 0c787fcbfe Improve karmaplugin to better tell what's going on. 
Fix a i18n error.
 2014-03-05 14:11:14 +01:00
Garvin Hicking 9bf64cccda example() method needs to RETURN not echo. 2014-03-05 13:28:26 +01:00
Garvin Hicking 79a565f4d9 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2014-03-05 13:23:24 +01:00
Garvin Hicking 94c3a75a96 New language constants, hopefully caught all i18n's. Please check. 2014-03-05 13:22:50 +01:00
Garvin Hicking 703d9f2ce0 Re-add the serendipity_jssetcookie function, because plugin use this API and it would otherwise create a fatal PHP error. 2014-03-05 11:54:00 +01:00
Garvin Hicking 70aea65078 Make accessible tabs remember their last choice. 
Bundled jquery.cookie library for that.
Every TABlist now needs to have a unique ID.
 2014-03-05 11:37:38 +01:00
Garvin Hicking 855c13cb57 fix "scalar" error message 2014-02-28 11:09:32 +01:00
Garvin Hicking 0a9c821500 insert renamed plugin name 2014-02-14 15:05:11 +01:00
Garvin Hicking d36fca5a1e upport 2014-02-06 12:22:20 +01:00
Garvin Hicking 3d7765f066 upport 1.7.6 security fixes 2014-02-06 09:36:31 +01:00
Garvin Hicking 6735dc79fb upport 2014-02-04 11:21:43 +01:00
Garvin Hicking b512c16c7d Patch for APC compatibility, relative paths are bad for stat=0 config. 
Thanks to absynth.
 2013-12-16 23:24:56 +01:00
Garvin Hicking 60556207bf document better :) 2013-11-11 17:14:54 +01:00
Garvin Hicking 28885e75a1 document DLange commit 2013-11-11 16:25:39 +01:00
Garvin Hicking ca84b8b85d backend_footer hook 2013-09-24 13:09:42 +02:00
Garvin Hicking bb7ca06680 document 2013-09-05 09:25:42 +02:00
Garvin Hicking 1f8dc86e76 document 2013-08-28 12:39:13 +02:00
Garvin Hicking df906a343f upport 2013-08-22 12:32:04 +02:00
Garvin Hicking 526e1d2869 upport 2013-08-16 14:58:51 +02:00
Garvin Hicking 17aae92f7f upport 2013-08-15 15:30:56 +02:00
Garvin Hicking 8a4467a33c also available on 1.7 2013-07-23 10:04:05 +02:00
Garvin Hicking c5708f746c Added new event hooks for plugin and template installation/update 2013-07-23 09:46:44 +02:00
Garvin Hicking e72aa19280 upport 2013-07-23 09:34:12 +02:00
Garvin Hicking 9aef3bc41a HOTFIX: We need Smarty. Dunno why this is an issue?! 2013-07-20 16:19:59 +02:00
Garvin Hicking 45ad808d0d port 2013-06-09 20:08:07 +02:00
Garvin Hicking 451601348a upport 2013-06-09 13:40:10 +02:00
Garvin Hicking 42ed0a0345 fix typo 2013-05-09 12:38:05 +02:00
Garvin Hicking 5ec7481030 Port of patch #16 to 2.0 2013-05-06 09:47:19 +02:00
Garvin Hicking f31800fad9 merged pull #15 2013-04-29 13:34:36 +02:00
Garvin Hicking f6295a2e4a document 2013-04-29 13:24:45 +02:00
Garvin Hicking e5905d5b59 port from 1.7 2013-04-29 13:23:24 +02:00
Garvin Hicking 19dad1f586 escape more 2013-02-08 08:38:48 +01:00
Garvin Hicking 63ba9b0431 escape hotlinked image 2013-02-08 08:29:48 +01:00
Garvin Hicking e50879f5a3 upport 2013-02-07 12:39:44 +01:00
Garvin Hicking 71ee300143 Purge browser cache using a timestamp variable when switching templates. 
This should hopefully fix Ian and my problems.
 2013-01-28 09:35:34 +01:00
Garvin Hicking 53ea38aa3c Port from master 2013-01-21 10:06:09 +01:00
Garvin Hicking 19042479fb typo fix by qbi 2013-01-01 21:20:31 +01:00
Garvin Hicking ebd361c201 Insert/transfer variable from smarty to JS 2012-12-07 15:02:12 +01:00
Garvin Hicking c810542654 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2012-12-03 10:21:02 +01:00
Garvin Hicking aff47d1d48 For yellowled: Remove this strange cloning dependency, port it to jquery. 
Also remove as much inline JS as possible and move it into serendipity_editor.js
Got rid of category_selector JS file, as I prefer the single serendipity_editor.js file

NOTE: Those changes will need to be ported/merged into the 2k11 style, I think?
 2012-12-03 10:18:04 +01:00
Garvin Hicking 3dd1a40f58 added constant for every language 2012-11-29 16:00:28 +01:00
Garvin Hicking 48993971f2 Merge pull request #12 from weltling/2.0 
Support port config for postgres db connection
 2012-11-27 23:56:08 -08:00
Garvin HickingandIan ae8c7768ec one more try 2012-11-20 16:30:22 +01:00
Garvin HickingandIan 082f4b729c try to circumvent a problem 2012-11-20 16:29:52 +01:00
Garvin Hicking 94c4f32b08 backport 2012-11-06 11:25:39 +01:00
Garvin Hicking ffd034811d PHP5 compat 2012-10-18 11:19:58 +02:00
Garvin Hicking 9adcfecc38 More PHP5 compatibility (this constructor thing order did not remove the error for me) 
Also be able to set $serendipity['production'] in serendipity_config_local.inc.php
 2012-10-18 10:14:04 +02:00
Garvin Hicking f1b3e3b241 backport 2012-06-13 15:22:57 +02:00
Garvin Hicking 3a3702f7a4 spartacus backport 2012-06-12 20:56:11 +02:00
Garvin Hicking 6899fa3026 spartacus error fix 2012-06-12 20:55:54 +02:00
Garvin Hicking f12f53aaab Damn, why does cherry picking not work? 2012-06-12 20:51:57 +02:00
Garvin Hicking 937454899c Reduce error reporting, else s9y will not run with PHP 5.4 2012-06-12 20:43:49 +02:00
Garvin Hicking 286a24b8cc once again, with feeling 2012-06-12 20:19:38 +02:00
Garvin Hicking 14885379da once again, with feeling 2012-06-12 20:19:29 +02:00
Garvin Hicking 20d50eb2b7 * Improved RSS sidebarplugin to support Atom 2012-06-12 20:16:10 +02:00
Garvin Hicking e6efd5eaf3 * Improved RSS sidebarplugin to support Atom 2012-06-12 20:15:47 +02:00
Garvin Hicking 56a96ecf6c bundle simplepie 2012-06-12 20:01:59 +02:00
Garvin Hicking c49f1c6597 bundled simplepie 2012-06-12 20:01:11 +02:00
Garvin Hicking 58e2cd8c37 porting stuff 2012-06-12 19:39:38 +02:00
Garvin Hicking d7ef7a7a04 port everything so that 2.0 and 1.7 have the same features 2012-06-12 19:39:11 +02:00
Garvin Hicking b0271a56d9 Merge branch 'master' of git@github.com:s9y/Serendipity 2012-05-25 10:23:31 +02:00
Garvin Hicking ba4b629816 ISO-8859-1 fallback patch so that my blog works ;) 2012-05-25 10:14:47 +02:00
Garvin Hicking be0b6797ad temporarily revert to default to "false" until kinks are worked out (see board thread) 2012-05-23 15:14:11 +02:00
Garvin Hicking d3b6906ffc add language constant for all languagues. 
Please ALWAYS add language constants to all files (using addlang.sh i.e.)
 2012-05-22 13:30:14 +02:00
Garvin Hicking 09e9322666 * Fix SQL injection for comment.php used in read-context. 
(Thanks to High-Tech Bridge SA Security Release Lab, Advisory HTB23092)
 2012-05-16 11:59:39 +02:00
Garvin Hicking 7b552d2df9 * Fix SQL injection for comment.php used in read-context. 
(Thanks to High-Tech Bridge SA Security Release Lab, Advisory HTB23092)
 2012-05-16 11:59:02 +02:00
Garvin Hicking 9832c2a95b Merge pull request #9 from mmatuska/master 
Add Slovak translation
 2012-05-13 06:25:17 -07:00