aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | clean up some unused stuff and start loading content a bit earlierMario Vavti2016-02-151-25/+2
| | |/ /
| * / / update fr strings from transifexredmatrix2016-02-154-7055/+8913
| |/ /
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-145-1791/+1826
| |\ \
| | * | Spanish and Dutch string updatejeroenpraat2016-02-144-1790/+1824
| | * | Merge pull request #282 from royalterra/masterredmatrix2016-02-141-1/+2
| | |\ \
| | | * | add https://blablanet.es faillback serverroyalterra2016-02-131-1/+2
| | |/ /
| * / / form cleanup (profile_photo and cover_photo), admin 'user_approve' not found,...redmatrix2016-02-147-115/+139
| |/ /
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-139-824/+1347
|\| |
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-126-7/+516
| |\ \
| | * | don't confuse people with matrixJeroen van Riet Paap2016-02-121-3/+3
| | * | https://blablanet.es/siteinfo/json reports itself as directory_mode DIRECTORY...Mario Vavti2016-02-121-1/+0
| | * | tryout: introduce loading of images before rendering content and provide some...Mario Vavti2016-02-124-3/+513
| * | | directory modes reversedredmatrix2016-02-123-817/+831
| |/ /
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-1211-87/+154
|\| |
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-111-0/+1
| |\ \
| | * \ Merge pull request #278 from royalterra/masterredmatrix2016-02-121-0/+1
| | |\ \
| | | * \ Merge pull request #1 from royalterra/royalterra-patch-1royalterra2016-02-111-0/+1
| | | |\ \
| | | | * | Update boot.php Failback Server blablanet.esroyalterra2016-02-111-0/+1
| | | |/ /
| * | / / whitespaceredmatrix2016-02-112-1/+2
| |/ / /
| * | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-111-74/+94
| |\| |
| | * | update readmore.js to a more recent versionMario Vavti2016-02-111-74/+94
| * | | guest photo upload failing when js_upload is in use due to non-existent acl p...redmatrix2016-02-113-2/+10
| |/ /
| * | feed dates are always UTC. This means we will need another mechanism to pass ...redmatrix2016-02-101-2/+2
| * | feed dates weren't being honoured. When that was fixed they turned out to be ...redmatrix2016-02-102-3/+5
| * | put a sane lower time limit on content search for public feed requestsredmatrix2016-02-101-0/+6
| * | hook changes to support pubsubhubbubredmatrix2016-02-103-5/+33
| * | rev updateredmatrix2016-02-102-1/+2
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-096-4040/+4178
|\| |
| * | Merge branch 'master' of https://github.com/redmatrix/hubzillajeroenpraat2016-02-092-30/+26
| |\ \
| | * \ Merge pull request #276 from phellmes/invitegit-marijus2016-02-092-30/+26
| | |\ \
| | | * | [invite module] remove trailing spaces from translatable stringsphellmes2016-02-091-6/+6
| | | * | [invite module] update UI templatephellmes2016-02-091-24/+20
| | |/ /
| * / / Castellano and Nederlands string updatesjeroenpraat2016-02-094-4010/+4152
| |/ /
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-0930-49/+246
|\| |
| * | need to re-arrange a few things for a short vcardredmatrix2016-02-082-1/+46
| * | lots more zcard tweaksredmatrix2016-02-086-20/+57
| * | duplicated lines in en config fileredmatrix2016-02-081-10/+0
| * | make yet another recommended security header optional - this time because of ...redmatrix2016-02-0812-1/+107
| * | try that patch againredmatrix2016-02-082-11/+7
| * | Revert "sort out the well-known acme-challenge mess - at least on apache"redmatrix2016-02-083-6/+12
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-082-3/+2
| |\ \
| | * | avoid collapsing only above the viewportMario Vavti2016-02-082-3/+2
| * | | sort out the well-known acme-challenge mess - at least on apacheredmatrix2016-02-083-12/+6
| |/ /
| * | a few tweaks to uno settings page to allow a default ACL to be createdredmatrix2016-02-072-1/+8
| * | change register workflow if uno is setredmatrix2016-02-071-1/+1
| * | provide get_server_role() to abstract different roles and capabilitiesredmatrix2016-02-074-2/+9
| * | block public was still referenced in admin/site templateredmatrix2016-02-071-1/+0
| * | update UI template for 'mood' moduleredmatrix2016-02-072-8/+19
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-0629-1494/+1604
|\| |
| * | fix uno import by disabling for nowredmatrix2016-02-052-1/+10