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
friendica
cf2d8ef7a6
tag tests cont.
2012-04-07 02:11:56 -07:00
friendica
f30146b521
fix autonamenegativelength test
2012-04-07 01:20:38 -07:00
friendica
3a1c78bd75
some work on tests
2012-04-07 01:04:45 -07:00
Simon L'nu
bc69a957dc
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
ignore removed plugins
fix messed up config tables w/ duplicate entries
small fixes for the German strings
fix bad sql update
revert config changes, we're getting duplicate keys
new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox...
* master:
2012-04-07 03:10:09 -04:00
Michael Vogel
7308dbae28
"vier": Bookmarks now look better.
2012-04-07 01:19:07 +02:00
friendica
ecabe1d505
ignore removed plugins
2012-04-06 05:21:42 -07:00
friendica
533e215a96
Merge branch 'pull'
2012-04-06 05:12:18 -07:00
friendica
13dfb40128
fix messed up config tables w/ duplicate entries
2012-04-06 05:11:09 -07:00
tomtom84
9cff2e36cf
Merge pull request #211 from tomtom84/master
...
small fix
2012-04-06 04:33:26 -07:00
tommy tomson
75bcf42caa
Merge remote-tracking branch 'origin/master'
2012-04-06 13:29:20 +02:00
tomtom84
adf3ad5fd6
Merge pull request #210 from tomtom84/master
...
fixes in diabook-derivates
2012-04-06 04:29:01 -07:00
tommy tomson
0cb2407c94
Merge remote-tracking branch 'origin/master'
2012-04-06 12:58:41 +02:00
4f9588d9ee
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-06 12:43:44 +02:00
eb6370fa41
small fixes for the German strings
2012-04-06 12:43:20 +02:00
friendica
0731c177eb
fix bad sql update
2012-04-06 03:25:01 -07:00
