aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9 from redmatrix/devmrjive2018-04-1954-9094/+9274
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-1915-31/+34
| |\
| | * follow activitypub by webfinger; requires addon update to all federation prot...zotlabs2018-04-182-8/+9
| | * relax restrictions to the design tools menu to allow those with write_pages p...zotlabs2018-04-182-11/+4
| | * do not queue anything which lacks a destination urlzotlabs2018-04-181-0/+6
| | * just provide the trending tags in public stream by default and simplify the q...zotlabs2018-04-182-2/+1
| | * add alt_pager to mod_moderate, remove legacy $a parameter from all occurrence...zotlabs2018-04-179-10/+14
| * | bump versionMario Vavti2018-04-181-1/+1
| * | version bump and stringsMario Vavti2018-04-182-89/+101
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-188-11/+144
| |\|
| | * minor code optimisationzotlabs2018-04-172-10/+22
| | * also add the noisy 'rss' tagzotlabs2018-04-171-1/+1
| | * re-use directory safemode setting for public stream tag filtering since a han...zotlabs2018-04-172-5/+15
| | * fine tuning the public stream tag resultszotlabs2018-04-173-11/+2
| | * public stream tag enhancementszotlabs2018-04-174-1/+115
| | * when changing cover photo, show existingzotlabs2018-04-173-2/+8
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-172-8/+27
| |\|
| | * missing update file in the previous update commitzotlabs2018-04-161-0/+26
| | * set the correct webfinger Accept: request header now that Mastodon fixed the ...zotlabs2018-04-161-8/+1
| * | fix closing parenthesis in wrong spotMario Vavti2018-04-171-2/+2
| * | update to bootstrap-4.1 and improve visibility of some text when using custom...Mario Vavti2018-04-1723-8949/+8923
| |/
| * Active channels information is a bit imprecise. Provide a higher accuracy met...zotlabs2018-04-166-2/+26
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-04-163-11/+9
| |\
| * | don't save a permcat with empty namezotlabs2018-04-161-0/+5
| * | update the placeholderzotlabs2018-04-161-2/+2
| * | update the search jszotlabs2018-04-161-1/+10
| * | hubzilla issue #1078 ; provide content-type header for system emails (was alr...zotlabs2018-04-161-1/+2
* | | Merge pull request #8 from redmatrix/devmrjive2018-04-166-17/+30
|\ \ \ | | |/ | |/|
| * | remove some more distinct in queries and observe any regressions. this is rel...Mario Vavti2018-04-162-7/+2
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-163-6/+21
| |\|
| | * draft-cavage issueszotlabs2018-04-151-3/+9
| | * issue with wiki synczotlabs2018-04-151-2/+9
| | * never mind. dbg(1) now gives you the basic debug result and dbg(2) gives you ...zotlabs2018-04-141-1/+1
| | * allow dbg(2) to only return the canonical SQL used in the query and the numbe...zotlabs2018-04-141-1/+3
| * | css fixesMario Vavti2018-04-151-0/+3
| * | fix regression where in the starred tab only top level posts were visibleMario Vavti2018-04-151-4/+4
| |/
* | Merge pull request #7 from redmatrix/devmrjive2018-04-1417-4887/+5989
|\|
| * upgrade incutio xmlrpc library to use hubzilla curl wrapperzotlabs2018-04-131-43/+18
| * Create /doc/context/fr/settings/features/help.htmlGalette Saucisse2018-04-131-0/+12
| * Update hstrings.phpGalette Saucisse2018-04-131-338/+478
| * Update hmessages.poGalette Saucisse2018-04-131-3013/+3790
| * Create /doc/context/fr/admin/queue/help.htmlGalette Saucisse2018-04-131-0/+4
| * Update help.htmlGalette Saucisse2018-04-131-1/+1
| * translation correctionGalette Saucisse2018-04-131-1/+1
| * Create /doc/context/fr/admin/logs/help.htmlGalette Saucisse2018-04-131-0/+8
| * Create /doc/context/fr/channelGalette Saucisse2018-04-131-0/+6
| * version and strings updateMario Vavti2018-04-132-1380/+1577
| * fix illegal string offset warningMario Vavti2018-04-132-2/+2
| * fix wrong item keyMario Vavti2018-04-131-1/+1
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-134-50/+65
| |\