zotlabs
|
89f16c81dd
|
fix conflict
|
2018-06-03 17:59:41 -07:00 |
|
zotlabs
|
4524d241a2
|
Merge branch 'master' into zapp
|
2018-06-03 17:58:24 -07:00 |
|
zotlabs
|
02e173e733
|
finish porting zot6handler primitives
|
2018-06-03 17:49:48 -07:00 |
|
Mario Vavti
|
a42ff1e6d4
|
missing $perm_sql
|
2018-06-03 13:27:06 +02:00 |
|
Mario Vavti
|
a32626e489
|
add the archived flag
|
2018-06-02 22:42:20 +02:00 |
|
Mario Vavti
|
3a9f149c80
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-06-02 22:39:36 +02:00 |
|
Mario Vavti
|
a0e4f7ddb1
|
respect the privacy group feature setting in nav
|
2018-06-02 22:26:08 +02:00 |
|
Mario Vavti
|
8189408190
|
finalize filters and forum notifications
|
2018-06-02 22:11:11 +02:00 |
|
zotlabs
|
5f612521da
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2018-06-02 00:01:19 -07:00 |
|
Mario Vavti
|
22a9e4c9a9
|
add manage privacy groups entry to the panel channel menu dropdown for now
|
2018-06-01 21:52:54 +02:00 |
|
Mario Vavti
|
56f0244360
|
fixes for css fix
|
2018-06-01 20:59:28 +02:00 |
|
zotlabs
|
191edfdaa1
|
more heavy lifting
|
2018-05-31 21:05:09 -07:00 |
|
zotlabs
|
fd4ea47503
|
move libzot to class
|
2018-05-31 19:42:13 -07:00 |
|
zotlabs
|
5d83469621
|
when removing a connection, use the same rules as expire: don't remove items that are starred, filed, or that you replied to.
|
2018-05-31 16:11:51 -07:00 |
|
Mario Vavti
|
b438ffead4
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-05-31 13:06:33 +02:00 |
|
zotlabs
|
f0690aadcc
|
typo in unused function
|
2018-05-30 23:40:01 -07:00 |
|
zotlabs
|
6dcad87ae8
|
make refresh packet work
|
2018-05-30 20:32:59 -07: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
|
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
|
b88a683127
|
zot communications
|
2018-05-28 19:42:40 -07: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 |
|
zotlabs
|
cd4454100b
|
alternate fix for z_check_dns
|
2018-05-24 16:32:21 -07: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 |
|
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
|
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
|
d9066ef26b
|
not null violation oauth1
|
2018-05-21 13:37:55 -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 |
|
zotlabs
|
8611e7f8a6
|
remove unused mindate parameter in the network/stream API method
|
2018-05-20 13:29:48 -07: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 |
|
Mario Vavti
|
7e99931733
|
implement jot reset button
|
2018-05-20 09:23:44 +02:00 |
|
Mario Vavti
|
0bc2a4f603
|
fix issues with attachment labels
|
2018-05-19 11:04:34 +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 |
|
zotlabs
|
8881530caf
|
include/zot update
|
2018-05-18 04:05:47 -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 |
|
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 |
|
zotlabs
|
16930c1c54
|
anybody authenticated not correctly handled in can_comment_on_post()
|
2018-05-15 16:08:51 -07:00 |
|
Mario Vavti
|
de63e40a70
|
we must now provide the full path to the profile image for the cavatar plugin to work
|
2018-05-15 10:20:20 +02:00 |
|
zotlabs
|
803e85caeb
|
make get_default_profile_photo() pluggable
|
2018-05-14 23:10:20 -07:00 |
|