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
|
1ef937834b
|
more work
|
2018-05-29 23:52:08 -07:00 |
|
zotlabs
|
e0a35392f7
|
more commits
|
2018-05-29 23:30:18 -07:00 |
|
zotlabs
|
111bb93462
|
basic communication
|
2018-05-29 21:08:52 -07: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-marijus
|
bca3113fba
|
Merge pull request #1202 from aninf-wo/dev
include photos.php
|
2018-05-29 08:41:31 +02:00 |
|
git-marijus
|
a8a2c806f2
|
Merge pull request #1198 from mjfriaza/dev
Some stuff of the Spanish Hubzilla
|
2018-05-29 08:41:00 +02:00 |
|
git-marijus
|
e00c5c6bf1
|
Merge pull request #1197 from galettesaucisse/patch-52
Update hstrings.php
|
2018-05-29 08:40:27 +02:00 |
|
git-marijus
|
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 |
|
zotlabs
|
b88a683127
|
zot communications
|
2018-05-28 19:42: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 |
|
zotlabs
|
aa57887dd5
|
Merge branch 'master' into zapp
|
2018-05-26 15:13:57 -07:00 |
|
zotlabs
|
3e184ef403
|
z6 permissions work
|
2018-05-26 15:12:02 -07: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 Saucisse
|
89d97c556a
|
Update hstrings.php
|
2018-05-26 09:18:41 +02:00 |
|
Galette Saucisse
|
4ff2b8ed1b
|
Update hmessages.po
|
2018-05-26 09:17:04 +02:00 |
|
Andrew Manning
|
ed17e8a649
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2018-05-25 20:07:31 -04: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 |
|
Jeroen
|
fcd9e115c2
|
Finaly an update of Dutch language strings
|
2018-05-24 18:22:09 +02:00 |
|
git-marijus
|
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-marijus
|
bace238e9f
|
Merge pull request #1183 from galettesaucisse/patch-50
Create TermsOfService.md
|
2018-05-24 11:54:09 +02:00 |
|
git-marijus
|
7586bc9dcf
|
Merge pull request #1182 from galettesaucisse/patch-49
Create gdpr1.md
|
2018-05-24 11:53:50 +02:00 |
|
antil0pa
|
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 |
|
Andrew Manning
|
fc6b337bbb
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2018-05-24 05:35:50 -04:00 |
|
zotlabs
|
c9fb4fd070
|
start sorting the permission debacle
|
2018-05-23 22:50:33 -07:00 |
|
zotlabs
|
d101ea88ca
|
more zot6 work
|
2018-05-23 21:48:19 -07: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
|
27ce7c11bd
|
lots more zot6 work
|
2018-05-22 23:20:29 -07:00 |
|
zotlabs
|
9e44835cc9
|
Merge branch 'master' into zapp
|
2018-05-22 19:04:24 -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 |
|