aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add default_permissions_role social_private to autocreate a social private ch...Haakon Meland Eriksen2016-01-181-1/+2
* Add Hubzilla Hubsites plugin to deploy script, change git for DeadSuperHero H...Haakon Meland Eriksen2016-01-181-1/+6
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-1819-207/+317
|\
| * 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
| |\ \
| * | | generalise the site iconredmatrix2016-01-175-31/+48
| * | | various issues from the forumsredmatrix2016-01-1713-32/+65
| | |/ | |/|
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-176-1236/+1346
|\ \ \ | | |/ | |/|
| * | update es-es and nl strings. adjusted a few matrix to grid stringsjeroenpraat2016-01-176-1236/+1346
| |/
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-179-23/+21
|\|
| * 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
| |\
| * | add $deliver flag to item_store() and item_store_update() [default true]. If ...redmatrix2016-01-167-21/+18
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-171-2/+3
|\ \ \ | | |/ | |/|
| * | move dir total ratings button to the left to prevent the connect button beein...Mario Vavti2016-01-161-2/+3
| |/
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-1618-594/+816
|\|
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-158-43/+43
| |\
| | * 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
| * | minor version rollredmatrix2016-01-153-526/+571
| |/
| * 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 remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-1439-7676/+8564
|\| |
| * | 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
| |/
| * 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
| |\
| | * fix sharing of photo itemsMario Vavti2016-01-131-1/+1
| * | some initial work on uploading and cropping cover photosredmatrix2016-01-136-2/+121
| |/
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-131-1/+1
| |\
| | * 20em is to big for mobile useMario Vavti2016-01-131-1/+1
| * | more work on auto channel creation during registerredmatrix2016-01-134-1/+116
| |/
| * very small tweaks to CLI plugin manager utilityredmatrix2016-01-132-6/+8
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-121-2/+2
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 00:39:31 +0000