Commit Graph

35 Commits

Author SHA1 Message Date
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
friendica 67fd539f53 bug #337, call template_unescape() only at the end of template processing 2012-03-17 18:15:36 -07:00
friendica e0e008fb8d template processor broken with foreach k=>v and k is integer 0 2012-03-17 02:26:52 -07:00
Tobias Hößl 635958e11d Merge branch 'master' of git://github.com/friendica/friendica 2012-03-09 10:00:12 +00:00
Fabio Comuni 685686b3e8 template proc: fix variables regexp 2012-03-03 00:00:38 +01:00
Fabio Comuni aef737f376 template proc: allow isolation of var name between [ and ]
$var.name -> $[var.name]
2012-03-02 15:53:48 +01:00
Fabio Comuni 0bf087c895 template proc: remove unused function and commented out code 2012-03-02 12:36:22 +01:00
Fabio Comuni 60e5dda1b5 template proc: first optimization 2012-03-02 12:24:35 +01:00
Fabio Comuni c462ed9fc5 template proc: avoid a notice and allow template name to include to be passed with a variable value 2012-03-01 11:32:49 +01:00
Tobias Hößl 5bb8ed4b8b Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php 2012-02-28 21:56:42 +00:00
Fabio Comuni 42d591d257 revert 01a2791e3a to avoid random preg internal errors. fix contact_template 2012-02-27 18:48:59 +01:00
Tobias Hößl 4b1de0f538 Avoid some notices 2012-02-26 20:43:51 +00:00
Fabio Comuni 01a2791e3a template: add support for variable filters 2012-02-21 11:25:22 +01:00
friendica 8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
Friendika ea0ab6fbac poco should now be spec compliant 2011-10-27 04:38:33 -07:00
Fabio Comuni 8d93eefea8 remove global $lang var in templates. can't work as intended 2011-09-26 12:18:39 +02:00
Fabio Comuni 5792b3d358 Merge branch 'master' into newui 2011-09-26 11:42:48 +02:00
Friendika 63277b57fc template escapes 2011-09-19 19:46:18 -07:00
Fabio Comuni 9d2afc2d3c Merge remote-tracking branch 'friendika/master' into newui 2011-09-16 09:39:29 +02:00
Friendika 3f59f63224 saved searches on search page, templates: Invalid argument supplied for foreach() on line 167 2011-09-08 21:42:52 -07:00
fabrixxm d284f8017c Merge remote-tracking branch 'friendika/master' into newui 2011-09-08 20:15:27 +02:00
Fabio Comuni 49ffd30e1c global lang array in templates 2011-09-08 14:09:45 +02:00
fabrixxm 07b6c868b3 remove javascript to set selectect nav item. enanche img template prefetch ignoring 2011-08-17 18:36:24 +02:00
Fabio Comuni 93eda9d9c1 Initial work on new UI 2011-07-22 17:37:51 +02:00
Fabio Comuni 11d1d309c2 Recursive string replacement in template 2011-07-20 11:05:41 +02:00
fabrixxm 23931ab719 Admin: add translatable strings, remove 'rino' settings, invert 'no'-setings, add "plugin_admin" hook for global plugins settings. add settings to twitter connector as example. 2011-06-18 08:29:59 +02:00
Fabio Comuni ede011cc32 Admin users page. some fix to template processor. 2011-06-16 14:56:43 +02:00
Fabio Comuni 63390aa800 {{ if }} {{ else }} support in templates 2011-06-16 12:02:05 +02:00
Fabio Comuni f80521923d Add {{ if a==b }} and {{ if a!=b }} to templates 2011-06-13 18:02:40 +02:00
Fabio Comuni e14d5851a7 fix template's {{ for }} variable lookup 2011-06-13 12:53:41 +02:00
Friendika e3d1ef8ef7 ability to hide profile and wall from unknown people 2011-05-24 16:30:52 -07:00
Friendika 730322ee5f bug #70 - error messages on group deletion, warning cleanup 2011-05-15 16:36:49 -07:00
Friendika b2e92e0af3 deprecate load_view_file 2011-05-11 04:37:13 -07:00
Fabio Comuni e472d79b1e Reworked template processor. support for "if" "for" and "inc" blocks, also nested 2011-04-21 17:03:19 +02:00
Fabio Comuni 0afef6b17e arrays and simple conditional blocks in template, template for nav, load templates from themes 2011-04-14 09:22:38 +02:00