3008 Commits

Author SHA1 Message Date
Garvin Hicking
a439423cc9 Patch #233 (manually applied) 2014-11-20 13:18:00 +01:00
Garvin Hicking
0b32e4ddbb prep release 2014-07-25 10:32:02 +02:00
Garvin Hicking
53c085e1ee backport 2014-07-21 12:20:20 +02:00
onli
168499e961 Set 2.0 as beta
Will make complete testing of the autoupdater-plugin for 2.0 easier, including fetching and parsing this file
2014-07-16 12:36:14 +02:00
Garvin Hicking
89b71d51c2 backport rss pubdate 2014-04-25 10:41:05 +02:00
Ian
e12b998bf7 downport 11c3758 2014-03-10 17:54:37 +01:00
Ian
44dfcccca3 make permname more readable 2014-02-27 10:04:03 +01:00
Garvin Hicking
b92657fd54 release 1.7.8 1.7.8 2014-02-09 00:30:36 +01:00
Ian
03d057330a document 3c3f70a 2014-02-08 18:47:20 +01:00
Ian
42c2a61bd4 set nl2br to be identical with 2.0 2014-02-08 17:43:06 +01:00
Ian
3c3f70af6a fix strict typecast ternary by 40aaef8 2014-02-08 16:25:24 +01:00
Garvin Hicking
d4068f6df7 1.7.8-beta1 2014-02-08 16:10:21 +01:00
Garvin Hicking
94437f8b55 fix parse error, prep release 1.7.7 2014-02-06 12:21:18 +01:00
Garvin Hicking
a4ab61c68d next :) 2014-02-06 10:21:21 +01:00
Garvin Hicking
8b4acae8c1 Prepare release 1.7.6 2014-02-06 09:40:03 +01:00
Garvin Hicking
e16735affb Merge branch 'master' of github.com:s9y/Serendipity 2014-02-06 09:38:39 +01:00
Garvin Hicking
40aaef8313 Security fixes and
Merge branch 'master' of github.com:s9y/Serendipity

Conflicts:
	docs/NEWS
2014-02-06 09:38:05 +01:00
Matthias Mees
f2374385f5 2k11 core nav workaround for use with template chooser plugin.
This makes 2k11 always suppress the core nav if template chooser
plugin is installed.
2014-02-04 22:14:55 +01:00
Garvin Hicking
3d64b567f3 templatechooser needs to use default.
will commit NEWS entry with another thing coming up.
2014-02-04 11:29:24 +01:00
Garvin Hicking
e1afbd1cb8 grr conflicts 2014-02-04 11:23:55 +01:00
Garvin Hicking
775cd039d2 Do not use "bulletproof" but rather "default" for fallback. 2014-02-04 11:19:58 +01:00
Ian
dd4b8e09de Fixed nl2br non-working WYSIWYG treatment
and added general markup behaviour INFO notes (Garvin) on how to care by user
2014-02-03 15:03:13 +01:00
Ian
345c81a0a6 textile fix compat fix 9eb675b7e4 2014-01-31 14:04:55 +01:00
Matthias Gutjahr
917c751c08 Added Creative Commons Version 4.0 to options 2014-01-21 09:21:37 +01:00
Garvin Hicking
bd024bdffd prepare 1.7.6 2014-01-18 10:07:47 +01:00
Garvin Hicking
a52458d81f release 1.7.5 1.7.5 2014-01-18 10:00:15 +01:00
Ian
1142042d68 document blah fix 2014-01-17 14:08:58 +01:00
Ian
2b93742917 added default value to spamblocks required_fields option 2014-01-17 13:27:18 +01:00
Matthias Mees
d7e734d106 2k11: Yeah, let's do the scaling thing in preview as well. 2014-01-15 22:12:41 +01:00
Matthias Mees
4cd298d880 2k11: Use proper scaling in landscape mode.
This used to be buggy in iOS6 (although 2k11 includes a JS fix for
it), but is fixed in iOS7. Since using initial-scale=1 makes the
blog far more readable in landscape mode, let's use it now.
2014-01-15 22:08:45 +01:00
Ian
13a8a31050 document 2014-01-15 15:46:36 +01:00
Ian
9eb675b7e4 textile - PHP 5.2 compat workaround 2014-01-15 15:44:41 +01:00
Garvin Hicking
43bcf4f7d3 next 2014-01-11 20:10:06 +01:00
Garvin Hicking
8cf4fde815 release 1.7.4 2014-01-11 19:52:09 +01:00
Ian
9670e3a5c3 textile - better placement warning 2014-01-10 14:57:04 +01:00
Ian
075879d19c extend 7c6ef71 - another space 2014-01-09 16:06:40 +01:00
Ian
7c6ef71f52 2k11 - fix whitespace 2014-01-09 15:55:59 +01:00
Ian
a6545f2a09 dim title color for non-optionized plugins 2014-01-09 14:32:26 +01:00
Matthias Mees
7dd0660df3 2k11: Updated bundled JS plugins to latest version.
Also better minification of bundled JS plugins.
2014-01-08 18:21:36 +01:00
Matthias Mees
cdf3961565 Bump 2k11 update date. 2014-01-08 13:47:31 +01:00
Matthias Mees
83f644d7b9 2k11: Upgrade Modernizr to 2.7.1. 2014-01-08 13:42:26 +01:00
Matthias Mees
15dfff4e79 2k11: Remove pubdate attribute which apparently is deprecated now. 2014-01-08 13:37:48 +01:00
Ian
347c094f82 update current_version libs 2014-01-08 12:43:32 +01:00
Ian
74885d467a textile - downgrade PHP version check, since in core 2014-01-08 10:33:48 +01:00
Ian
befd4263a9 document blah correction 2014-01-07 17:38:29 +01:00
Ian
1434b9a50f document 2014-01-07 16:03:30 +01:00
Ian
33ce3e7f3b document 2014-01-06 17:54:22 +01:00
Ian
778454da01 textile - fix lang typos 2014-01-06 17:45:47 +01:00
Ian
80ee710b6f textile 1.8 - added doctype option 2014-01-06 17:13:00 +01:00
Ian
c1ce562326 textile - better placement note 2014-01-06 12:39:42 +01:00