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
|
9655b27f81
|
fix js error with catalan language (unescaped strings)
|
2018-05-27 12:21:20 +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 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 |
|
git-marijus
|
13b3594ff3
|
Merge pull request #1191 from jeroenpraat/master
Finaly update of Dutch language strings
|
2018-05-25 12:37:11 +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
|
fb060c27ef
|
Finaly update of Dutch language strings
Already in dev, but it's up to Mario or Mike to decide if the master may be updated too
|
2018-05-24 18:25:28 +02: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 |
|
git-marijus
|
2599d78d0c
|
Merge pull request #1185 from antil0pa/patch-1
Update remote_friends_common.tpl
|
2018-05-24 11:49: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 |
|
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 |
|
antil0pa
|
1da0042ee5
|
Update remote_friends_common.tpl
Found an improperly closed <div> tag. It breaks the way widget are displayed on the page.
|
2018-05-22 16:24:04 +02: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
|
4610fa2774
|
address globbing issue in #1170
|
2018-05-21 20:01:45 +02:00 |
|
Mario Vavti
|
fff720c00d
|
address globbing issue in #1170
|
2018-05-21 20:01:03 +02:00 |
|
Galette Saucisse
|
7e26200510
|
Update gdpr1.md
|
2018-05-21 10:25:03 +02:00 |
|
Galette Saucisse
|
1dbf89362f
|
Update gdpr1.md
|
2018-05-21 10:22:19 +02:00 |
|
Galette Saucisse
|
cc1453a8de
|
Update gdpr1.md
|
2018-05-21 10:16:39 +02:00 |
|
Galette Saucisse
|
a8def37dcf
|
Create TermsOfService.md
|
2018-05-21 10:08:00 +02:00 |
|
Galette Saucisse
|
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 |
|
Mario Vavti
|
7dadbbbac7
|
bring jot reset to some more places
|
2018-05-21 09:13:14 +02:00 |
|
zotlabs
|
49f7d63290
|
first cut at a general purpose gdpr document. What we would like to do is use a conditional expression so that a site document will be loaded if it exists, and fallback to a project boiler plate document if it does not. This is an exercise for the community.
|
2018-05-20 23:40:10 -07:00 |
|
zotlabs
|
0044906fab
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2018-05-20 20:19:11 -07:00 |
|
zotlabs
|
ac8706e919
|
pleroma does not return a valid JRD when given an accept header of application/jrd+json - it only returns a JRD when passed an accept header of application/json (ahead of anything else because XRD is served at the same endpoint)
|
2018-05-20 20:15:19 -07:00 |
|
Mario
|
5b48eb3657
|
update oauth related tables to use bigint/int(10) for user_id column. this is to be more consistent with the rest of the tables and fixes issue #1180
|
2018-05-20 22:55:13 +02:00 |
|
Mario Vavti
|
43f04e4bc0
|
improve abconfig queries
|
2018-05-20 22:55:01 +02:00 |
|
Mario Vavti
|
649260ce44
|
more local_channel() is not string
|
2018-05-20 22:54:49 +02:00 |
|
Mario Vavti
|
f091a3c9fc
|
local_channel() is not string
|
2018-05-20 22:54:36 +02:00 |
|