aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-077-16/+125
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-064-16/+22
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-051-0/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-045-175/+204
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Fixed deployHaakon Meland Eriksen2016-01-041-4/+0
| | | * | | | | | | | | | | | | | Removed deploy to get from upstreamHaakon Meland Eriksen2016-01-036-16/+56
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Add Hubzilla Chess repo to deploy scriptHaakon Meland Eriksen2016-01-031-1/+1
| * | | | | | | | | | | | | | | | | several clarifications on hidden_configsredmatrix2016-01-181-10/+17
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | add db_type to sample htconfigredmatrix2016-01-181-1/+1
| * | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-182-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Added a feature to hide rating buttons from a members channel and profile pages.jeroenpraat2016-01-182-2/+5
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | |
| * / | | | | | | | | | | | | | | db_type not present in international config file templates issue #259redmatrix2016-01-1812-1/+12
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-171-78/+133
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #258 from einervonvielen/backup_to_usb_without_encryptionredmatrix2016-01-181-78/+133
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | backup to external device now possible without encryption. Before thisEiner von Vielen2016-01-171-78/+133
| | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | |
| * | / | | | | | | | | | | | | | doc updatesredmatrix2016-01-172-66/+71
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-176-1236/+1346
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | update es-es and nl strings. adjusted a few matrix to grid stringsjeroenpraat2016-01-176-1236/+1346
| | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | | generalise the site iconredmatrix2016-01-175-31/+48
| * | | | | | | | | | | | | | various issues from the forumsredmatrix2016-01-1713-32/+65
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | call build_sync_packet() on pdledit updatesredmatrix2016-01-171-0/+1
| * | | | | | | | | | | | | minversion issueredmatrix2016-01-172-3/+3
| * | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-161-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | move dir total ratings button to the left to prevent the connect button beein...Mario Vavti2016-01-161-2/+3
| | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| * / | | | | | | | | | | add $deliver flag to item_store() and item_store_update() [default true]. If ...redmatrix2016-01-167-21/+18
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-158-43/+43
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | minor version rollredmatrix2016-01-153-526/+571
* | | | | | | | | | | | | Merge pull request #17 from redmatrix/mastermrjive2016-01-1517-69/+246
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | change button order for consistencyMario Vavti2016-01-151-4/+5
| * | | | | | | | | | | | provide a recent activity link in /connectionsMario Vavti2016-01-152-3/+5
| * | | | | | | | | | | | add an approve button to /connections and get rid of the modal popup in /conn...Mario Vavti2016-01-154-29/+11
| * | | | | | | | | | | | provide more contact infos and update some protocol type definitionsMario Vavti2016-01-154-6/+19
| * | | | | | | | | | | | Use ctrl-d for multi-line messages.ken restivo2016-01-141-3/+5
| |/ / / / / / / / / / /
| * | | | | | | | | | | issue with plugin loadable layoutsredmatrix2016-01-143-4/+20
| * | | | | | | | | | | update widget docs with widget_cover_photoredmatrix2016-01-141-0/+7
| * | | | | | | | | | | cover photo fetch and widgetredmatrix2016-01-143-0/+82
| * | | | | | | | | | | more cover photo workredmatrix2016-01-141-22/+35
| * | | | | | | | | | | this might be controversal - if approving a connection from the popup go back...Mario Vavti2016-01-151-0/+3
| * | | | | | | | | | | since the perms will be reset on approval better do not provide the perms too...Mario Vavti2016-01-141-0/+2
| * | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-01-142-3/+3
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-148-204/+92
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | * | | | | | | | | | | revision updateredmatrix2016-01-142-3/+3
| * | | | | | | | | | | | provide some info about our contacts - status (archived, hidden, etc.), publi...Mario Vavti2016-01-145-7/+61
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #16 from redmatrix/mastermrjive2016-01-148-204/+92
|\| | | | | | | | | | |
| * | | | | | | | | | | bring back opacity for archived contactsMario Vavti2016-01-141-0/+5
| * | | | | | | | | | | some work on connectionsMario Vavti2016-01-145-190/+79
| * | | | | | | | | | | some template work on follow widgetMario Vavti2016-01-144-17/+11
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #15 from redmatrix/mastermrjive2016-01-1429-55/+1043
|\| | | | | | | | | |
| * | | | | | | | | | more progress on cover photo cropping and storageredmatrix2016-01-132-4/+395
| * | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-131-1/+1
| |\ \ \ \ \ \ \ \ \ \