5 Commits

Author	SHA1	Message	Date
Nathan Gray	4d2f551a5a	For files inside /apps/appname/id, also make available the placeholders for that application	2012-06-18 15:02:52 +00:00
Nathan Gray	9fd0dd7ff0	Add placeholders {{folder}} for containing folder, {{folder_file}} for {{folder}}/{{file}}	2012-06-05 14:50:22 +00:00
Nathan Gray	2a24a4a53e	Fix url for external links	2012-05-08 15:10:43 +00:00
Nathan Gray	019bfb1c93	Changes to file merge ... - Remove accidentally committed debug - Make URL into web-accessable URL - Add clickable link placeholder - Format custom field date/times according to user preference - Add rel_path placeholder, includes path+name relative to current directory	2012-05-07 15:53:28 +00:00
Nathan Gray	081d93ae51	Implement merge for filemanager	2012-05-03 17:58:16 +00:00