Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'doku' into 'dev' | Mario | 2019-01-29 | 1 | -136/+239 |
|\ | | | | | | | | | Extend documentation. See merge request hubzilla/core!1496 | ||||
| * | Extend documentation. | Klaus Weidenbach | 2019-01-28 | 1 | -136/+239 |
| | | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-28 | 2 | -0/+6 |
| |\ | |||||
* | | | disable hyperdrive in hubzilla | zotlabs | 2019-01-28 | 1 | -0/+5 |
| | | | |||||
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2019-01-28 | 3 | -128/+129 |
|\| | | |/ |/| | |||||
| * | Remove extraneous sync logic | M. Dent | 2019-01-27 | 1 | -12/+2 |
| | | |||||
| * | return false if http signatue is not valid | Mario Vavti | 2019-01-25 | 1 | -2/+1 |
| | | |||||
| * | Merge branch 'doku' into 'dev' | Mario | 2019-01-25 | 2 | -115/+122 |
| |\ | | | | | | | | | | | | | Correct and extend Doxygen comments. See merge request hubzilla/core!1485 | ||||
| | * | Correct and extend Doxygen comments. | Klaus Weidenbach | 2019-01-23 | 2 | -115/+122 |
| | | | | | | | | | | | | | | | | | | Correct some documentation errors for Doxygen and add more comments. Document some undefined variables with @FIXME. | ||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-25 | 1 | -1/+35 |
| |\ \ | | |/ | |/| | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-21 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-18 | 1 | -11/+13 |
| |\ \ \ | |||||
| * | | | | add space | Mario Vavti | 2019-01-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fix delivery report for zot6 connections | Mario Vavti | 2019-01-17 | 2 | -1/+6 |
| | | | | | |||||
* | | | | | share fixes | zotlabs | 2019-01-27 | 2 | -0/+6 |
| |_|_|/ |/| | | | |||||
* | | | | support photo items between zot and zot6 | zotlabs | 2019-01-24 | 1 | -1/+35 |
| |_|/ |/| | | |||||
* | | | comment permission fix | zotlabs | 2019-01-20 | 1 | -1/+1 |
| |/ |/| | |||||
* | | more specific network checking in several places and remove some old ↵ | zotlabs | 2019-01-17 | 1 | -11/+13 |
|/ | | | | debugging crud | ||||
* | event attendance testing continued (now works at a basic level from one ↵ | zotlabs | 2019-01-16 | 1 | -1/+1 |
| | | | | direction, more testing needed) | ||||
* | more z6 event work | zotlabs | 2019-01-16 | 1 | -1/+27 |
| | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2019-01-16 | 3 | -8/+30 |
|\ | |||||
| * | change logic for consistency | Mario Vavti | 2019-01-16 | 1 | -3/+6 |
| | | |||||
| * | fix legacy zot dreport not passing the is_storable check | Mario Vavti | 2019-01-15 | 2 | -2/+16 |
| | | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-09 | 1 | -1/+3 |
| |\ | |||||
| * | | Tweak to deal with changes that may happen within the same second. | DM42.Net (Matt Dent) | 2019-01-07 | 1 | -6/+11 |
| | | | |||||
* | | | more work on z6 events | zotlabs | 2019-01-16 | 1 | -0/+37 |
| | | | |||||
* | | | more z6 compatibility fixes | zotlabs | 2019-01-16 | 1 | -0/+6 |
| |/ |/| | |||||
* | | make Apps::get_base_apps() pluggable | zotlabs | 2019-01-08 | 1 | -1/+3 |
|/ | |||||
* | reverse activity mapping improvements | zotlabs | 2018-12-19 | 1 | -2/+87 |
| | |||||
* | fix default values for affinity tool and other information which could be ↵ | zotlabs | 2018-12-17 | 1 | -3/+1 |
| | | | | lost when approving a connection without the entire form provided by connedit. | ||||
* | regression: the ability to order apps messed up since adding pinned apps to ↵ | zotlabs | 2018-12-12 | 1 | -12/+26 |
| | | | | the ordering | ||||
* | partial solution for obj|tgt multiple (zot and zot6) encodings; the zot6 ↵ | zotlabs | 2018-12-03 | 1 | -0/+6 |
| | | | | version will be stored under $item['obj']['asld'] | ||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-12-03 | 1 | -1/+1 |
|\ | |||||
| * | fallback to url if we have not got an addr | Mario Vavti | 2018-12-02 | 1 | -1/+1 |
| | | | | | | (cherry picked from commit a3ba7f0788705a6ebee57433e80712b282b0e784) | ||||
* | | more merging | zotlabs | 2018-12-03 | 1 | -9/+67 |
| | | |||||
* | | more work on z6 commenting | zotlabs | 2018-12-03 | 2 | -64/+253 |
|/ | |||||
* | allow notification filtering by name or addr | zotlabs | 2018-11-30 | 1 | -0/+1 |
| | |||||
* | Organization actor type was missing | zotlabs | 2018-11-23 | 1 | -1/+1 |
| | |||||
* | no mention notifications from mastodon (and pleroma) | zotlabs | 2018-11-21 | 1 | -1/+1 |
| | |||||
* | use this form instead | zotlabs | 2018-11-19 | 1 | -2/+1 |
| | |||||
* | push recent changes | zotlabs | 2018-11-19 | 1 | -0/+4 |
| | |||||
* | datetime_convert wrong args | zotlabs | 2018-11-15 | 1 | -1/+1 |
| | |||||
* | add item.uuid to relevant places | zotlabs | 2018-11-15 | 1 | -13/+4 |
| | |||||
* | separate by network | zotlabs | 2018-11-14 | 1 | -0/+1 |
| | |||||
* | fix dreport link | zotlabs | 2018-11-14 | 1 | -2/+5 |
| | |||||
* | Merge branch 'master' into zvi | zotlabs | 2018-11-13 | 1 | -2/+12 |
|\ | |||||
| * | enotify::format hook for superblock | zotlabs | 2018-11-12 | 1 | -2/+12 |
| | | |||||
* | | dreport updates | zotlabs | 2018-11-12 | 1 | -2/+82 |
| | | |||||
* | | more z6 debugging | zotlabs | 2018-11-11 | 1 | -2/+3 |
| | | |||||
* | | Merge branch 'master' into zvi | zotlabs | 2018-11-07 | 1 | -15/+92 |
|\| |