Archived
1
0
Commit Graph

4335 Commits

Author SHA1 Message Date
Matthias Mees 1448313fb8 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0
Conflicts:
	templates/2k11/admin/entries.tpl
	templates/2k11/admin/serendipity_editor.js.tpl
	templates/2k11/admin/style.css
2015-01-17 18:12:15 +01:00
Ian 1480e0a88b ups how come? 2015-01-17 18:11:42 +01:00
Matthias Mees 4ecc125adb Merge branch '2.0' of github.com:s9y/Serendipity into 2.0
Conflicts:
	templates/2k11/admin/entries.tpl
	templates/2k11/admin/serendipity_editor.js.tpl
	templates/2k11/admin/style.css
2015-01-17 18:10:41 +01:00
Ian 709253498a Merge branch '2.0' of github.com:s9y/Serendipity into 2.0
Conflicts:
	include/functions_entries.inc.php
2015-01-17 18:08:19 +01:00
Matthias Mees 0dc96ec9b8 Fix showing cats/tags list overlay on clicking cats/tags list
This was broken due to my recent markup changes. Also added lang
constants for the tags list, but since we could label it better,
introduced new lang constants for it.

References #239
2015-01-17 18:05:20 +01:00
Ian ee50524242 cleanup 2015-01-17 17:53:15 +01:00
Matthias Mees 47afba18cb Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2015-01-17 17:43:38 +01:00
Matthias Mees 7c4f1f1052 Add a 'quick view' for assigned tags to the entry editor
Basically replicates the same functionality as for categories. JS
only. Also revised the markup and JS of that for consistency. Too
lazy to make a generic function for it, we can do that later.

References #239
2015-01-17 17:41:35 +01:00
onli 148c67bf9b Publish now + minor cleanup (closes #262) 2015-01-17 17:26:33 +01:00
Garvin Hicking d80deeb364 to the langs 2015-01-17 16:44:35 +01:00
Matthias Mees ba8eb7eea8 New iconfont build with new 'Publish now' icon
References #262
2015-01-17 16:42:26 +01:00
Matthias Mees 6287ce8f7e Remove text-shadow for 'Publish now' button
References #262
2015-01-17 16:35:58 +01:00
Matthias Mees d626281228 Introduce new lang constant for 'Publish now' button
Add this as title attribute and (hidden) button text for said
button

References #262
2015-01-17 16:25:24 +01:00
Matthias Mees b295e617df Change 'Publish now' button to be a 'normal' icon button
- grey, not green
- new icon, button text hidden
- includes new icon build

References #262
2015-01-17 16:21:42 +01:00
Matthias Mees 4c97a041cc Add overlay min-width for very small images in media db
References #265
2015-01-17 13:46:25 +01:00
Matthias Mees 6dac0b5798 An 'auto'. Just for @ophian. 2015-01-17 13:05:09 +01:00
Matthias Mees a87c0fa755 Fix overflowing plugin names on small resolutions 2015-01-16 12:47:28 +01:00
Matthias Mees 0f2f437c8c A better solution for media file/template info overlays
Since the JS-based solution does not work well for cases where the
overlay is larger than the (very small) image, we'll have to go
with a CSS-based solution. This sets the height of the overlay
to at least 7em, which should cover the core info of the overlay
(which is usually 4 lines of text). Also, we'll have to go with
overflow: scroll; in case the info is longer.

Not a good solution in a reponsive context, but it should work. :(

References #230
2015-01-16 12:27:22 +01:00
Matthias Mees bdea7336ee Clear headings in media file metadata
References #263
2015-01-16 12:18:56 +01:00
Matthias Mees 5fdb253448 Make sure media/template info does not overflow
References #230
2015-01-16 11:55:33 +01:00
Matthias Mees 0eaf9db416 Sync heights of info overlays
This has been an optical issue for both media files and themes,
which is why my original idea to have large preview files would
not have solved it. However, a CSS-based solution would not have
been solid, either, so I went with a few lines of jQuery to sync
the height with the outer container.

References #230
2015-01-15 19:31:55 +01:00
Ian 78d7c4984c Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2015-01-15 17:34:27 +01:00
Ian 4858687501 cv pear update 2015-01-15 17:31:48 +01:00
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
Ian 9ab0e57389 fix not displaying is_sticky flagged entry in dashboard
References #260 and #261
2015-01-15 11:53:44 +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
Matthias Mees 4a730bfcf0 Scheduled entries display publish date in dashboard
Since space if scare in the dashboard, scheduled entries will now
display their publish date instead of the 'Scheduled' badge. The
info that this is a scheduled entry will be available in a tooltip
of the pulish date. This seems like the best compromise on all
devices/resolutions.

References #260
2015-01-14 16:50:44 +01:00
Ian 43676a0918 remove old @ for smarty internal modifiers and stringify and/or fix escape properties 2015-01-14 12:52:20 +01:00
Matthias Mees efed228527 Use rename lang constant MENU_MAINTENANCE
References #50
2015-01-14 12:16:35 +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
Ian 05f14a9f5a fix non-admin user select and delete comments.
Thanks to berberic (forum)
2015-01-12 12:12:03 +01:00
Ian 4433f91e69 set E_STRICT fix for raiseError()
References #256
2015-01-11 17:49:19 +01:00
Ian 57304aa628 cleanup 2015-01-11 15:33:37 +01:00
Ian 1eff19d1b0 use in release versions only 2015-01-11 15:29:53 +01:00
Ian 12325943a1 silence Constant SQL_CHARSET_INIT already defined notices 2015-01-11 15:27:30 +01:00
Ian d758e6b591 fix 9fbb248
Reference #256
2015-01-10 19:56:46 +01:00
Ian 9fbb248531 update to PEAR 1.9.5 and add PEAR5 file
see #256
2015-01-10 17:51:08 +01:00
Ian 6ce61621a4 fix non-existing constant 2015-01-09 19:08:20 +01:00
Ian a2130e3d89 preview iframe fix wrong modernizr version 2015-01-09 16:14:55 +01:00
Ian d49bc18718 remove leftover authorid
@mattsches was this a debug leftover?
https://github.com/s9y/Serendipity/commit/c9e9d93f92f306d316993db1dad883d5835cd0b3
2015-01-06 18:42:38 +01:00
Matthias Mees e29009d1ba Fix mispositioned Akismet block/unblock buttons.
References #247
2015-01-05 23:35:51 +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
Matthias Mees e571ca1def German translation for some untranslated lang constants.
References #50
2015-01-03 11:12:02 +01:00
Matthias Mees e3867132ea Use different icons for spam/no spam in Spamblock plugin.
(Not Bayes like mentioned in c348799a44aa7c05c0009c5fb4fbea101ef6cf84.)

References #247
2015-01-02 18:48:57 +01:00
Matthias Mees c348799a44 New iconfont build.
Includes new icons for Spamblock Bayes plugin.

References #247
2015-01-02 18:35:26 +01:00