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
tommy tomson
52d5ef905e
Merge remote-tracking branch 'origin/master'
2012-04-06 12:24:05 +02:00
friendica
91906b1b74
Merge branch 'pull'
2012-04-06 03:12:02 -07:00
friendica
665b2c8107
revert config changes, we're getting duplicate keys
2012-04-06 03:10:46 -07:00
tommy tomson
f980b79edc
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...
2012-04-06 11:19:12 +02:00
afd2bf031e
update to the German strings
2012-04-06 09:37:50 +02:00
friendica
4bee1859be
Merge branch 'pull'
2012-04-05 21:43:38 -07:00
friendica
6bc7e6e09f
add network_tabs hook
2012-04-05 21:42:47 -07:00
friendica
221726392e
pass autoname(0) test
2012-04-05 18:44:36 -07:00
friendica
053048af10
rev update
2012-04-05 14:37:30 -07:00
Alexander Kampmann
355c42cb30
Merge branch 'master' of https://github.com/friendica/friendica
...
Conflicts:
include/config.php
update.php
2012-04-05 13:39:15 +02:00
Alexander Kampmann
cbf4544887
added index to config and pconfig table
...
changed config.php to use REPLACE instead of INSERT,
this removes one db hit.
2012-04-05 13:27:09 +02:00
friendica
9b6e91086b
make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php
2012-04-05 02:15:03 -07:00
Simon
b2290f4f12
Merge pull request #207 from simonlnu/master
...
styled cat tags and input
2012-04-04 21:05:13 -07:00
Simon L'nu
df82affe2f
finish styling category tags and category input
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-05 00:04:23 -04:00
Simon L'nu
9c4fca446b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
also block outbound
let's catch d* disabled at a higher level and not waste any resources on it.
* master:
2012-04-05 00:03:30 -04:00
friendica
37801dd6ed
also block outbound
2012-04-04 20:48:35 -07:00
Simon L'nu
9860d6b95c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-04-04 23:47:48 -04:00
Simon L'nu
9ee424c1e3
style categorytags
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-04 23:47:35 -04:00
friendica
b45327b856
let's catch d* disabled at a higher level and not waste any resources on it.
2012-04-04 20:45:48 -07:00
Simon
5377683c0f
Merge pull request #206 from simonlnu/master
...
update the template files
2012-04-04 20:35:59 -07:00
Simon L'nu
8e5489846d
update the dispy* templates
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-04 23:35:07 -04:00
Simon L'nu
afe7f09b27
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
correct some filer dialog weirdness caused by introduction of categories
move alert box away from nav links
log disabled requests
fix config storage of booleans
* master:
2012-04-04 23:32:16 -04:00
friendica
d509a46345
Merge pull request #205 from unary/filerfix
...
correct some filer dialog weirdness caused by introduction of categories
2012-04-04 20:23:20 -07:00
Michael Johnston
da0eb2d4c9
correct some filer dialog weirdness caused by introduction of categories
2012-04-04 23:08:16 -04:00
Simon L'nu
c0a18bc2fa
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
well that was a stupid mistake...
string update
bug: diaspora_enabled setting turns it on but doesn't fully turn it off.
better handling of reshares containing embeds
* master:
2012-04-04 22:58:32 -04:00
friendica
c4ca21a762
move alert box away from nav links
2012-04-04 19:13:41 -07:00
friendica
0c7710681c
log disabled requests
2012-04-04 18:49:39 -07:00
friendica
71671e5b9a
fix config storage of booleans
2012-04-04 17:51:59 -07:00
friendica
f63636ed14
well that was a stupid mistake...
2012-04-04 17:19:46 -07:00
friendica
145713c8e2
string update
2012-04-04 15:51:56 -07:00
friendica
62c60fd53d
bug: diaspora_enabled setting turns it on but doesn't fully turn it off.
2012-04-04 14:13:34 -07:00
friendica
51658826f9
Merge branch 'pull'
2012-04-04 02:02:50 -07:00
friendica
60c57704c6
better handling of reshares containing embeds
2012-04-04 02:02:23 -07:00
Simon
5c6c9d756f
Merge pull request #204 from simonlnu/master
...
many changes, all small
2012-04-03 23:21:39 -07:00
Simon L'nu
922d690d1e
latest changes are the popup menu for notifs, fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-04 02:19:39 -04:00
Simon L'nu
2871e28df7
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
display settings hooks
re-opened bug #363
this is better
include contact_widgets for categories_widget when doing updates
remove loozah themes which fell too far behind to recover
smal fix
german translation for right_aside
make right_aside translatable and provide german translation... and some css-fixes
suppress duplicates in search
make contact ssl_policy change a function since it is used in a few places
more ssl policy fixes and prevent delivery to soapbox when using local delivery
don't change ssl settings on local photos for remote contact
* master:
2012-04-04 02:14:26 -04:00
friendica
8e928d101b
display settings hooks
2012-04-03 22:01:52 -07:00
friendica
466188ebd7
re-opened bug #363
2012-04-03 20:14:37 -07:00
friendica
96abee53e4
this is better
2012-04-03 19:20:39 -07:00
friendica
1e02fd8a72
Merge branch 'pull'
2012-04-03 19:16:59 -07:00
friendica
dbe16afcd4
include contact_widgets for categories_widget when doing updates
2012-04-03 19:16:02 -07:00
friendica
3db2cf76b9
remove loozah themes which fell too far behind to recover
2012-04-03 16:40:25 -07:00
tommy tomson
f0a8ef64fe
smal fix
2012-04-03 21:45:58 +02:00
tomtom84
ca0795a096
Merge pull request #202 from tomtom84/master
...
german translation for right_aside
2012-04-03 12:08:40 -07:00
