aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | 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.php
| | * | | | | | | include photos.phpHerbert Thielen2018-05-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | required for photo_calculate_scale()
| * | | | | | | | Merge pull request #1198 from mjfriaza/devgit-marijus2018-05-292-0/+21
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | Some stuff of the Spanish Hubzilla
| | * | | | | | | 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.php
| | * | | | | | | | Update hstrings.phpGalette Saucisse2018-05-261-2/+2
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge pull request #1196 from galettesaucisse/patch-51git-marijus2018-05-291-3/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update hmessages.po
| | * | | | | | | | 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 ↵zotlabs2018-05-291-4/+11
| |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | channel page
* | | | | | | | 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
|\ \ \ \ \
| * | | | | alternate fix for z_check_dnszotlabs2018-05-241-6/+14
| | | | | |
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-05-256-14880/+16835
|\ \ \ \ \ \
| * | | | | | Finaly an update of Dutch language stringsJeroen2018-05-242-11655/+12317
| | | | | | |
| * | | | | | Merge pull request #1190 from fadelkon/devgit-marijus2018-05-242-3225/+4431
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Update catalan translation for sources changes up to Apr 23rd 2018
| | * | | | | | Update catalan translation (both po and php) for sources changes up to Apr ↵fadelkon2018-05-242-3225/+4431
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | 23rd 2018, 07:35.
| * | | | | | Merge pull request #1183 from galettesaucisse/patch-50git-marijus2018-05-241-0/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Create TermsOfService.md
| | * | | | | | Create TermsOfService.mdGalette Saucisse2018-05-211-0/+10
| | | | | | | |
| * | | | | | | Merge pull request #1182 from galettesaucisse/patch-49git-marijus2018-05-241-0/+77
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Create gdpr1.md
| | * | | | | | Update gdpr1.mdGalette Saucisse2018-05-211-13/+6
| | | | | | | |
| | * | | | | | Update gdpr1.mdGalette Saucisse2018-05-211-8/+3
| | | | | | | |
| | * | | | | | Update gdpr1.mdGalette Saucisse2018-05-211-17/+5
| | | | | | | |
| | * | | | | | Create gdpr1.mdGalette Saucisse2018-05-211-0/+101
| | |/ / / / /
* | / / / / / Update remote_friends_common.tplantil0pa2018-05-241-1/+1
|/ / / / / / | | | | | | | | | | | | Found an improperly closed <div> tag. It breaks the way widget are displayed on the page.
* | / / / / paint the locks on private activitypub items red. their privacy model is ↵Mario Vavti2018-05-232-1/+5
| |/ / / / |/| | | | | | | | | | | | | | "slightly" different from ours
* | | | | deal with db failure gracefullyzotlabs2018-05-231-2/+2
| | | | |
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-05-2110-16/+29
|\ \ \ \ \
| * | | | | address globbing issue in #1170Mario Vavti2018-05-216-6/+18
| |/ / / /
| * | | | missing permission descriptionMario Vavti2018-05-213-6/+3
| | | | |
| * | | | bring jot reset to some more placesMario Vavti2018-05-214-4/+8
| | | | |
* | | | | new_channel - make text strings translatable and use the name as a base for ↵zotlabs2018-05-214-9/+46
| | | | | | | | | | | | | | | | | | | | the nick if you try to create without entering a nick
* | | | | update response typeszotlabs2018-05-211-1/+1
| | | | |
* | | | | oauth2 discovery per draft-ietf-oauth-discovery-10zotlabs2018-05-212-1/+32
| | | | |