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
friendica
f1bf6dcdfb
expand multiple heart smilies e.g. <3333
2012-03-02 01:24:20 -08:00
fabrixxm
3a609adfb7
Merge pull request #55 from fabrixxm/master
...
Some minor and one majior mod in templates
2012-03-02 00:00:03 -08:00
friendica
8207272fbc
Merge branch 'pull'
2012-03-01 18:54:50 -08:00
friendica
58e3372b23
probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type
2012-03-01 18:49:23 -08:00
Alexander Kampmann
dd9432903d
Merge remote-tracking branch 'upstream/master'
2012-03-01 11:49:22 +01:00
Fabio Comuni
b6b7742579
Merge remote-tracking branch 'friendica/master' into randomerror
2012-03-01 11:47:45 +01:00
Fabio Comuni
ed42fa7d59
conversation: remove templating items in code and move it to template.
2012-03-01 11:46:08 +01:00
Alexander Kampmann
e0c659b34b
Enabled automated doc building. Changes:
...
-build.xml, phing build file
-@package tags at acl_selector.php and db_update.php
-added documentation and some IDE files to .gitignore
-automated tool to find files that corrupt the doc build process
-removed ansi characters from SSH1.php, docBlox could not handle them
2012-03-01 11:44:33 +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
friendica
bd2c8c92f1
yet more work on notifications
2012-02-29 19:23:01 -08:00
friendica
bbebb4c2a0
notification enhancements
2012-02-29 18:19:08 -08:00
friendica
21803e0cd3
call time pass by reference deprecated
2012-02-28 14:54:17 -08:00
friendica
4dd4a22582
From Tobias H - catch some irregularities caused by cut/paste code
2012-02-28 14:52:23 -08:00
friendica
6c0fa7a166
Merge branch 'pull'
2012-02-27 17:18:53 -08:00
friendica
d7407f8daa
cleanup notify subject lines
2012-02-27 17:18:19 -08:00
Fabio Comuni
42d591d257
revert 01a2791e3a to avoid random preg internal errors. fix contact_template
2012-02-27 18:48:59 +01:00
friendica
153e7beb19
add plugin hooks to enotify
2012-02-26 23:54:04 -08:00
friendica
a1861d1128
tagging missing from wallwall and a couple of themes, star missing from dispy
2012-02-26 16:29:06 -08:00
friendica
89560edde2
Merge pull request #50 from annando/master
...
massive changes in mail and design updates in "vier"
2012-02-26 15:07:34 -08:00
friendica
6ddd444afd
Merge pull request #49 from CatoTH/master
...
Bugfix for del_config
2012-02-26 14:49:56 -08:00
Michael
fe3dfbee56
Mail: New options for actions after importing mails.
2012-02-26 23:39:29 +01:00
friendica
bdb14d5aad
relative link redirects
2012-02-26 14:34:01 -08:00
Michael
437e18d7a7
Merge remote branch 'upstream/master'
2012-02-26 21:47:47 +01:00
Tobias Hößl
4b1de0f538
Avoid some notices
2012-02-26 20:43:51 +00:00
Tobias Hößl
ac86407fdf
Bugfix
2012-02-26 20:43:35 +00:00
Tobias Hößl
cbc6ca642a
1 Bugfix (missing $ character) and avoid some notices
2012-02-26 20:41:41 +00:00
root
aa92901b11
Wrong variable name
2012-02-26 14:29:17 +00:00
friendica
5f7858a688
show experimental and unsupported theme status on theme admin page
2012-02-26 04:17:02 -08:00
Abinoam P. Marques Jr
f3a225437b
Comment notifications by e-mail now are threaded
2012-02-25 16:59:44 -08:00
Abinoam P. Marques Jr
bcfac6c72f
include/items.php pass 'parent' to notification
2012-02-25 16:59:44 -08:00
friendica
2c7da5d0de
scale external images
2012-02-25 14:22:51 -08:00
Michael
1cf1870512
poller.php: Test for moving to archive, vier-style: notifications fixed
2012-02-25 19:40:05 +01:00
Michael
dccefb3c36
"vier": The contacts are now working again. Line break before closing bbcodes removed.
2012-02-25 11:00:35 +01:00
friendica
18bf5d1402
theme info (like plugin info)
2012-02-25 00:30:14 -08:00
friendica
9441ff5142
string update for 2.38
2012-02-24 22:47:43 -08:00
friendica
a3cf563b68
update author name across items if changed.
2012-02-24 20:40:09 -08:00
friendica
f5c5da742d
attribution issue - don't take author name from contact if available from item.
2012-02-24 20:03:13 -08:00
Michael
01301a6169
Bug fixed where mails where nearly empty. HTML mails can now be received.
2012-02-25 02:37:39 +01:00
Michael
a74b0746b1
multipart messages complete, message-id conversion done.
2012-02-25 01:10:45 +01:00
Michael
0ba45eb745
Sending mail as multipart/alternative (html and plain text) (very basic by now)
2012-02-24 08:50:42 +01:00
Michael
f6320f3319
Encoding for incoming mails. Fixed invalid message id (with side effect at the moment). Sending mail as text mail. Encoding name when importing mail contact.
2012-02-24 07:11:26 +01:00
Michael
484a442f2b
GIT problems ...
2012-02-23 20:59:34 +01:00
Michael
0409b5cdba
Merge remote branch 'upstream/master'
...
Conflicts:
include/bbcode.php
2012-02-23 20:53:22 +01:00
Michael
311e35731c
bbcode.php: A list or quote at the beginning wasn't detected
2012-02-23 20:51:44 +01:00
85d09f48d0
fix img tag with size attribute
2012-02-23 11:12:36 +01:00
friendica
d9e9fd0359
Merge branch 'master' into notify
2012-02-23 00:30:17 -08:00
