friendica
2050f886cc
keep tony from talking to himself
2012-03-08 21:14:41 -08:00
friendica
395a9530dc
still getting parent relays on remote systems
2012-03-07 18:23:55 -08:00
friendica
dd3b3c2454
revup
2012-03-07 15:54:37 -08:00
friendica
7ad2dd6565
fix photos after permissions_sql change
2012-03-06 17:52:00 -08:00
friendica
1224e256b1
Merge branch 'pull'
2012-03-06 17:22:13 -08:00
friendica
88cd5800cf
[privacy] rework latest fix
2012-03-06 17:21:14 -08:00
Simon L'nu
415ca107fd
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix html reshares when editplain in use
* master:
2012-03-06 18:38:44 -05:00
Simon
1fae778421
Merge pull request #94 from beardy-unixer/master
...
Documentation changes
2012-03-06 15:24:15 -08:00
Simon
decc9e5798
Merge pull request #99 from tomtom84/master
...
fixes in theme diabook
2012-03-06 15:22:55 -08:00
tommy tomson
6a5c4bab9c
messages-menu translation, add scroll-to-top and theme-bug-report in theme
2012-03-07 00:07:27 +01:00
friendica
8fb0ea4048
bugs #312 , #313
2012-03-06 14:27:53 -08:00
Thomas
67456bad06
Fixed...merged with mainline THEN added beards.
2012-03-06 20:50:38 +00:00
Thomas
a265afe7eb
added beard smileys
2012-03-06 20:44:53 +00:00
friendica
eec4cff84b
remove "smilie" expansion for Diaspora logo
2012-03-06 04:28:45 -08:00
friendica
23718bfc25
prevent duplicate likes
2012-03-06 02:17:55 -08:00
friendica
c37ffd2999
can_write_wall documentation
2012-03-05 15:04:43 -08:00
friendica
fba089012a
correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode
2012-03-04 18:50:32 -08:00
friendica
4134fd3dce
unused replacement variable displays %1 in all html2bbcode 'code' blocks
2012-03-04 16:26:16 -08: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
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
