aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-0615-108/+126
|\
| * update es-es help.htmlMario Vavti2017-11-061-1/+1
| |
| * Merge pull request #900 from anaqreon/devgit-marijus2017-11-065-7/+39
| |\ | | | | | | Add Manuel's Spanish translations for context help
| | * Update help.htmlAndrew Manning2017-11-041-2/+2
| | |
| | * Add Manuel's Spanish translations for context helpAndrew Manning2017-11-025-7/+39
| | |
| * | lets try this in the wild for a whileMario Vavti2017-11-062-5/+5
| | |
| * | fix unable to mark all messages readMario Vavti2017-11-061-1/+1
| | |
| * | attach.php minor cleanup and doczotlabs2017-11-061-61/+26
| | |
| * | allow cloud filenames to include ampersands without messing up auth tokens ↵zotlabs2017-11-054-32/+15
| | | | | | | | | | | | (zid, owt, and zat, and the constant placeholder 'f=')
| * | common connections on suggestion page showing wildly different results than ↵zotlabs2017-11-051-2/+2
| | | | | | | | | | | | remote profile, and is consistently off by one
| * | fix can_comment_on_post() after recent code cleanup (a required array ↵zotlabs2017-11-041-0/+1
| | | | | | | | | | | | parameter was missing)
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-042089-505286/+492846
| |\ \
| * \ \ Merge branch 'dev_merge'zotlabs2017-11-041-0/+37
| |\ \ \
| | * | | developer certificate of originzotlabs2017-11-041-0/+37
| | | | |
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-034-16/+11
| |\ \ \ \
* | \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-042092-505289/+492863
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | fix wrong variable in sprintf resulting in php warningMario Vavti2017-11-041-1/+1
| | | | |
| * | | | Merge pull request #883 from dawnbreak/docugit-marijus2017-11-0426-1254/+2153
| |\ \ \ \ | | | | | | | | | | | | :bulb: Improving Doxygen documentation.
| | * \ \ \ Merge branch 'dev' into docugit-marijus2017-11-040-0/+0
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch 'dev' into docugit-marijus2017-11-042070-504039/+490740
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #891 from dawnbreak/langlibsgit-marijus2017-11-042063-504033/+490694
| |\ \ \ \ \ | | | | | | | | | | | | | | Langlibs updates
| | * | | | | :white_check_mark: Some more work on unit tests.Klaus Weidenbach2017-10-296-177/+261
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some small improvements for coverage report. Add more functions from include/text.php Update composer dev libraries for phpunit.
| | * | | | | :arrow_up: Update intl library.Klaus Weidenbach2017-10-292034-499059/+486344
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update intl library from v0.4? (2014) to v0.7.4 (2016). Use global composer autoloader now.
| | * | | | | :arrow_up: Update Text_LanguageDetect.Klaus Weidenbach2017-10-2924-2489/+1614
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update from v0.3.0 (2012) to v1.0.0 (2017) which should remove some warnings and improve PHP7 support. Using composer to handle this PEAR library now. Fix a problem in FeedutilsTest.
| | * | | | | :white_check_mark: Some unit test for include/language.phpKlaus Weidenbach2017-10-262-0/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately not so much unit testable, but added in preparation to update LanguageDetect and Intl library.
| * | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-044-4/+18
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | / / | | |_|_|/ / | |/| | | |
| | * | | | provide short localised summary for likes that will end up in displayed ↵zotlabs2017-11-032-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | notifications
| | * | | | more search workzotlabs2017-11-032-3/+1
| | | | | |
| | | | * | :bulb: Improving Doxygen documentation.Klaus Weidenbach2017-11-0326-1258/+2168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some Doxygen parsing errors. Improve hooks documentation.
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-0313-26/+115
|\| | | | |
| * | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-033-5/+42
| |\| | | | | | |_|/ / | |/| | |
| | * | | imagedata not set correctly if large photo AND imagick is not installedzotlabs2017-11-031-0/+3
| | | | |
| | * | | fix cloud redirects with owt tokenszotlabs2017-11-032-5/+39
| | | | |
| * | | | update item_normal() to not include ACTIVITY_OBJ_FILE obj_typeMario Vavti2017-11-033-16/+9
| | | | |
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-036-5/+62
| |\| | |
| | * | | hubzilla issue #896zotlabs2017-11-023-0/+50
| | | | |
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-023-6/+6
| | |\ \ \
| | * | | | more queue workzotlabs2017-11-023-5/+12
| | | | | |
| * | | | | set $module_format to html to not break updates. it will be set to something ↵Mario Vavti2017-11-031-0/+2
| | |/ / / | |/| | | | | | | | | | | | | else later if appropriate
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-027-15/+53
|\| | | |
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-024-8/+36
| |\| | | | | |_|/ | |/| |
| | * | put deferred queue logic every place we create a delivery process (except ↵zotlabs2017-11-024-8/+36
| | | | | | | | | | | | | | | | for protocol 'friend requests' which aren't likely to swamp the delivery system). Remove it from the queue_delivery function which was too late to do anything.
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-021-1/+11
| |\| |
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-011-0/+12
| | |\ \
| | * | | don't perform zot_refresh on dead sites unless $force is setzotlabs2017-11-011-0/+10
| | | | |
| | * | | do not send message_list responses to dead sites (this delivery method ↵zotlabs2017-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | bypassed the notifier)
| * | | | fix issues with diaspora xchansMario Vavti2017-11-023-6/+6
| | |/ / | |/| |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-0132-44/+257
|\| | |
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-0122-17/+173
| |\| |
| | * | support for netselect queryzotlabs2017-11-016-8/+33
| | | |