aboutsummaryrefslogtreecommitdiffstats
path: root/util
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '2.8RC'Mario2017-10-253-1543/+2075
|\
| * stringsMario Vavti2017-10-191-1380/+1689
| * test recursive dav copyzotlabs2017-08-221-5/+17
| * util/dcp - support recursion and folders full of photos by importing files si...zotlabs2017-08-221-25/+64
| * util/dcp will now accept a directory as a destination. The directory must exi...zotlabs2017-08-201-36/+50
| * a few file activities were not getting syncedzotlabs2017-08-202-2/+16
| * add dmkdirzotlabs2017-08-201-0/+48
| * util/dcp "(DAV-copy) copy file from local system to Hubzilla/red DAV"zotlabs2017-08-171-0/+73
| * stringsMario Vavti2017-08-011-6813/+6724
* | Merge branch '2.6RC'2.6Mario Vavti2017-08-162-2078/+2087
|\ \
| * | stringsMario Vavti2017-08-011-6817/+6697
| |/
| * hmessages.po was corrupt from an old merge conflict - regeneratedzotlabs2017-07-051-5441/+3236
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-052-0/+21
| |\
| | * :bulb: Add Doxygen fix for @var member variable documentation.Klaus Weidenbach2017-05-042-0/+21
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-011-1/+2321
| |\|
| * | fix from downstreamzotlabs2017-04-071-1962/+1902
| * | stringszotlabs2017-03-311-3044/+3010
| * | channel_store_lowlevel declared twicezotlabs2017-03-291-1/+0
| * | get rid of get_app()zotlabs2017-03-281-2/+0
| * | get rid of 'davguest' and allow for project specific DB updates (currently db...zotlabs2017-03-251-2125/+2113
| * | move db_upgrade to zlibzotlabs2017-03-231-1/+2
| * | various input filter fixeszotlabs2017-03-181-2152/+1779
| * | more widgetszotlabs2017-03-151-20/+5
* | | Merge branch '2.4RC'2.4Mario Vavti2017-05-316-6941/+6622
|\ \ \
| * | | :bulb: Add Doxygen fix for @var member variable documentation.Klaus Weidenbach2017-05-052-0/+21
| | |/ | |/|
| * | version and stringsMario Vavti2017-05-011-540/+557
| * | regenerate hmessages.poMario Vavti2017-03-311-6525/+6399
| * | get rid of get_app()zotlabs2017-03-311-2/+0
| * | get rid of 'davguest' and allow for project specific DB updates (currently db...zotlabs2017-03-311-2125/+2113
| * | move db_upgrade to zlibzotlabs2017-03-311-1/+2
| * | various input filter fixeszotlabs2017-03-291-2152/+1779
| * | more widgetszotlabs2017-03-291-20/+5
| |/
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-03-151-0/+9
| |\
| | * :green_heart: Update Travis CI's Doxygen.Klaus Weidenbach2017-03-141-0/+9
| * | stringszotlabs2017-03-101-3838/+3824
| |/
| * string updatezotlabs2017-03-031-887/+910
| * string updatezotlabs2017-02-271-1424/+1442
| * We've passed the deadline for allowing unsigned zot finger tokens. It is now ...zotlabs2017-02-241-3034/+3039
* | Merge branch 2.2RC2.2Mario Vavti2017-03-085-3985/+4410
|\|
| * string updatezotlabs2017-02-171-405/+415
| * util/pconfig - don't enumerate empty arrays, mod_acl - add more commentszotlabs2017-02-131-2/+4
| * Create virtual privacy groups for private profile member listszotlabs2017-02-121-899/+914
| * string updatezotlabs2017-02-031-1996/+1965
| * string updatezotlabs2017-01-271-1278/+1352
| * js errors with raw message-id, string updateHubzilla2017-01-201-695/+857
| * native wiki stuffzotlabs2017-01-171-2/+4
| * string updatezotlabs2017-01-131-561/+586
| * stringszotlabs2017-01-061-2783/+2819
| * issue with post signatures if posted from api and logged in locally with a di...zotlabs2016-12-241-3362/+3403
| * update util/hz to use zot api instead of the (now optional) twitter apizotlabs2016-12-211-1/+1