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
4c3b835307
path to default.php in theme dir was incorrect
2012-04-10 01:51:53 -07: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
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
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
friendica
977625a53b
fix to wall_upload photos default permissions to use cid rather than uid.
2012-04-08 16:19:45 -07:00
Alexander Kampmann
0d60dbef31
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
added german translation for admin email
2012-04-09 00:45:10 +02:00
tomtom84
06c0447342
Merge pull request #215 from tomtom84/master
...
fixes in diabook-themes
2012-04-08 15:04:59 -07:00
tommy tomson
7d018f651d
fixed z-index of youtube-vids
...
fixed bug to hide right_side
2012-04-09 00:02:48 +02:00
zottel
315d496290
Merge remote branch 'upstream/master'
2012-04-08 21:50:41 +02:00
friendica
5c04469755
prepare for using a master theme_init()
2012-04-08 06:20:57 -07:00
friendica
741a5dba57
provide theme_init() functions
2012-04-08 05:52:00 -07:00
friendica
3afc9915e3
rev updates
2012-04-08 05:24:11 -07:00
friendica
c3867f4ce4
Merge pull request #214 from annando/master
...
API, Locking, some changes to "vier"
2012-04-08 05:19:54 -07:00
zottel
aaf5a81365
Merge remote branch 'upstream/master'
2012-04-08 10:33:32 +02:00
Michael Vogel
ce0eac44b5
Merge commit 'upstream/master'
2012-04-08 10:07:39 +02:00
Simon
e3b2ac0735
Merge pull request #213 from simonlnu/master
...
minor dispy* fixes
2012-04-07 20:47:37 -07:00
Simon L'nu
01961f7caa
minor dispy* fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-07 23:46:47 -04:00
Michael Vogel
cb4c7cdb3e
API: API is now enhanced. mentions, repeat and destroy now works.
2012-04-08 00:02:25 +02:00
Simon L'nu
cee3608747
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-themes: small fix
changelog 1.014 : image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section
ignore utf8 offset error for unit tests
had arg order backwards
try assertContains
tag tests cont.
fix autonamenegativelength test
some work on tests
* master:
2012-04-07 14:47:02 -04:00
tommy tomson
f931d5c918
diabook-themes: small fix
2012-04-07 19:56:00 +02:00
Michael Vogel
17d097124c
"vier": Some design stuff
2012-04-07 18:35:37 +02:00
Michael Vogel
cb05801a90
Merge commit 'upstream/master'
2012-04-07 18:35:29 +02:00
tomtom84
0fa3b7f348
Merge pull request #212 from tomtom84/master
...
fixes in diabook-themes
2012-04-07 07:41:23 -07:00
tommy tomson
1c0700f371
changelog 1.014 :
...
image-rezise via jquery-plugin in stream
comments under uploaded pictues
add Diabook's version-number in head-section
css-fixes:
tabs
youtube-iframe
title-bar in jot-wrapper
blockquote & .oembed
2012-04-07 16:39:43 +02:00
friendica
1440786c31
ignore utf8 offset error for unit tests
2012-04-07 02:31:41 -07:00
friendica
e575d67969
had arg order backwards
2012-04-07 02:23:11 -07:00
friendica
7a7102618b
try assertContains
2012-04-07 02:21:55 -07:00
