13dfb40128
fix messed up config tables w/ duplicate entries
10 years ago
0731c177eb
fix bad sql update
10 years ago
91906b1b74
Merge branch 'pull'
10 years ago
665b2c8107
revert config changes, we're getting duplicate keys
10 years ago
Tobias Diekershoff
afd2bf031e
update to the German strings
10 years ago
4bee1859be
Merge branch 'pull'
10 years ago
6bc7e6e09f
add network_tabs hook
10 years ago
221726392e
pass autoname(0) test
10 years ago
053048af10
rev update
10 years ago
355c42cb30
Merge branch 'master' of https://github.com/friendica/friendica
...
Conflicts:
include/config.php
update.php
10 years ago
cbf4544887
added index to config and pconfig table
...
changed config.php to use REPLACE instead of INSERT,
this removes one db hit.
10 years ago
9b6e91086b
make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php
10 years ago
b2290f4f12
Merge pull request #207 from simonlnu/master
...
styled cat tags and input
10 years ago
df82affe2f
finish styling category tags and category input
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
10 years ago
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:
10 years ago
37801dd6ed
also block outbound
10 years ago
9860d6b95c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
10 years ago
9ee424c1e3
style categorytags
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
10 years ago
b45327b856
let's catch d* disabled at a higher level and not waste any resources on it.
10 years ago
5377683c0f
Merge pull request #206 from simonlnu/master
...
update the template files
10 years ago
8e5489846d
update the dispy* templates
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
10 years ago
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:
10 years ago
d509a46345
Merge pull request #205 from unary/filerfix
...
correct some filer dialog weirdness caused by introduction of categories
10 years ago
da0eb2d4c9
correct some filer dialog weirdness caused by introduction of categories
10 years ago
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:
10 years ago
c4ca21a762
move alert box away from nav links
10 years ago
0c7710681c
log disabled requests
10 years ago
71671e5b9a
fix config storage of booleans
10 years ago
f63636ed14
well that was a stupid mistake...
10 years ago
145713c8e2
string update
10 years ago
62c60fd53d
bug: diaspora_enabled setting turns it on but doesn't fully turn it off.
10 years ago
51658826f9
Merge branch 'pull'
10 years ago
60c57704c6
better handling of reshares containing embeds
10 years ago
5c6c9d756f
Merge pull request #204 from simonlnu/master
...
many changes, all small
10 years ago
922d690d1e
latest changes are the popup menu for notifs, fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
10 years ago
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:
10 years ago
8e928d101b
display settings hooks
10 years ago
466188ebd7
re-opened bug #363
10 years ago
96abee53e4
this is better
10 years ago
1e02fd8a72
Merge branch 'pull'
10 years ago
dbe16afcd4
include contact_widgets for categories_widget when doing updates
10 years ago
3db2cf76b9
remove loozah themes which fell too far behind to recover
10 years ago
f0a8ef64fe
smal fix
10 years ago
ca0795a096
Merge pull request #202 from tomtom84/master
...
german translation for right_aside
10 years ago
cd309b69e6
german translation for right_aside
10 years ago
10c88f2a01
Merge pull request #201 from tomtom84/master
...
fixes in diabook-themes
10 years ago
8a71191d6d
make right_aside translatable and provide german translation...
...
and some css-fixes
10 years ago
4b762ff923
suppress duplicates in search
10 years ago
5d0d9f8772
make contact ssl_policy change a function since it is used in a few places
10 years ago
f4721955db
more ssl policy fixes and prevent delivery to soapbox when using local delivery
10 years ago
friendica
Tobias Diekershoff
Alexander Kampmann
Simon
Simon L'nu
Michael Johnston
tommy tomson
tomtom84