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
|
21230fb39a
|
Merge branch 'master' into zapp
|
2018-05-20 20:44:20 -07:00 |
|
zotlabs
|
a9e81abcf9
|
more z6 work
|
2018-05-20 20:42:31 -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
|
469809183d
|
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:42:47 +02:00 |
|
zotlabs
|
8611e7f8a6
|
remove unused mindate parameter in the network/stream API method
|
2018-05-20 13:29:48 -07:00 |
|
Mario Vavti
|
55e1026c98
|
improve abconfig queries
|
2018-05-20 20:48:52 +02:00 |
|
Mario Vavti
|
9e1af2492f
|
more local_channel() is not string
|
2018-05-20 14:15:46 +02:00 |
|
Mario Vavti
|
4eb40528a9
|
local_channel() is not string
|
2018-05-20 14:07:30 +02:00 |
|
Mario Vavti
|
6ba77ce0e2
|
css fix
|
2018-05-20 13:47:05 +02:00 |
|
Mario Vavti
|
a256195767
|
remove preview on jot reset
|
2018-05-20 12:30:08 +02:00 |
|
git-marijus
|
26d69796d0
|
Merge pull request #1176 from galettesaucisse/patch-48
Update hstrings.php
|
2018-05-20 11:43:22 +02:00 |
|
git-marijus
|
71307d3a2e
|
Merge pull request #1175 from galettesaucisse/patch-47
Update hmessages.po
|
2018-05-20 11:43:06 +02:00 |
|
git-marijus
|
acb114d0d1
|
Merge pull request #1174 from anaqreon/dev
Rename Permission Groups to Permission Categories and clarify feature…
|
2018-05-20 11:42:13 +02:00 |
|
git-marijus
|
1781df006f
|
Merge pull request #1171 from mjfriaza/dev
Added one space & Grammatical consistency error on Spanish translation
|
2018-05-20 11:41:44 +02:00 |
|
Mario Vavti
|
63f84ece6e
|
backport waitmans changes #1170 from master
|
2018-05-20 11:39:59 +02:00 |
|
Mario Vavti
|
b11db26edf
|
do not update #acl-list-content on every click in jot. we just need this updated when in cutom mode (which is rarely the case). jot interaction was getting sluggish due to this when having lots of contacts.
|
2018-05-20 11:12:39 +02:00 |
|
Mario Vavti
|
6d7e364a0d
|
remove some cruft from initEditor();
|
2018-05-20 11:02:18 +02:00 |
|
Mario Vavti
|
7e99931733
|
implement jot reset button
|
2018-05-20 09:23:44 +02:00 |
|
Mario Vavti
|
7a1afc315d
|
update to fork-awesome 1.1 and fix an old font-awesome reference
|
2018-05-19 22:01:10 +02:00 |
|
Mario Vavti
|
244e813bfa
|
fix issue where images were not visible in acl selector after using search
|
2018-05-19 21:21:02 +02:00 |
|
Mario Vavti
|
0bc2a4f603
|
fix issues with attachment labels
|
2018-05-19 11:04:34 +02:00 |
|
Mario Vavti
|
6abbadf6c8
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-05-19 10:20:14 +02:00 |
|
zotlabs
|
8b4af7cf0b
|
hubzilla issue #1086, pending count on admin summary page
|
2018-05-19 00:54:47 -07:00 |
|
Mario Vavti
|
1ca6ef0f60
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-05-19 08:45:41 +02:00 |
|
zotlabs
|
dae89ce91c
|
wrong default param for pubstream_incl (this checkin also picked up a few minor and hopefully non-significant changes)
|
2018-05-18 16:57:45 -07:00 |
|
Mario Vavti
|
056f3d352c
|
remove debug code
|
2018-05-18 21:32:18 +02:00 |
|
Mario Vavti
|
620e8f2f0b
|
version
|
2018-05-18 21:30:58 +02:00 |
|
Mario Vavti
|
7f7e049397
|
an attempt to fix the new_channel validation situation
|
2018-05-18 21:30:07 +02:00 |
|
Andrew Manning
|
40d99c1716
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2018-05-18 13:07:24 -04:00 |
|
Galette Saucisse
|
2dd66df8eb
|
Update hstrings.php
|
2018-05-18 16:05:30 +02:00 |
|
zotlabs
|
8881530caf
|
include/zot update
|
2018-05-18 04:05:47 -07:00 |
|
zotlabs
|
060cb1749d
|
update boot
|
2018-05-18 03:50:04 -07:00 |
|
zotlabs
|
b1629db876
|
checkin lots of recent zap/zot6 work
|
2018-05-18 03:09:38 -07:00 |
|
zotlabs
|
e55eb26544
|
Merge branch 'master' into zapp
|
2018-05-17 19:33:58 -07:00 |
|
Galette Saucisse
|
eabf804dc9
|
Update hstrings.php
|
2018-05-17 16:09:42 +02:00 |
|
Galette Saucisse
|
b955c2d2c5
|
Update hmessages.po
|
2018-05-17 16:08:20 +02:00 |
|
Mario Vavti
|
5a6141faa2
|
display address in contact_format() instead of nick
|
2018-05-17 12:58:59 +02:00 |
|
Mario Vavti
|
12c571a187
|
missing include
|
2018-05-16 10:47:18 +02:00 |
|
Andrew Manning
|
179eeb10a6
|
Rename Permission Groups to Permission Categories and clarify feature settings text.
|
2018-05-15 19:57:40 -04:00 |
|
zotlabs
|
aac5fd96cc
|
provide function to fetch photo contents from url
|
2018-05-15 16:51:04 -07:00 |
|