Skip to content
Commits on Feb 2, 2016
  1. @annando

    Merge pull request #2305 from nerdoc/patch-1

    annando committed
    add simple option for HTTPS in .htaccess
Commits on Jan 31, 2016
  1. @nerdoc

    really uncomment the lines.

    nerdoc committed
Commits on Jan 30, 2016
  1. @nerdoc

    additional blank line

    nerdoc committed
  2. @nerdoc

    add simple option for HTTPS in .htaccess

    nerdoc committed
    people have it easier to just uncomment 2 lines if they want such an important feature
Commits on Jan 20, 2016
  1. @fabrixxm

    Bump version

    fabrixxm committed
  2. @fabrixxm

    Merge branch 'hotfix_diaspora'

    fabrixxm committed
  3. @annando @fabrixxm
Commits on Dec 22, 2015
  1. @fabrixxm

    Friendica 3.4.3

    fabrixxm committed
  2. @fabrixxm

    Merge branch 'release-3.4.3-rc'

    fabrixxm committed
  3. @annando

    Merge pull request #2193 from fabrixxm/changelog

    annando committed
    Update CHANGELOG
  4. @fabrixxm

    Update CHANGELOG

    fabrixxm committed
Commits on Dec 21, 2015
  1. @annando

    Merge pull request #2195 from fabrixxm/last-minute

    annando committed
    Last minute
  2. @fabrixxm

    call resizeIframe() function until size is stable

    fabrixxm committed
    (iframe content finished to load, hopefully)
    should remove scrollbars on rich oembeds
  3. @fabrixxm
  4. @fabrixxm

    Update CHANGELOG

    fabrixxm committed
  5. @tobiasd

    Merge pull request #2192 from fabrixxm/quattro-message-aside

    tobiasd committed
    quattro: fix PM aside template
  6. @fabrixxm

    quattro: fix PM aside template

    fabrixxm committed
    errors was raised with new "show message list in aside" patch
Commits on Dec 20, 2015
  1. @annando

    Merge pull request #2191 from tobiasd/20151217-fr

    annando committed
    FR: update to the translation
Commits on Dec 17, 2015
  1. @tobiasd

    FR: update to the translation

    tobiasd committed
Commits on Dec 16, 2015
  1. @tobiasd

    Merge pull request #2190 from annando/1512-getload

    tobiasd committed
    Sometimes the function "sys_getloadavg" doesn't return an array.
Commits on Dec 15, 2015
  1. @annando
  2. @annando
  3. @annando

    Merge pull request #2189 from rabuzarus/1512_vier_images

    annando committed
    vier: fix missing icons
  4. vier: fix missing icons

    rabuzarus committed
  5. @annando

    Merge pull request #2188 from rabuzarus/1512_allfriends_pager

    annando committed
    add pager to common friends and allfriends
  6. add pager to common friends and allfriends

    rabuzarus committed
  7. @tobiasd

    Merge pull request #2186 from annando/1512-profile-bbcode

    tobiasd committed
    Bugfix: The bbcode conversion of the profile was inconsistent
Commits on Dec 14, 2015
  1. @annando
  2. @annando
  3. @annando
  4. @fabrixxm

    Merge pull request #2185 from tobiasd/20151214-translations

    fabrixxm committed
    update to translation for DE, FR; IT
  5. @tobiasd

    IT update to the strings

    tobiasd committed
  6. @tobiasd

    FR update to the strings

    tobiasd committed
  7. @tobiasd

    DE update to the strings

    tobiasd committed
  8. @fabrixxm

    Merge pull request #2183 from rabuzarus/1412_profile_addr_fix

    fabrixxm committed
    fix displaying forum in hcard
Something went wrong with that request. Please try again.