aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-188-2565/+2667
|\
| * h1>h2 (thanks to Mario) and help text below label on register page (like on n...jeroenpraat2016-02-184-7/+10
| * Removed export temporary from UNO. Removed 'Remove Channel' from UNO, cause a...jeroenpraat2016-02-184-11/+22
| * Merge pull request #286 from wave72/masterWave2016-02-182-2549/+2637
| |\
| | * updated Italian stringsPaolo Tacconi2016-02-182-2549/+2637
* | | Provide Zotlabs\Project and System class for querying details about the proje...redmatrix2016-02-1816-77/+87
|/ /
* | some necessary doco for set_iconfig()redmatrix2016-02-181-0/+16
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-181-0/+6
|\ \
| * \ Merge pull request #285 from anaqreon/masterredmatrix2016-02-181-0/+6
| |\ \
| | * | Added the installation of curl to the .homeinstall scriptAndrew Manning2016-02-171-0/+6
| |/ /
* / / iconfig - add sharing variableredmatrix2016-02-185-13/+30
|/ /
* | this qualifies as an interface changeredmatrix2016-02-171-1/+1
* | 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