aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-191-1/+1
|\
| * don't include pending connections in pocozotlabs2017-11-181-1/+1
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-172-4/+35
|\|
| * improve the icon mappings for cloud tile viewzotlabs2017-11-162-4/+35
* | compare strpos result against falseMario Vavti2017-11-161-2/+2
* | provide ability to pin apps to navbar from /apps. this removes the ability to...Mario Vavti2017-11-161-5/+9
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-151-1/+1
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-153-14/+58
| |\
| * | typo - fixes issue #910Mario Vavti2017-11-151-1/+1
* | | This should sort out hubzilla issue #826 but requires a bit more testing. It ...zotlabs2017-11-151-8/+8
| |/ |/|
* | sort out a few more large image upload issueszotlabs2017-11-143-14/+58
|/
* Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-141-6/+2
|\
| * issue with group_rmvzotlabs2017-11-131-6/+2
* | sort combined private mail conversations by latest updated conversation inste...Mario Vavti2017-11-131-4/+1
* | fix php warnings on photo deleteMario Vavti2017-11-131-1/+1
|/
* improve removed_channel final cleanup. Hubzilla issue #386zotlabs2017-11-121-15/+45
* fix some conflicts between private tags and forum tagszotlabs2017-11-121-154/+150
* cleanup of upload_to_comments test; we actually don't care about the profile ...zotlabs2017-11-121-14/+8
* also disable uploading in comments if the channel permissionlimits for view_s...zotlabs2017-11-111-0/+3
* hubzilla issue #901 - unicode characters in urls tripping up url regexes - th...zotlabs2017-11-094-13/+13
* use loggerzotlabs2017-11-081-2/+1
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-081-8/+10
|\
| * rename channel app events to calendar and add nav_set_selected() to /calMario Vavti2017-11-071-3/+3
| * add location info to the navbarMario Vavti2017-11-071-5/+7
* | make most recent cloud_tiles setting for local channels persistent across loginszotlabs2017-11-071-0/+1
|/
* lets try this in the wild for a whileMario Vavti2017-11-061-4/+4
* attach.php minor cleanup and doczotlabs2017-11-061-61/+26
* allow cloud filenames to include ampersands without messing up auth tokens (z...zotlabs2017-11-051-16/+5
* fix can_comment_on_post() after recent code cleanup (a required array paramet...zotlabs2017-11-041-0/+1
* fix wrong variable in sprintf resulting in php warningMario Vavti2017-11-041-1/+1
* Merge branch 'dev' into docugit-marijus2017-11-046-30/+74
|\
| * Merge pull request #891 from dawnbreak/langlibsgit-marijus2017-11-043-33/+48
| |\
| | * :white_check_mark: Some more work on unit tests.Klaus Weidenbach2017-10-291-9/+21
| | * :arrow_up: Update intl library.Klaus Weidenbach2017-10-291-4/+1
| | * :arrow_up: Update Text_LanguageDetect.Klaus Weidenbach2017-10-292-20/+24
| | * :white_check_mark: Some unit test for include/language.phpKlaus Weidenbach2017-10-261-0/+2
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-041-0/+12
| |\ \
| | * | provide short localised summary for likes that will end up in displayed notif...zotlabs2017-11-031-0/+12
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-032-0/+28
| |\| |
| | * | imagedata not set correctly if large photo AND imagick is not installedzotlabs2017-11-031-0/+3
| | * | fix cloud redirects with owt tokenszotlabs2017-11-031-0/+25
* | | | :bulb: Improving Doxygen documentation.Klaus Weidenbach2017-11-0313-948/+1573
|/ / /
* / / update item_normal() to not include ACTIVITY_OBJ_FILE obj_typeMario Vavti2017-11-031-4/+4
|/ /
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-022-4/+4
|\ \
| * \ Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-023-8/+28
| |\ \
| * \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-021-1/+11
| |\ \ \
| * | | | fix issues with diaspora xchansMario Vavti2017-11-022-4/+4
* | | | | more queue workzotlabs2017-11-022-5/+11
| |_|/ / |/| | |
* | | | put deferred queue logic every place we create a delivery process (except for...zotlabs2017-11-023-8/+28
| |/ / |/| |
* | | don't perform zot_refresh on dead sites unless $force is setzotlabs2017-11-011-0/+10