aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | remove redundant css from default.cssMario Vavti2018-05-301-8/+0
* | remove redundant reference for orderMario Vavti2018-05-301-5/+0
* | just query for data we actually needMario Vavti2018-05-301-2/+6
* | add widget files and templatesMario Vavti2018-05-303-0/+185
* | first cut on restructuring the previously called network tabsMario Vavti2018-05-305-16/+51
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-05-295-5/+27
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-291-0/+2
| |\
| * \ Merge pull request #1202 from aninf-wo/devgit-marijus2018-05-291-0/+1
| |\ \
| | * | include photos.phpHerbert Thielen2018-05-271-0/+1
| * | | Merge pull request #1198 from mjfriaza/devgit-marijus2018-05-292-0/+21
| |\ \ \
| | * | | Some stuff of the Spanish HubzillaManuel Jiménez Friaza2018-05-262-0/+21
| * | | | Merge pull request #1197 from galettesaucisse/patch-52git-marijus2018-05-291-2/+2
| |\ \ \ \
| | * | | | Update hstrings.phpGalette Saucisse2018-05-261-2/+2
| * | | | | Merge pull request #1196 from galettesaucisse/patch-51git-marijus2018-05-291-3/+3
| |\ \ \ \ \
| | * | | | | Update hmessages.poGalette Saucisse2018-05-261-3/+3
| | |/ / / /
| * | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-281-2/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
* | | | | | provide possibility of using different orderings (post, commented) on channel...zotlabs2018-05-291-4/+11
| |_|_|_|/ |/| | | |
* | | | | we probably don't need to delivery local items more than oncezotlabs2018-05-281-0/+2
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-05-271-2/+2
|\| | | | | |/ / / |/| | |
| * | | fix js error with catalan language (unescaped strings)Mario Vavti2018-05-271-2/+2
* | | | hubzilla issue #1200zotlabs2018-05-271-2/+2
|/ / /
* / / DB update to fix wrong hubloc_url for activitypub hublocsMario Vavti2018-05-262-1/+27
|/ /
* | differentiate between direct messages and followers-only messagesMario Vavti2018-05-251-2/+6
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-251-6/+14
|\ \