aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* don't provide a connect button for transient identitieszotlabs2018-04-081-0/+6
* more intelligent handling of level 0 - and remove an extraneous logging functionzotlabs2018-04-081-2/+7
* more work merging techlevels and featureszotlabs2018-04-082-25/+47
* first cut of feature/techlevel mergezotlabs2018-04-083-6/+33
* anon_identity_init: put anonymous commenters in network 'anon' so that they c...zotlabs2018-04-081-3/+3
* extend ACzotlabs2018-04-083-2/+17
* hubzilla issue #1050 pubstream notifications visible when pubstream is notzotlabs2018-04-081-1/+2
* Merge pull request #1048 from dentm42/plugin-error-trapgit-marijus2018-04-081-7/+56
|\
| * Remove remove plugin from \App::[] on uninstallM.Dent2018-04-071-1/+4
| * Uninstall plugin on Exception on load.M.Dent2018-04-071-1/+1
| * Add class for ExceptionsM.Dent2018-04-071-6/+6
| * Add error handler and try/catch for all () callsDM42.Net (Matt Dent)2018-04-071-7/+53
* | 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
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-071-1/+1
|\|
| * channel import failing to provide channel_password valuezotlabs2018-04-061-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-075-6/+6
|/
* put directory server in siteinfo - there are a lot of sites using broken dire...zotlabs2018-04-061-0/+1
* bring back the dnt policy document, not sure when it was lostzotlabs2018-04-052-1/+222
* oauth2 client settings pagezotlabs2018-04-057-9/+242
* use profile_store_lowlevel() when importing profile structures to ensure all ...zotlabs2018-04-052-5/+8
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-04-057-1/+387
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-059-57/+51
| |\
| * \ Merge pull request #1039 from phellmes/doco-feat-addgit-marijus2018-04-057-1/+387
| |\ \
| | * | add basic structure for additional features documentationphellmes2018-04-047-1/+387
* | | | fix permalinks to children of articles and cardszotlabs2018-04-054-3/+6
| |_|/ |/| |
* | | bbcode() - ensure that $options is always an array, as the interface has chan...zotlabs2018-04-041-0/+4
* | | oauth2 dynamic client registration updatezotlabs2018-04-041-19/+11
* | | private forum mentionszotlabs2018-04-043-4/+8
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-04-041-1/+4
|\| |
| * | do not use punify() in get_baseurl() due to performance issuesMario Vavti2018-04-041-1/+4
| |/
* | allow the profile recrods to be cloned separatelyzotlabs2018-04-042-2/+3
* | allow the link target attribute to be modified in bbcode() from much further ...zotlabs2018-04-044-32/+25
|/
* 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-036-11/+195
* Merge branch 'master' into oauth2zotlabs2018-04-039-84/+87
|\
| * community tags: allow signature of either author or owner so that it stands a...zotlabs2018-04-031-1/+1
| * some more work on hubzilla issue #1019zotlabs2018-04-022-2/+6
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-04-022-6/+6
| |\
| | * fix missing login/out buttons for medium screensizeMario Vavti2018-04-012-6/+6
| * | community tagging refactor - we no longer send an edited post/comment to ever...zotlabs2018-04-021-11/+9
| * | commtag refactorzotlabs2018-04-021-35/+58
| * | missing year on profile birthday input, some optimisations to statszotlabs2018-04-023-39/+17
| * | obscurify chatszotlabs2018-04-012-3/+3
| |/
* | Merge branch 'oauth2' of https://github.com/anaqreon/hubzilla into oauth2zotlabs2018-03-318-51/+372
|\ \ | |/ |/|
| * Merge branch 'dev' into oauth2Andrew Manning2018-03-3124-50/+99
| |\