aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-283-235/+132
|\
| * check for updateCountsOnly in NavUpdate()Mario Vavti2017-11-281-19/+19
| * set profile_uid in mod hqMario Vavti2017-11-281-0/+7
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-11-281-1/+8
| |\
| * | split liveUpdateInit() out of NavUpdate() so we do not need to wait for initi...Mario Vavti2017-11-283-239/+129
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-2721-91/+261
|\ \ \ | | |/ | |/|
| * | Merge pull request #918 from albigro/devgit-marijus2017-11-271-1/+8
| |\ \ | | |/ | |/|
| | * Update dark.cssalbigro2017-11-271-1/+8
| |/
| * do not stop click propagationMario Vavti2017-11-271-1/+0
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-271-0/+3
| |\
| | * unset item_wall and item_origin on pubstream to channel copyzotlabs2017-11-271-0/+3
| * | Merge pull request #916 from dawnbreak/QA_testinggit-marijus2017-11-276-11/+41
| |\ \
| | * | Fix a PHP error in a unit test for PHP7.2.Klaus Weidenbach2017-11-251-4/+4
| | * | :construction_worker:Improve Travis, add PHP7.2.Klaus Weidenbach2017-11-255-7/+37
| * | | Merge pull request #917 from anaqreon/minimum-agegit-marijus2017-11-271-1/+5
| |\ \ \
| | * | | Provide system config option for minimum registration age.Andrew Manning2017-11-241-1/+5
| * | | | fix mod like after recent changesMario Vavti2017-11-271-1/+1
| | |_|/ | |/| |
| * | | pubstream comments and a few other bugfixes that were discovered along the wayzotlabs2017-11-2612-77/+204
| | |/ | |/|
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-2529-83/+281
|\| |
| * | fix double html ids in caldav widget if more than one shareeMario Vavti2017-11-251-2/+2
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario2017-11-251-1/+1
| |\ \
| | * \ Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-251-1/+1
| | |\ \
| | | * | blah is not author or ownerzotlabs2017-11-251-1/+1
| * | | | fix regression in cdav calendar widgetMario2017-11-251-2/+3
| |/ / /
| * | | implement pubstream items in mod hqMario2017-11-252-12/+37
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-2515-49/+137
| |\| |
| | * | this may fix pubstream comments/likeszotlabs2017-11-241-0/+16
| | * | don't include invisible "update activities" in category widgetzotlabs2017-11-242-34/+37
| | * | default profile assignzotlabs2017-11-244-1/+17
| | * | sync packet not generated when deleting a file using the web browser interfacezotlabs2017-11-241-0/+5
| | * | remove deprecated $a argument from advanced_profile()zotlabs2017-11-232-2/+2
| | * | change to bbcode calling parameters: important: will require pulling addons;zotlabs2017-11-235-16/+24
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-231-1/+1
| | |\ \
| | * | | mod_file_upload: provide a handler for chunked uploads for when we eventually...zotlabs2017-11-221-0/+40
| * | | | mod hq: minor query changeMario Vavti2017-11-241-10/+2
| | |_|/ | |/| |
| * | | missing filesMario Vavti2017-11-243-0/+65
| * | | some more work on mod hqMario Vavti2017-11-247-10/+37
| | |/ | |/|
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-2324-19/+699
|\| |
| * | fix typo in pipe_streams()Mario Vavti2017-11-231-1/+1
| |/
| * optional divider between item header and bodyzotlabs2017-11-225-14/+17
| * disable until completedzotlabs2017-11-221-1/+2
| * article featurezotlabs2017-11-2217-5/+481
| * initial articles featurezotlabs2017-11-224-0/+200
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-2240-11/+2561
|\|
| * allow toggle to 'SMBC' scaling mode. 'SMBC' mode is named thusly for Saturday...zotlabs2017-11-211-3/+10
| * add thumbnail hook documentation pointerzotlabs2017-11-211-1/+3
| * add thumbnail hookzotlabs2017-11-211-1/+25
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-213-26/+42
| |\
| * | expose the security setting for SVG thumbnailszotlabs2017-11-212-1/+4
| * | Video thumbnail generatorzotlabs2017-11-213-7/+61
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 04:18:30 +0000