aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into oauth2Andrew Manning2018-02-2514-16/+79
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-254-9/+27
| |\
| | * siteinfo.json - if hide_in_statistics is set only include the total channels ...zotlabs2018-02-241-4/+7
| | * make the profile photo image picker work correctly with multiple profiles.zotlabs2018-02-243-5/+20
| * | do not overwrite abook flags if we are not ownerMario Vavti2018-02-251-1/+1
| * | mark connections where we do not have post_comments permissions with an no en...Mario Vavti2018-02-2410-6/+51
* | | An authorization token is received, but I had to modify the Request class in ...Andrew Manning2018-02-254-16/+64
* | | Merge branch 'dev' into oauth2Andrew Manning2018-02-2422-21/+306
|\| |
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-2414-17/+246
| |\|
| | * open_pubstream logic was messy and wrongzotlabs2018-02-231-1/+7
| | * style the buttons even morezotlabs2018-02-232-4/+4
| | * style the 'use existing' button a wee bitzotlabs2018-02-234-6/+4
| | * use embed photos javascript widget to select existing photos for profile and ...zotlabs2018-02-238-10/+233
| | * usability: click your own profile photo to change it instead of hunting it do...zotlabs2018-02-232-1/+2
| | * Usability and member experience: remove street address info from the default ...zotlabs2018-02-234-4/+5
| * | fix issues with DB update 1204Mario Vavti2018-02-231-3/+3
| |/
| * mod_new_channel: don't require nickname validation after name validation (whi...zotlabs2018-02-221-0/+3
| * handle error logging in on cloud page (post method not implemented), politely...zotlabs2018-02-221-0/+3
| * cloud 'view-as-tiles' toggle wasn't available (at all) for guests and they ar...zotlabs2018-02-222-3/+7
| * provide DB compatibility for poll and voting implementations across several p...zotlabs2018-02-224-1/+47
* | Add channel ID to user_id in clients table. Added TODO comments about dynamic...Andrew Manning2018-02-244-15/+29
* | Merge branch 'dev' into oauth2Andrew Manning2018-02-2219-159/+162
|\|
| * also sort by id to not make mysql change the queryplan if offset is > 0 after...Mario Vavti2018-02-221-1/+1
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-2210-81/+50
| |\
| | * remove the unused ZotDriver and ProtoDriver classeszotlabs2018-02-212-49/+0
| | * move dreport from zot to libzotlabs2018-02-212-5/+5
| | * move Zotlabs\Zot\Verify to Zotlabs\Lib\Verify as part of the z6 re-orgzotlabs2018-02-215-7/+7
| | * cleanup the recent crypto code modifications. We need this stuff to be readable.zotlabs2018-02-211-20/+31
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-211-1/+1
| | |\
| | * | 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
| | |/ | |/|
| * | bump versionMario Vavti2018-02-211-1/+1
| |/
| * trim non-existent/deprecated plugins from siteinfo plugin listzotlabs2018-02-202-3/+13
| * Add 'Validate' button to new_channel page and disable submit until validated....zotlabs2018-02-203-13/+27
| * 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
* | The authorization step with client registration and authorization code retrie...Andrew Manning2018-02-224-42/+113
* | Merge branch 'dev' into oauth2Andrew Manning2018-02-20219-3299/+4755
|\|
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-202-3/+3
| |\
| | * copy/paste error resulting in bad behaviourzotlabs2018-02-201-1/+1
| | * 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
| * | missing fileMario Vavti2018-02-201-0/+29
| * | more index finetuning to fix the expire queryMario Vavti2018-02-202-5/+5
| |/
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-1912-66/+128
| |\
| | * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-191-1/+15
| | |\
| | * | updates 1201 and 1200 should return success for postgres. notifications: remo...Mario Vavti2018-02-194-8/+18
| | * | do not show summary if it is equal to body and some styling for the summary/a...Mario Vavti2018-02-193-2/+13
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 12:00:06 +0000