2619 Commits

Author SHA1 Message Date
Ian
1f9ed0fa2a serendipity_moveMediaDirectory() messages markup 2012-12-03 16:18:29 +01:00
Matthias Mees
7288ffdef8 Fixed most of the redundant br elements in the core. 2012-12-03 13:35:59 +01:00
Matthias Mees
bd8c2bbda0 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2012-12-03 11:22:09 +01:00
Matthias Mees
f11169d396 Ported media_upload.tpl from default. 2012-12-03 11:21:44 +01:00
Ian
a81cf60f79 Merge branch '2.0' of https://github.com/s9y/Serendipity into 2.0 2012-12-03 11:14:41 +01:00
Ian
13c3630ff6 fixed one smarty end and set some operating Parenthesis 2012-12-03 11:14:19 +01:00
Matthias Mees
af251553df Ported media_choose.tpl from default. 2012-12-03 11:10:00 +01:00
Matthias Mees
00a32476f9 Dropped redundant category_selector.js, ported entries.tpl from default. 2012-12-03 11:00:58 +01:00
Ian
bfea00fba4 fixed typo in c8105426 2012-12-03 10:50:14 +01:00
Ian
15a05c8d7c declare array 2012-12-03 10:47:36 +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
Matthias Mees
db2f7ce63e Added icon font and basic CSS for it to 2k11 admin tpl. 2012-12-03 09:56:24 +01:00
Matthias Mees
8397b08b88 Added new backend template files (smartified core tpls and 2k11 admin tpls as well as related assets). 2012-12-03 00:59:42 +01:00
onli
ca61181daa customURI != customURL, let spartacus fail 2012-12-02 18:00:59 +01:00
Ian
9ccb4c6edd fixed sequence js var 2012-12-02 13:03:30 +01:00
Ian
128d85c9a2 fixed if to NO_ENTRIES_TO_PRINT 2012-12-01 20:06:25 +01:00
Ian
8a259eb2ab Merge branch '2.0' of https://github.com/s9y/Serendipity into 2.0 2012-12-01 19:01:00 +01:00
Ian
37403920a2 fixed create new group startform 2012-12-01 18:59:36 +01:00
Ian
4fcc7dc1f6 fixed another two by reference errors 2012-12-01 18:58:50 +01:00
Garvin Hicking
3dd1a40f58 added constant for every language 2012-11-29 16:00:28 +01:00
Ian
68712333e1 added renaming description constant to backend media upload 2012-11-29 14:06:18 +01:00
Ian
a036248d63 added new constant PLAIN_ASCII_NAMES 2012-11-29 14:05:03 +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
Anatoliy Belsky
f574fe1a87 Support port config for postgres db connection
Upport from master
2012-11-28 08:39:10 +01:00
Ian
0f51f5ec4d fixed wrong sidebar array var 2012-11-25 13:38:27 +01:00
Ian
a94b4a618a just to make sure Mattsches... ;-) 2012-11-20 19:40:30 +01:00
Ian
912889fccc upport Garvins Spartacus master fixes and mattches 10a1a5c565 commit,
which could sadly not get cherry-picked! (Possibly being based to a differing parent commit)
2012-11-20 16:36:45 +01:00
Garvin Hicking
ae8c7768ec one more try 2012-11-20 16:30:22 +01:00
Garvin Hicking
082f4b729c try to circumvent a problem 2012-11-20 16:29:52 +01:00
Ian
312c886d62 last commits switch to functions_plugins_admin.inc too 2012-11-20 15:33:36 +01:00
Ian
fb81d6a121 added temporary backend developer template dir switch - Please read:
The smartified code as forked from master to 2.0 being outsourced,
now is to find in /include/admin/tplold, which will still be used as
the default backend template dir.
To switch to the new version, please paste the dirs and files of s9y-admin-tpl
as adviced in the readme and reload, but also add a
```php
	// End of Serendipity configuration file
	// You can place your own special variables after here:

	define('SWITCH_TEMPLATE_VERSION', 'true');

```
to the end of your serendipity_config_local.inc.php.

To switch back to the old smartified files, just set a // to the define().
2012-11-20 14:38:28 +01:00
Matthias Mees
370f30a269 Updated jQuery to v1.8.3. 2012-11-13 15:19:49 +01:00
Ian
d3d557de91 strip down double slashes in prev & next links
see http://board.s9y.org/viewtopic.php?f=10&t=18944
2012-11-12 13:26:05 +01:00
Ian
46e7bcf40d trying to upport garvins entryproperty commit
d4d24c4c315981fd816b16417fe2d1c21cf1d750 and 5a33a7c8d04e6d763b4d478a0b4af37e9d30614e

Sorry I missed that this commit wasn't upported to 2.0, before I tried to cherry pick my tiny fix. Now this had to be done manually.
2012-11-12 12:10:50 +01:00
Ian
a6ac1daff3 fixed last commits array to string 2012-11-12 11:58:30 +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
Ian
802c1dc18e another php5 compat assigned by reference 2012-10-17 18:01:16 +02:00
Ian
3ba8bdc854 another str_replace math issue 2012-10-17 17:59:52 +02:00
Grischa Brockhaus
7d8fdc7db6 ESTRICT double constructor (wrong order of them) 2012-10-16 11:30:51 +02:00
Matthias Mees
7be050e1e2 Updated 2k11 to v1.2.3. 2012-10-15 08:36:10 +02:00
Ian
706ffbe594 fixed PHP5 only variables should be assigned by reference 2012-10-09 20:49:05 +02:00
Ian
878cb2befa fix str_repeat modifier use …
A Smarty3 modifier has higher priority than multiplication, so we have to use () to execute math first
2012-10-07 10:36:12 +02:00
Matthias Mees
1f10d4bc4e Oops, screwed up file permissions reverted. 2012-10-07 10:32:25 +02:00
Ian
475fadf31c fixed groups.inc.tpl wrong {} 2012-10-06 20:29:15 +02:00
Matthias Mees
2ca675a90e Updated 2k11 to v1.2. 2012-10-03 15:42:05 +02:00
Ian
d9647b0086 fixed issue in last 4e56b44 commit 2012-09-27 16:10:06 +02:00
Ian
4e56b4400d some document.write replacements with better method 2012-09-27 15:58:34 +02:00