Commit Graph

4830 Commits (533e215a9636888675fc89f92eb9d556db180f1e)
 

Author SHA1 Message Date
friendica 533e215a96 Merge branch 'pull' 11 years ago
friendica 13dfb40128 fix messed up config tables w/ duplicate entries 11 years ago
tomtom84 9cff2e36cf Merge pull request #211 from tomtom84/master 11 years ago
tommy tomson 75bcf42caa Merge remote-tracking branch 'origin/master' 11 years ago
tomtom84 adf3ad5fd6 Merge pull request #210 from tomtom84/master 11 years ago
tommy tomson 0cb2407c94 Merge remote-tracking branch 'origin/master' 11 years ago
Tobias Diekershoff 4f9588d9ee Merge branch 'master' of https://github.com/friendica/friendica 11 years ago
Tobias Diekershoff eb6370fa41 small fixes for the German strings 11 years ago
friendica 0731c177eb fix bad sql update 11 years ago
tommy tomson 52d5ef905e Merge remote-tracking branch 'origin/master' 11 years ago
friendica 91906b1b74 Merge branch 'pull' 11 years ago
friendica 665b2c8107 revert config changes, we're getting duplicate keys 11 years ago
tommy tomson f980b79edc new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... 11 years ago
Tobias Diekershoff afd2bf031e update to the German strings 11 years ago
friendica 4bee1859be Merge branch 'pull' 11 years ago
friendica 6bc7e6e09f add network_tabs hook 11 years ago
friendica 221726392e pass autoname(0) test 11 years ago
friendica 053048af10 rev update 11 years ago
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica 11 years ago
Alexander Kampmann cbf4544887 added index to config and pconfig table 11 years ago
friendica 9b6e91086b make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php 11 years ago
Simon b2290f4f12 Merge pull request #207 from simonlnu/master 11 years ago
Simon L'nu df82affe2f finish styling category tags and category input 11 years ago
Simon L'nu 9c4fca446b Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 11 years ago
friendica 37801dd6ed also block outbound 11 years ago
Simon L'nu 9860d6b95c Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 11 years ago
Simon L'nu 9ee424c1e3 style categorytags 11 years ago
friendica b45327b856 let's catch d* disabled at a higher level and not waste any resources on it. 11 years ago
Simon 5377683c0f Merge pull request #206 from simonlnu/master 11 years ago
Simon L'nu 8e5489846d update the dispy* templates 11 years ago
Simon L'nu afe7f09b27 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 11 years ago
friendica d509a46345 Merge pull request #205 from unary/filerfix 11 years ago
Michael Johnston da0eb2d4c9 correct some filer dialog weirdness caused by introduction of categories 11 years ago
Simon L'nu c0a18bc2fa Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 11 years ago
friendica c4ca21a762 move alert box away from nav links 11 years ago
friendica 0c7710681c log disabled requests 11 years ago
friendica 71671e5b9a fix config storage of booleans 11 years ago
friendica f63636ed14 well that was a stupid mistake... 11 years ago
friendica 145713c8e2 string update 11 years ago
friendica 62c60fd53d bug: diaspora_enabled setting turns it on but doesn't fully turn it off. 11 years ago
friendica 51658826f9 Merge branch 'pull' 11 years ago
friendica 60c57704c6 better handling of reshares containing embeds 11 years ago
Simon 5c6c9d756f Merge pull request #204 from simonlnu/master 11 years ago
Simon L'nu 922d690d1e latest changes are the popup menu for notifs, fixes 11 years ago
Simon L'nu 2871e28df7 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 11 years ago
friendica 8e928d101b display settings hooks 11 years ago
friendica 466188ebd7 re-opened bug #363 11 years ago
friendica 96abee53e4 this is better 11 years ago
friendica 1e02fd8a72 Merge branch 'pull' 11 years ago
friendica dbe16afcd4 include contact_widgets for categories_widget when doing updates 11 years ago