mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity
3,065 Commits 2 Branches 42 Tags
Commit Graph

3065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
onli
4dc037bac8 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2013-06-01 15:21:51 +02:00
onli
e1d403057b Add Media Category Filter Buttons 2013-06-01 15:21:13 +02:00
Matthias Mees
2e886e9405 Rewrite of category icon onclick handler. 
NOTE: This is not testable right now since something's broken in
      inserting images from the media db.
 2013-06-01 14:52:34 +02:00
onli
cff869e33c add image overlay in ML 2013-06-01 13:42:10 +02:00
onli
9943db95a3 bigger default thumbnail size 2013-06-01 13:27:20 +02:00
Matthias Mees
d4e47e9dd6 Also needs modernizr for no-js class to work properly. 2013-06-01 11:15:38 +02:00
Matthias Mees
da69d6cd2e viewport can't hurt here. 2013-06-01 11:13:11 +02:00
Matthias Mees
00d97e59b3 Use proper doctype and html helper classes. 2013-06-01 11:11:40 +02:00
Matthias Mees
6a9bdd0c6a Removed stupid HTML5/jQuery progress hints. 2013-06-01 11:09:10 +02:00
Matthias Mees
9dd573f971 Improved media db meta info display. 2013-06-01 11:05:40 +02:00
Matthias Mees
bf9a58bdd4 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2013-05-31 23:28:56 +02:00
Matthias Mees
be832ceb4d Externalized click handler for cloning upload form. 
Also fixed duplicated id in upload form and fixed setting the target
directory in cloned form.
 2013-05-31 23:26:37 +02:00
onli
5f565184c1 Dont call smarty->getconfigDir twice 2013-05-31 23:22:25 +02:00
onli
d75de7f627 smartified preview-image generation in media library 2013-05-31 21:16:11 +02:00
Matthias Mees
b4e18b48f3 Found a typo. Ooops. 2013-05-31 21:15:19 +02:00
Matthias Mees
75d45f811f Replaces inline onclick handler for .status_timestamp. 
Also moved reference to serendipity_editor.js before the closing
body element. This way, jQuery's $(document).ready() equals
$(window).load(), so we don't have to use that any longer.
 2013-05-31 18:10:16 +02:00
Matthias Mees
c0e8922500 Dropped redundant onclick handler. 
This really isn't necessary – there is a warning plus a confirm or
abort dialogue on the following page. I don't see extra value for
users in the JS-based confirm/abort dialogue.
 2013-05-31 17:40:34 +02:00
Matthias Mees
66deb345a2 Document what this does. 2013-05-31 17:11:57 +02:00
Matthias Mees
1ab2389cdb Getting rid of inline body onload. 2013-05-31 17:01:06 +02:00
Matthias Mees
a009893522 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2013-05-31 16:36:10 +02:00
Matthias Mees
6507fa5b1d Simplified current template box. 2013-05-31 16:35:53 +02:00
onli
121c796d48 revert 61ae46383effc52b0f4f7470caa3bda29cf9b1fa 2013-05-31 16:10:17 +02:00
Matthias Mees
88e5c9a1ba Extract currently selected template from template list. 
Also skip currently selected template in template list. Note to
self: this needs more styling to set it off better. (If my code
can be improved, please do so. Best I could come up with.)
 2013-05-31 14:47:38 +02:00
Ian
af3c686111 Update serendipity_editor.js.tpl 
uarrgh
 2013-05-31 12:58:18 +03:00
Ian
c980451725 Update serendipity_editor.js.tpl 
Hey, never assume something is “obvious”
 2013-05-31 11:57:01 +02:00
Matthias Mees
ed704a4dd7 Some minor CSS fixes. 2013-05-31 10:58:17 +02:00
Matthias Mees
0c22d50477 Removed some redundant comments. 2013-05-31 10:29:44 +02:00
Matthias Mees
3cff5465d6 Drop legacy IE support. 2013-05-31 10:23:51 +02:00
Matthias Mees
6d0106df22 Updated normalize.css to v2.1.2. 2013-05-31 10:07:47 +02:00
Ian
7316e74b65 upport master → 2.0 in 2k11/serendipity_editor.js.tpl (fixed typos) 
Do not forget to remove engl short (not) notations in js file doc notes, to help github prettifier
 2013-05-31 10:04:08 +03:00
Ian
61ae46383e upport master → 2.0 in 2k11/serendipity_editor.js.tpl 
added CKEDITOR, some better mode switches and re-added noWysiwygAdd() since this was changed and fixed, after the jquery refactoring was done in 2.0.

Note docs should not get removed, sonce this is done automatically in any modifier.
 2013-05-31 08:58:48 +02:00
Matthias Mees
f646621cc8 Styling template options button. 2013-05-30 23:15:25 +02:00
onli
2911e71bc6 Moved theme-settings to own page 2013-05-30 22:56:40 +02:00
onli
5b4146c967 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2013-05-30 22:20:32 +02:00
onli
ae74401668 2k11 is default template, included admin-tpls, and made it installable 2013-05-30 22:19:07 +02:00
Matthias Mees
72a6e9473a Documented a JS error I can't fix right now. 2013-05-30 22:06:42 +02:00
Matthias Mees
7f72419e3c I think that makes the backend noConflict-free. 2013-05-30 21:43:51 +02:00
onli
ff9c31b88e remove remaining tplold-links 2013-05-30 21:00:20 +02:00
onli
615a1300ec only include config if exists, fixes installer 2013-05-30 20:55:20 +02:00
Matthias Mees
6503b98e28 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2013-05-30 20:28:12 +02:00
Matthias Mees
ccd4fca695 No more noConflict, yay. 2013-05-30 20:27:32 +02:00
Ian
75cba2cccd upport master->2.0 default/serendipity_editor.js noWysiwygAdd() 
temporary disbled jquerified function, since this did not support nugget textareas.
 2013-05-30 21:16:13 +03:00
Ian
ab3f3efceb upport master->2.0 default/serendipity_editor.js CKEDITOR and mode switches 
in func serendipity_imageSelector_addToBody

still did not touch my changes within noWysiwygAdd()
 2013-05-30 21:08:14 +03:00
Matthias Mees
992df72fac Some changes to make the console.log thingy work in .tpl file. 2013-05-30 19:19:35 +02:00
Matthias Mees
ddadd81f4a Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2013-05-30 19:07:02 +02:00
Matthias Mees
b2ca3ef066 Include admin_scripts.js in serendipity_editor.js.tpl. 
Also update redundant references in .tpl files.
 2013-05-30 19:06:10 +02:00
Ian
5ae5329de8 Update serendipity_editor.js.tpl 
remove note "..'t" notation, to have github prettify code view back
 2013-05-30 19:54:54 +03:00
Matthias Mees
251f61a039 Disable jQuery noConflict mode in the backend. 
NOTE: If someone can improve this, by all means: do so. And excuse
      my toddler's PHP here.
 2013-05-30 18:44:42 +02:00
Matthias Mees
486985f330 Forgot to dump redundant pluginmanager.css. 2013-05-30 18:25:42 +02:00
Matthias Mees
d0d2b246e4 Include pluginmanager.css in style.css. Another HTTP request saved. 2013-05-30 18:23:54 +02:00