friendica
640f258f18
cleanup photo menus
2012-04-10 19:33:32 -07:00
friendica
19b636e7e8
more backend work on mail2 followers
2012-04-10 19:15:52 -07:00
friendica
ed608694ce
make editplain work everywhere
2012-04-10 18:08:06 -07:00
friendica
18e225b051
move all fix_mce to one function so it can easily be undone
2012-04-10 17:14:07 -07:00
friendica
ab46f95683
duplicate community posts
2012-04-10 16:59:30 -07:00
friendica
8f40e8546e
fix_mce_lf contact edit page
2012-04-10 16:32:38 -07:00
friendica
9b1bb53234
fix_mce_lf on profiles
2012-04-10 16:31:49 -07:00
friendica
703bfcb6d4
Merge https://github.com/friendica/friendica into pull
2012-04-10 16:07:05 -07:00
friendica
14d68a0dc0
set default on get_avatar
2012-04-10 15:33:43 -07:00
friendica
3c66816938
Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull
2012-04-10 15:28:48 -07:00
friendica
35b978bb1e
rev update
2012-04-10 15:25:15 -07:00
friendica
0e97e2338a
Merge pull request #222 from CatoTH/master
...
Translation bugfix
2012-04-10 15:23:04 -07:00
friendica
3380ff3240
Merge pull request #223 from campino/master
...
bug fix
2012-04-10 15:21:37 -07:00
Tobias Hößl
e1c43c1c1c
Incorrect tranlation (one negation too much)
2012-04-10 20:43:31 +00:00
Alexander Kampmann
64cf2d089a
fixed install bug
2012-04-10 17:10:24 +02:00
tommy tomson
6db33fc513
diabook-themes: smal fix in bbcode-js
2012-04-10 15:13:34 +02:00
tommy tomson
b3f18945ba
diabook-themes: added url and quote to bbcode toolbar under comment box
2012-04-10 14:38:59 +02:00
Simon
9fafe64f82
Merge pull request #221 from simonlnu/master
...
aaah, nice asides ;). we'll be updating these soon
2012-04-10 02:50:42 -07:00
Simon L'nu
707a5dbae7
aaah, nice asides ;). we'll be updating these soon
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-10 05:48:42 -04:00
Simon L'nu
514780745f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
path to default.php in theme dir was incorrect
* master:
2012-04-10 05:03:32 -04:00
friendica
4c3b835307
path to default.php in theme dir was incorrect
2012-04-10 01:51:53 -07:00
Simon L'nu
61c28e8c2e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
rev update
source beautifarming to make review easier
fixed some typos
made exceptions from the db optional set address for updae mails correctly
added exceptions to dba class added exception handling to index.php, please mind that there is no recovery at the moment added transactions to db update. Please mind that they might not be supported by db table engines. added admin email on failed updates
* master:
2012-04-10 02:49:34 -04:00
friendica
9a8c69b024
Merge branch 'pull'
2012-04-09 16:55:06 -07:00
friendica
2072fabc78
rev update
2012-04-09 16:54:39 -07:00
friendica
2d23c8a246
Merge pull request #218 from campino/master
...
db errors and update error mail
2012-04-09 16:53:23 -07:00
Simon L'nu
16c48b2200
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
bbcode toolbar attached to the comment text field minor css-fixes
diabook-themes: small icon fix
diabook-nav-icons with gradient
use local_user for tag completion if available. See bug #368
more sane defaults datetime_convert
fix empty string timezone
Some new German translations
send zrl after dfrn_request homecoming for manual entries
fix to wall_upload photos default permissions to use cid rather than uid.
fixed z-index of youtube-vids fixed bug to hide right_side
* master:
2012-04-09 19:20:51 -04:00
tomtom84
0fd05171d0
Merge pull request #220 from tomtom84/master
...
fixes in diabook-themes
2012-04-09 15:56:52 -07:00
tommy tomson
0d4fab4ee3
bbcode toolbar attached to the comment text field
...
minor css-fixes
2012-04-10 00:55:39 +02:00
Klaus Weidenbach
1f9fe8b5ee
Remove Gravatar from core and add new hook avatar_lookup.
...
This patch removes all occurances of Gravatar from friendica's core and adds a new hook "avatar_lookup" inside the function avatar_img($email) where the new *avatar-plugins should hook in.
I haven't touched the language files yet. Are they updated automatically somehow?
2012-04-09 21:22:09 +02:00
Klaus Weidenbach
93ffba58cc
Rename gravatar_img() more generic to avatar_img().
...
I would like to extend the Gravatar support to also use Libravatar, a decentralized avatar service.
First step to extract Gravatar from core and put it into its own plugin. Later the Libravatar plugin can be done, too as a plugin.
2012-04-09 21:22:09 +02:00
tommy tomson
d25a9df996
diabook-themes: small icon fix
2012-04-09 19:56:53 +02:00
Alexander Kampmann
2190b95d80
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-09 16:56:37 +02:00
Alexander Kampmann
018727aa15
source beautifarming to make review easier
2012-04-09 16:56:01 +02:00
tomtom84
71edd6843f
Merge pull request #217 from tomtom84/master
...
small fix in theme diabook
2012-04-09 07:42:57 -07:00
tommy tomson
c27c340de1
diabook-nav-icons with gradient
2012-04-09 16:41:23 +02:00
Alexander Kampmann
1370ba5d16
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-09 14:28:21 +02:00
Alexander Kampmann
7187516718
fixed some typos
2012-04-09 14:27:52 +02:00
Alexander Kampmann
7ac4b83c39
made exceptions from the db optional
...
set address for updae mails correctly
2012-04-09 14:04:49 +02:00
friendica
84142076a1
Merge branch 'pull'
2012-04-09 04:56:43 -07:00
friendica
92c20895e0
use local_user for tag completion if available. See bug #368
2012-04-09 04:55:52 -07:00
tomtom84
6267da0a29
Merge pull request #216 from zzottel/master
...
German translations
2012-04-09 04:02:29 -07:00
Michael Vogel
fe257a2032
html2plain: changed behaviour for the "hr" element.
2012-04-09 12:54:02 +02:00
Michael Vogel
894e126c55
API: Tweetdeck is now working
2012-04-09 11:49:33 +02:00
zottel
0bad8de056
Merge remote branch 'upstream/master'
2012-04-09 03:13:54 +02:00
friendica
c1e2596807
more sane defaults datetime_convert
2012-04-08 18:09:21 -07:00
friendica
129130b0f7
fix empty string timezone
2012-04-08 18:01:49 -07:00
zottel
5183d4f77d
Some new German translations
2012-04-09 02:30:18 +02:00
friendica
de3b9e9584
send zrl after dfrn_request homecoming for manual entries
2012-04-08 17:28:36 -07:00
zottel
7cf946e004
Merge remote branch 'upstream/master'
2012-04-09 02:20:34 +02:00
friendica
63c881b50d
Merge branch 'pull'
2012-04-08 16:29:54 -07:00
