aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* schema updates for iconfigredmatrix2016-02-174-2/+63
* Merge branch 'iconfig'redmatrix2016-02-172-3/+231
|\
| * provide del_iconfig for completenessredmatrix2016-02-171-0/+34
| * iconfig debugging - federation now workingredmatrix2016-02-171-1/+2
| * iconfig debuggingredmatrix2016-02-172-4/+10
| * slight changes to set_iconfig - if passed an item structure only update the s...redmatrix2016-02-161-33/+13
| * more work on iconfigredmatrix2016-02-161-5/+75
| * some iconfig basicsredmatrix2016-02-161-0/+137
* | format atom event renderings so they are reasonably compatible with GNU-socialredmatrix2016-02-171-2/+15
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-179-13/+30
|\ \
| * | More clarification about privacy of private content. Changed Channel Name to ...jeroenpraat2016-02-174-5/+6
| * | Change descriptionMario Vavti2016-02-171-1/+1
| * | make always preload images before rendering the page a display settingMario Vavti2016-02-175-7/+19
| * | more refinement on collapsingMario Vavti2016-02-171-2/+6
* | | add ca help files (per Paco)redmatrix2016-02-1715-0/+608
* | | revupredmatrix2016-02-171-1/+1
|/ /
* | allow admin to set and lock features when UNO is enabledredmatrix2016-02-161-1/+1
* | allow redirection to site workflow page even if auto channel create is appliedredmatrix2016-02-161-3/+4
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-165-5/+10
|\ \
| * | @hubdomain also for auto-create-channel + adding css wrapper (ongoing work)jeroenpraat2016-02-164-2/+7
| * | Thats probably better but there are still edge cases...Mario Vavti2016-02-161-2/+2
| * | typoMario Vavti2016-02-161-1/+1
| |/
* / revupredmatrix2016-02-161-1/+1
|/
* content -> viewportMario Vavti2016-02-161-1/+1
* only prefetch images on update_mode updateMario Vavti2016-02-161-29/+54
* since we preload images now we also can collapse and calculate posts above th...Mario Vavti2016-02-161-25/+43
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-152-57/+36
|\
| * Merge pull request #283 from phellmes/conneditredmatrix2016-02-161-32/+34
| |\
| | * Add string translation to auto approval optionphellmes2016-02-151-32/+34
| * | 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 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 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