2550 Commits

Author SHA1 Message Date
Grischa Brockhaus
e72c90a69d Merged branch 'master' into 2.0 (compatibility fixes) 2012-06-13 15:12:35 +02:00
Grischa Brockhaus
1f9630b394 Compatibility fixes. 2012-06-13 14:24:45 +02:00
Grischa Brockhaus
0407a731de Compatibility fixes 2012-06-13 12:47:16 +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
Ian
dbc992f07e bugfix release Smarty 3.1.10 2012-06-09 18:24:23 +02:00
Ian
508caabbc5 bugfix release Smarty 3.1.10 2012-06-09 18:22:13 +02:00
Grischa Brockhaus
d2e7153fdc event_mailer: fixed error in language file. 2012-06-09 15:12:53 +02:00
Ian
f6ad1903b7 keep up with master 2012-06-09 11:02:53 +02:00
Ian
4ed69a6187 NEWS cleanup 2012-06-09 10:57:29 +02:00
Ian
65fae5d1b6 cleanup NEWS 2012-06-09 10:51:26 +02:00
Ian
612a7260fc Smarty update to 3.1.9 - see changeLog 2012-06-09 10:43:58 +02:00
Ian
708f4d6073 Smarty update to 3.1.9 - see changeLog 2012-06-09 10:40:49 +02:00
Ian
7294e9679c javascript loading quotes 2012-06-08 14:33:51 +02:00
Ian
7a51ea663e OUT_STACK now supports config_groups magic again 2012-06-08 14:19:04 +02:00
Ian
3ec4c55ec0 captured smartified example method 2012-06-08 10:43:22 +02:00
Ian
ba2214598c outsourced backend header javascript 2012-06-07 17:54:33 +02:00
Ian
5f9d9d7690 small js fix and renaming 2012-06-05 19:11:46 +02:00
Ian
c48e8d3860 bump version 2012-06-05 17:47:23 +03:00
Ian
14dfcca0ba removed br linebreak 2012-06-05 17:46:25 +03:00
Ian
d47e948acf removed br linebreak 2012-06-05 17:44:26 +03:00
Ian
4a4d6a4279 outsourced some javascript and restrict multidelete images to adminModule == 'media' only 2012-06-04 15:30:32 +02:00
Ian
1ebbeeef36 fixed smartification pluggroup name 2012-06-03 11:51:31 +02:00
Ian
a0269794c5 note to 2.0 2012-06-02 11:50:19 +02:00
Ian
e0f5068190 fetch to display 2012-06-02 11:44:17 +02:00
Ian
a1d77c4916 group.inc.tpl - fixed missing CONSTANT 2012-06-01 21:06:12 +02:00
Ian
cccd3aca57 no need for assignment 2012-06-01 20:24:08 +02:00
Ian
4bc7f98285 removed tpl {continue} spaces 2012-06-01 17:45:15 +02:00
Ian
85690d6411 fixed entries.inc.tpl - select user smartification bug 2012-06-01 17:21:29 +02:00
Ian
c45fc7181b groups.inc.tpl - some better use of booleans 2012-06-01 15:42:57 +02:00
Ian
064506d6f9 group.inc - fixed some possible typos 2012-06-01 15:29:06 +02:00
Ian
d3e3ef3516 removed now obsolet internal function allowments 2012-06-01 14:57:56 +02:00
Ian
d2d2470716 simplification, fixes, additions and changes to entries.inc.php/tpl 2012-06-01 14:22:54 +02:00
Ian
be75b1fd9b Do not forget to update master RELEASE file in case of new releases!
Dashboard relies on this...
2012-05-31 13:44:03 +03:00
Ian
874014747a fixed lang typo of last commit 2012-05-29 20:54:40 +02:00
Ian
a956471a44 added to MediaLB multidelete[] 2012-05-29 20:39:23 +02:00
onli
302bb8ee08 conflict resolution 2012-05-27 12:38:51 +02:00
onli
948d2f43c8 stable archive sort: included in fetchEntries, working with categories -> more native approach 2012-05-27 12:36:26 +02:00
Ian
326957d732 fixed typo in note 2012-05-25 11:05:37 +02:00
Garvin Hicking
b0271a56d9 Merge branch 'master' of git@github.com:s9y/Serendipity 2012-05-25 10:23:31 +02:00