aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into oauth2Andrew Manning2018-02-2411-11/+66
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-248-10/+25
| |\
| | * open_pubstream logic was messy and wrongzotlabs2018-02-231-1/+7
| | * style the 'use existing' button a wee bitzotlabs2018-02-232-2/+2
| | * use embed photos javascript widget to select existing photos for profile and ...zotlabs2018-02-234-7/+15
| | * Usability and member experience: remove street address info from the default ...zotlabs2018-02-233-2/+3
| * | fix issues with DB update 1204Mario Vavti2018-02-231-3/+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-221-1/+4
| * provide DB compatibility for poll and voting implementations across several p...zotlabs2018-02-221-0/+34
* | Add channel ID to user_id in clients table. Added TODO comments about dynamic...Andrew Manning2018-02-242-12/+26
* | Merge branch 'dev' into oauth2Andrew Manning2018-02-228-54/+6
|\|
| * also sort by id to not make mysql change the queryplan if offset is > 0 after...Mario Vavti2018-02-221-1/+1
| * remove the unused ZotDriver and ProtoDriver classeszotlabs2018-02-212-49/+0
| * move dreport from zot to libzotlabs2018-02-211-1/+1
| * move Zotlabs\Zot\Verify to Zotlabs\Lib\Verify as part of the z6 re-orgzotlabs2018-02-213-3/+3
| * Add 'Validate' button to new_channel page and disable submit until validated....zotlabs2018-02-201-0/+1
* | The authorization step with client registration and authorization code retrie...Andrew Manning2018-02-222-35/+100
* | Merge branch 'dev' into oauth2Andrew Manning2018-02-20210-153/+4704
|\|
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-201-1/+1
| |\
| | * copy/paste error resulting in bad behaviourzotlabs2018-02-201-1/+1
| * | missing fileMario Vavti2018-02-201-0/+29
| |/
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-197-62/+84
| |\
| | * 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-193-8/+16
| | * | Merge pull request #980 from dawnbreak/devgit-marijus2018-02-193-53/+44
| | |\ \
| | | * | Refactor OAuth2Server a bit.Klaus Weidenbach2018-02-173-53/+44
| | * | | backport update 1201 to the new update system and move dummy update to 1202Mario Vavti2018-02-192-5/+28
| * | | | and fix the typozotlabs2018-02-191-1/+1
| * | | | fix the fix for precisionzotlabs2018-02-191-1/+1
| | |_|/ | |/| |
| * | | target zot6 deliveries with more precision to ensure we handle a very precise...zotlabs2018-02-191-1/+15
| |/ /
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-162-7/+7
| |\|
| * | refactor of the DB update system. Updates are now stored individually in Zotl...zotlabs2018-02-16204-99/+4585
* | | OAuth2TestVehicle module can create and delete oauth2 database tables.Andrew Manning2018-02-203-43/+117
* | | Created test vehicle module oauth2testAndrew Manning2018-02-181-0/+43
| |/ |/|
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-164-54/+171
|\|
| * extend the oauth2 storage driver so that we can use our own channel tablezotlabs2018-02-154-54/+171
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-142-6/+17
| |\
* | | some more DB tuning.Mario Vavti2018-02-152-7/+7
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-153-5/+15
|\| | | |/ |/|
| * provide option to block the public stream unless authenticated, since there c...zotlabs2018-02-143-5/+15
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-144-2/+162
|\|
| * Merge branch 'share'zotlabs2018-02-133-1/+161
| |\
| | * turn shares into activities - make certain to pull addons or JSON-LD will chu...zotlabs2018-02-133-4/+149
| | * initial share refactorzotlabs2018-02-121-1/+16
| * | defperms: bad queryzotlabs2018-02-131-1/+1
| |/
* | fix item link in fsprintMario Vavti2018-02-131-1/+1
* | match against item verbMario Vavti2018-02-131-4/+4
* | since we only save the parent mid in notify we must look for thr_parent when ...Mario Vavti2018-02-131-1/+12
|/
* if always_show_in_notices is set to 1 also show likes and dislikesMario Vavti2018-02-121-15/+28