aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* escape query stringMario Vavti2018-06-075-7/+7
* do not query for parents if $conv and $nouveau are setMario Vavti2018-06-071-5/+11
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-06-076-42/+39
|\
| * update a number of links in the codezotlabs2018-06-066-42/+39
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-06-0610-4/+670
| |\
* | | update install instructionsMario Vavti2018-06-061-10/+10
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-06-067-75/+157
|\| |
| * | some work to make menus editable by visitors with webpage write permissions; ...zotlabs2018-06-057-75/+157
* | | add the pf argument to the forum notification linksMario Vavti2018-06-061-1/+1
* | | remove gravizot.de from directory fallback servers due to owners requestMario Vavti2018-06-061-1/+0
| |/ |/|
* | rely on the pf argument to determine if we deal with a forum or not. xchan_pu...Mario Vavti2018-06-052-3/+7
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-06-058-0/+659
|\ \
| * \ Merge pull request #1210 from mjfriaza/devgit-marijus2018-06-048-0/+659
| |\ \
| | * | Initial translations in doc/es-esManuel Jiménez Friaza2018-06-038-0/+659
* | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-06-052-13/+28
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | photos not syncing properly if destination is a postgres sitezotlabs2018-06-042-13/+28
* | | be specific about the term type and do not sort the resultsMario Vavti2018-06-041-2/+5
|/ /
* | sort out some mismatched hovertips on the activity filterzotlabs2018-06-031-5/+5
* | wrong levelzotlabs2018-06-031-2/+2
* | fix submenunavigation on activity filterszotlabs2018-06-031-0/+2
* | improve network cid queryMario Vavti2018-06-032-26/+24
* | distinct is needed or it can heavily impact pagination in certain situations ...Mario Vavti2018-06-031-3/+3
* | missing $perm_sqlMario Vavti2018-06-032-3/+4
* | the pf argument is required here for some functionality in /networkMario Vavti2018-06-031-3/+3
* | add the archived flagMario Vavti2018-06-021-1/+1
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-06-023-4/+9
|\ \
| * \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-06-0212-25/+109
| |\ \
| * \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-06-015-35/+94
| |\ \ \
| * \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-05-311-0/+20
| |\ \ \ \
| * | | | | proper pronounzotlabs2018-05-311-1/+1
| * | | | | don't show forums in forum widget if archived flag is setzotlabs2018-05-311-1/+1
| * | | | | when removing a connection, use the same rules as expire: don't remove items ...zotlabs2018-05-311-2/+7
* | | | | | respect the privacy group feature setting in navMario Vavti2018-06-021-2/+2
* | | | | | finalize filters and forum notificationsMario Vavti2018-06-0212-93/+152
* | | | | | some more work on forum notificationsMario Vavti2018-06-025-10/+53
| |_|_|/ / |/| | | |
* | | | | unread forum notifications - wip/unfinishedMario Vavti2018-06-014-3/+77
* | | | | add manage privacy groups entry to the panel channel menu dropdown for nowMario Vavti2018-06-013-15/+8
* | | | | fixes for css fixMario Vavti2018-06-015-5/+12
* | | | | css fixMario Vavti2018-06-011-3/+2
* | | | | add hover effect to dropdown caretMario Vavti2018-06-013-2/+13
| |_|/ / |/| | |
* | | | move file and groups filter to submenuMario Vavti2018-06-015-35/+94
| |/ / |/| |
* | | implement reset button for filtersMario Vavti2018-05-311-0/+20
|/ /
* | change some stringsMario Vavti2018-05-311-4/+4
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-312-3/+2
|\ \
| * | typo in unused functionzotlabs2018-05-301-1/+1
| * | autocomplete private mail addresses based on substring in either the name or ...zotlabs2018-05-301-2/+1
* | | merge groups and filed posts into activity filtersMario Vavti2018-05-316-26/+72
* | | strpos does not work with arrays :(Mario Vavti2018-05-302-2/+2
* | | restrict the network/channel navbar search to content and hashtagsMario Vavti2018-05-302-0/+6
* | | make navbar search use the module search function in /network and /channelMario Vavti2018-05-305-15/+41