aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.2RC'3.2Mario2018-03-0934-1315/+1208
|\
| * process follow from article menu in the background, do not reload page - hubz...zotlabs2018-03-071-3/+3
| * don't add pending connections to the default privacy group until acceptedzotlabs2018-03-071-7/+10
| * fix some issues with friend suggestions on standalone sites with no 'suggestm...zotlabs2018-03-052-7/+9
| * bugfix: unable to reset profile fields to defaults in admin/profs by emptying...zotlabs2018-03-051-0/+1
| * restrict mail messages to max_import_sizezotlabs2018-03-051-0/+7
| * profile edit: empty dob is set to the date of the first profile save unless y...zotlabs2018-02-281-1/+1
| * several email validation issueszotlabs2018-02-281-1/+1
| * move privacy groups to the newly created Access Control and Permissions tab. ...zotlabs2018-02-271-8/+9
| * move oauth_client management and guest access tokens to features rather than ...zotlabs2018-02-271-16/+43
| * change undo_post_tagging() to emit quoted tags rather than using underscore r...zotlabs2018-02-261-2/+9
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-261-1/+2
| |\
| | * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-251-4/+7
| | |\
| | * | mark connections where we do not have post_comments permissions with an no en...Mario Vavti2018-02-241-1/+2
| * | | issues with delivery of edited posts to forumszotlabs2018-02-262-1/+23
| | |/ | |/|
| * | siteinfo.json - if hide_in_statistics is set only include the total channels ...zotlabs2018-02-241-4/+7
| |/
| * usability: click your own profile photo to change it instead of hunting it do...zotlabs2018-02-231-0/+1
| * Usability and member experience: remove street address info from the default ...zotlabs2018-02-231-2/+2
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-224-28/+46
| |\
| | * move dreport from zot to libzotlabs2018-02-211-4/+4
| | * move Zotlabs\Zot\Verify to Zotlabs\Lib\Verify as part of the z6 re-orgzotlabs2018-02-212-4/+4
| | * cleanup the recent crypto code modifications. We need this stuff to be readable.zotlabs2018-02-211-20/+31
| | * add event resource_id to iconfig so Diaspora can search on it without looking...zotlabs2018-02-211-0/+7
| * | query for what we need instead of what we do not needMario Vavti2018-02-221-7/+13
| |/
| * trim non-existent/deprecated plugins from siteinfo plugin listzotlabs2018-02-202-3/+13
| * move the zot6 delivery to zot_fetch where it makes more sense. Exhaustively h...zotlabs2018-02-202-3/+8
| * zot6 delivery cleanupzotlabs2018-02-201-50/+49
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-201-2/+2
| |\
| | * don't try to handle OAEP for plugin crypto methods; let them do it if desiredzotlabs2018-02-201-2/+2
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-201-1/+6
| |\|
| | * encrypt/decrypt function not foundzotlabs2018-02-201-1/+6
| * | remove order by clauseMario Vavti2018-02-201-1/+1
| |/
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-192-3/+12
| |\
| | * do not show summary if it is equal to body and some styling for the summary/a...Mario Vavti2018-02-192-1/+4
| | * Merge pull request #981 from anaqreon/devgit-marijus2018-02-191-2/+8
| | |\
| | | * Update code tag styling so bbcode [code] blocks and wiki markdown inline code...Andrew Manning2018-02-181-2/+8
| | | * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-152-4/+2
| | | |\
| * | | | OAEP padding mismatch on some newer encryption methodszotlabs2018-02-192-9/+7
| * | | | more loggingzotlabs2018-02-191-0/+1
| * | | | add loggingzotlabs2018-02-191-0/+2
| |/ / /
| * | | crypto improvements (use pkcs1_oaep_padding instead of the older pkcs1_padding)zotlabs2018-02-161-5/+22
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-141-3/+13
| |\| | | | |/ | |/|
| | * since we only save the parent mid in notify we must look for thr_parent when ...Mario Vavti2018-02-131-1/+1
| | * fix parent id for likes in status notifications.Mario Vavti2018-02-131-2/+12
| * | provide option to block the public stream unless authenticated, since there c...zotlabs2018-02-142-4/+2
| |/
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-118-339/+74
| |\
| | * Merge pull request #976 from phellmes/time-ago-stringsgit-marijus2018-02-111-4/+10
| | |\
| | | * add flexibility to prefix/suffix string translations for jquery.timeagophellmes2018-02-111-4/+10
| | * | this might seem rediculous but it helps mysql to find the better index for th...Mario Vavti2018-02-111-1/+1
| | |/
| | * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-092-10/+184
| | |\