aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into oauth2Andrew Manning2018-03-048-12/+81
|\
| * more work on federated pollszotlabs2018-03-031-0/+30
| |
| * process follow from article menu in the background, do not reload page - ↵zotlabs2018-03-021-3/+3
| | | | | | | | hubzilla issue #987
| * sort settings/featuredzotlabs2018-03-021-0/+6
| |
| * background work for caldav integration continued, modify mod_follow to allow ↵zotlabs2018-03-022-3/+34
| | | | | | | | it to be called from ajax without redirecting.
| * Update composer autoload cache.Klaus Weidenbach2018-03-011-4/+6
| |
| * profile edit: empty dob is set to the date of the first profile save unless ↵zotlabs2018-02-281-1/+1
| | | | | | | | you clear it first
| * several email validation issueszotlabs2018-02-281-1/+1
| |
* | Merge branch 'dev' into oauth2Andrew Manning2018-02-283-26/+83
|\|
| * move privacy groups to the newly created Access Control and Permissions tab. ↵zotlabs2018-02-271-8/+9
| | | | | | | | Not for 3.2 as it requires string changes from the prior checkin.
| * move oauth_client management and guest access tokens to features rather than ↵zotlabs2018-02-271-16/+43
| | | | | | | | auto-enabling at various feature levels. This involves string changes and should *not* go into 3.2RC.
| * change undo_post_tagging() to emit quoted tags rather than using underscore ↵zotlabs2018-02-261-2/+9
| | | | | | | | replacement if they contain spaces.
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-261-1/+2
| |\
| * | issues with delivery of edited posts to forumszotlabs2018-02-262-1/+23
| | |
* | | Merge branch 'dev' into oauth2Andrew Manning2018-02-261-3/+1
|\ \ \ | | |/ | |/|
* / | Successful OAuth2 sequence demonstrated with the test vehicle, including an ↵Andrew Manning2018-02-262-13/+48
|/ / | | | | | | authenticated API call using an access_token.
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-251-4/+7
|\|
| * siteinfo.json - if hide_in_statistics is set only include the total channels ↵zotlabs2018-02-241-4/+7
| | | | | | | | count and no other statistical info
* | mark connections where we do not have post_comments permissions with an no ↵Mario Vavti2018-02-241-1/+2
|/ | | | entry sign.
* usability: click your own profile photo to change it instead of hunting it ↵zotlabs2018-02-231-0/+1
| | | | down in the profile edit navmenu. We still need work on the 'or use a photo from your albums' to use something like the photo selection widget in the post editor as you otherwise have to track down the 'use as profile photo' entry in the photo detail navmenu instead of just clicking an image.
* Usability and member experience: remove street address info from the default ↵zotlabs2018-02-231-2/+2
| | | | basic profile fields, mention that the site banner can be full HTML, mention on the techlevel setting that this also controls what additional features may be visible.
* 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 ↵zotlabs2018-02-211-0/+7
| | | | | | | | looking inside JSON objects.
* | 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 ↵zotlabs2018-02-202-3/+8
| | | | hand tested.
* 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 ↵Mario Vavti2018-02-192-1/+4
| | | | | | | | summary/article toggle links
| * Merge pull request #981 from anaqreon/devgit-marijus2018-02-191-2/+8
| |\ | | | | | | Update code tag styling so bbcode [code] blocks and wiki markdown ...
| | * Update code tag styling so bbcode [code] blocks and wiki markdown inline ↵Andrew Manning2018-02-181-2/+8
| | | | | | | | | | | | code render nicely.
| | * 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
| | | | | | | | dealing with likes
| * 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 ↵zotlabs2018-02-142-4/+2
|/ | | | could be legal issues with unmoderated content
* 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
| |\ | | | | | | more flexibility for relative date/time translations
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 17:11:16 +0000