aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Show "Unseen public activity" channel setting when site only public streams a...Julian Schweinsberg2018-04-091-2/+3
* Modified notifications widget to add the public stream when the current user ...Julian Schweinsberg2018-04-091-1/+1
* Merge pull request #1051 from anaqreon/auto-savegit-marijus2018-04-091-1/+4
|\
| * Added feature setting for auto-save, defaulting to enabled.Andrew Manning2018-04-081-1/+4
| * removed Autosavetext.php file since it is not used with localStorageAndrew Manning2018-04-081-37/+0
| * Merge branch 'dev' into auto-saveAndrew Manning2018-04-081-1/+1
| |\
| * | Auto-save post and comment entry using localStorage in browser.Andrew Manning2018-04-081-4/+0
| * | Merge branch 'dev' into auto-saveAndrew Manning2018-04-0712-20/+196
| |\ \
| * | | Post body and title are auto-savedAndrew Manning2018-04-042-0/+41
* | | | more intelligent handling of level 0 - and remove an extraneous logging functionzotlabs2018-04-081-2/+7
* | | | more work merging techlevels and featureszotlabs2018-04-081-25/+32
* | | | first cut of feature/techlevel mergezotlabs2018-04-081-4/+24
* | | | extend ACzotlabs2018-04-082-1/+5
* | | | hubzilla issue #1050 pubstream notifications visible when pubstream is notzotlabs2018-04-081-1/+2
| |_|/ |/| |
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-081-1/+1
|\ \ \ | |_|/ |/| |
| * | we shouldn't need distinct here, since ids_to_querystr() will filter duplicat...zotlabs2018-04-071-1/+1
* | | rename button label in editpost from edit to submitMario Vavti2018-04-071-1/+1
* | | rename relation to relationship - issue #1044Mario Vavti2018-04-071-1/+1
* | | use Title instead of Caption - issue #1037Mario Vavti2018-04-071-3/+3
* | | Use Add Files/Photos instead of Upload to open the upload dialogMario Vavti2018-04-072-3/+3
|/ /
* | bring back the dnt policy document, not sure when it was lostzotlabs2018-04-051-1/+4
* | oauth2 client settings pagezotlabs2018-04-053-6/+175
* | fix permalinks to children of articles and cardszotlabs2018-04-054-3/+6
* | private forum mentionszotlabs2018-04-041-1/+1
* | allow the profile recrods to be cloned separatelyzotlabs2018-04-041-1/+2
|/
* disable the oauth2testvehicle completely until it is safezotlabs2018-04-031-1/+3
* get rid of dangerous test codezotlabs2018-04-031-68/+0
* OAuth2 integrationzotlabs2018-04-033-10/+88
* Merge branch 'master' into oauth2zotlabs2018-04-033-4/+8
|\
| * some more work on hubzilla issue #1019zotlabs2018-04-021-1/+5
| * obscurify chatszotlabs2018-04-012-3/+3
* | Merge branch 'oauth2' of https://github.com/anaqreon/hubzilla into oauth2zotlabs2018-03-314-33/+290
|\ \ | |/ |/|
| * Merge branch 'dev' into oauth2Andrew Manning2018-03-3111-30/+35
| |\
| * \ Merge branch 'dev' into oauth2Andrew Manning2018-03-2725-107/+307
| |\ \
| * \ \ Merge branch 'dev' into oauth2Andrew Manning2018-03-123-20/+30
| |\ \ \
| * | | | Fixed access_token request bug and returned oauth2-server-php library to unmo...Andrew Manning2018-03-101-7/+8
| * | | | Merge branch 'dev' into oauth2Andrew Manning2018-03-107-11/+102
| |\ \ \ \
| * \ \ \ \ Merge branch 'dev' into oauth2Andrew Manning2018-03-053-11/+37
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dev' into oauth2Andrew Manning2018-03-0413-52/+256
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dev' into oauth2Andrew Manning2018-02-285-8/+34
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dev' into oauth2Andrew Manning2018-02-263-4/+43
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Successful OAuth2 sequence demonstrated with the test vehicle, including an a...Andrew Manning2018-02-262-65/+77
| * | | | | | | | | Merge branch 'dev' into oauth2Andrew Manning2018-02-253-6/+31
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | An authorization token is received, but I had to modify the Request class in ...Andrew Manning2018-02-253-15/+63
| * | | | | | | | | | Merge branch 'dev' into oauth2Andrew Manning2018-02-2411-11/+66
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | OAuth2TestVehicle module can create and delete oauth2 database tables.Andrew Manning2018-02-203-43/+117