Commit Graph
21639 Commits
Author SHA1 Message Date
Mario Vavti 6bfc5aa96c strpos does not work with arrays :( 2018-05-30 23:15:43 +02:00
Mario Vavti 5505f5fa02 restrict the network/channel navbar search to content and hashtags 2018-05-30 22:55:28 +02:00
Mario Vavti 6349a7417f make navbar search use the module search function in /network and /channel 2018-05-30 22:40:22 +02:00
Mario Vavti e1a55ba471 remove redundant css from default.css 2018-05-30 20:18:13 +02:00
Mario Vavti 881406f82b remove redundant reference for order 2018-05-30 14:54:39 +02:00
Mario Vavti 293e405f5b just query for data we actually need 2018-05-30 14:09:24 +02:00
Mario Vavti 8d6441704b add widget files and templates 2018-05-30 14:06:18 +02:00
Mario Vavti 9fcb3bf2e8 first cut on restructuring the previously called network tabs 2018-05-30 14:02:58 +02:00
zotlabs 7d088c8d56 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-05-29 17:51:36 -07:00
zotlabs ed3d3b6f27 provide possibility of using different orderings (post, commented) on channel page 2018-05-29 17:35:44 -07:00
Mario Vavti dcd5f00077 Merge remote-tracking branch 'mike/master' into dev 2018-05-29 09:04:45 +02:00
git-marijusandGitHub bca3113fba Merge pull request #1202 from aninf-wo/dev
include photos.php
2018-05-29 08:41:31 +02:00
git-marijusandGitHub a8a2c806f2 Merge pull request #1198 from mjfriaza/dev
Some stuff of the Spanish Hubzilla
2018-05-29 08:41:00 +02:00
git-marijusandGitHub e00c5c6bf1 Merge pull request #1197 from galettesaucisse/patch-52
Update hstrings.php
2018-05-29 08:40:27 +02:00
git-marijusandGitHub 7e8c895ccd Merge pull request #1196 from galettesaucisse/patch-51
Update hmessages.po
2018-05-29 08:40:13 +02:00
zotlabs 139c39c2ce we probably don't need to delivery local items more than once 2018-05-28 22:23:40 -07:00
Mario Vavti 6bae91dd7e Merge remote-tracking branch 'mike/master' into dev 2018-05-28 14:59:10 +02:00
zotlabs c115e8ee60 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-05-27 21:10:52 -07:00
zotlabs ddebbcc0a0 hubzilla issue #1200 2018-05-27 17:46:25 -07:00
Herbert Thielen 4f3be92a0d include photos.php
required for photo_calculate_scale()
2018-05-27 17:57:35 +02:00
Mario Vavti 5a475453ab fix js error with catalan language (unescaped strings) 2018-05-27 12:20:07 +02:00
Mario Vavti eb04dbc5ce DB update to fix wrong hubloc_url for activitypub hublocs 2018-05-26 21:15:22 +02:00
Manuel Jiménez Friaza 2bf76928cc Some stuff of the Spanish Hubzilla 2018-05-26 18:09:22 +02:00
Galette SaucisseandGitHub 89d97c556a Update hstrings.php 2018-05-26 09:18:41 +02:00
Galette SaucisseandGitHub 4ff2b8ed1b Update hmessages.po 2018-05-26 09:17:04 +02:00
Mario Vavti 33700e9cf4 differentiate between direct messages and followers-only messages 2018-05-25 15:29:59 +02:00
Mario Vavti eebeb450c3 Merge remote-tracking branch 'mike/master' into dev 2018-05-25 12:34:59 +02:00
Mario Vavti 0fe449ba33 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2018-05-25 12:34:35 +02:00
zotlabs cd4454100b alternate fix for z_check_dns 2018-05-24 16:32:21 -07:00
JeroenandGitHub fcd9e115c2 Finaly an update of Dutch language strings 2018-05-24 18:22:09 +02:00
git-marijusandGitHub cf00a9dbfc Merge pull request #1190 from fadelkon/dev
Update catalan translation for sources changes up to Apr 23rd 2018
2018-05-24 11:55:47 +02:00
git-marijusandGitHub bace238e9f Merge pull request #1183 from galettesaucisse/patch-50
Create TermsOfService.md
2018-05-24 11:54:09 +02:00
git-marijusandGitHub 7586bc9dcf Merge pull request #1182 from galettesaucisse/patch-49
Create gdpr1.md
2018-05-24 11:53:50 +02:00
antil0paandMario Vavti 7a294c3843 Update remote_friends_common.tpl
Found an improperly closed <div> tag. It breaks the way widget are displayed on the page.
2018-05-24 11:50:35 +02:00
fadelkon ea17b46e94 Update catalan translation (both po and php) for sources changes up to Apr 23rd 2018, 07:35. 2018-05-24 03:59:01 +02:00
Mario Vavti 9cf8931136 paint the locks on private activitypub items red. their privacy model is "slightly" different from ours 2018-05-23 22:11:13 +02:00
zotlabs afb29176a4 deal with db failure gracefully 2018-05-23 02:33:46 -07:00
zotlabs 76d8e59e9b Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-05-21 21:15:24 -07:00
zotlabs 1061027071 new_channel - make text strings translatable and use the name as a base for the nick if you try to create without entering a nick 2018-05-21 20:17:17 -07:00
zotlabs a403611ac9 update response types 2018-05-21 19:34:03 -07:00
zotlabs 2b3f931c85 oauth2 discovery per draft-ietf-oauth-discovery-10 2018-05-21 19:25:03 -07:00
zotlabs 9bf26cee6d add hook 'get_system_apps' 2018-05-21 16:19:17 -07:00
zotlabs d9066ef26b not null violation oauth1 2018-05-21 13:37:55 -07:00
Mario Vavti fff720c00d address globbing issue in #1170 2018-05-21 20:01:03 +02:00
Galette SaucisseandGitHub 7e26200510 Update gdpr1.md 2018-05-21 10:25:03 +02:00
Galette SaucisseandGitHub 1dbf89362f Update gdpr1.md 2018-05-21 10:22:19 +02:00
Galette SaucisseandGitHub cc1453a8de Update gdpr1.md 2018-05-21 10:16:39 +02:00
Galette SaucisseandGitHub a8def37dcf Create TermsOfService.md 2018-05-21 10:08:00 +02:00
Galette SaucisseandGitHub 355a9ac7ee Create gdpr1.md 2018-05-21 10:05:17 +02:00
Mario Vavti a8274bbfb3 missing permission description 2018-05-21 09:25:57 +02:00