Commit graph

658 commits

Author SHA1 Message Date
zotlabs
d9170c6617 more photo object work 2018-10-28 21:01:58 -07:00
zotlabs
7e3c8e46e7 turn photos into proper AS objects (still need to fix the places where they were turned into Note for short-term compatibility) 2018-10-28 20:39:01 -07:00
zotlabs
bd5d6158a1 zap/osada repo merger 2018-10-03 19:10:52 -07:00
zotlabs
290b8b58ec rename groups and group_members tables 2018-09-25 17:50:59 -07:00
zotlabs
d3b28b718c Merge branch 'red' into dev 2018-09-18 20:51:38 -07:00
M.Dent
8ad24ca3e8 Catch errors in template rendering. Output a generic error and log problem. 2018-09-14 17:53:28 -04:00
zotlabs
048c5f65e2 old protocol string still showing 2018-09-13 22:39:05 -07:00
zotlabs
e1b0570690 assorted fixes 2018-09-09 18:28:13 -07:00
zotlabs
017f1a3c79 optimise 2018-09-06 21:27:09 -07:00
zotlabs
75ecacd88c use uuid4 2018-09-06 20:21:52 -07:00
zotlabs
3ff96239f6 typo 2018-09-06 17:00:42 -07:00
zotlabs
7354b30068 convert message-id to uuid 2018-09-04 20:59:11 -07:00
zotlabs
9beda708de Change main router request variable from 'q' to 'req'. This is necessary to implement search in the twitter api addon, because twitter requires use of the variable 'q'. 2018-08-26 23:35:29 -07:00
zotlabs
bc06233d10 Merge branch 'red' 2018-08-20 22:24:44 -07:00
zotlabs
df26fec1b3 hubzilla core issue #1262 2018-08-17 21:21:02 -07:00
zotlabs
64196dd2a7 article summaries and some other stuff 2018-08-15 18:56:18 -07:00
zotlabs
f4f610f1a3 more backporting for zot6 2018-08-14 18:19:34 -07:00
zotlabs
12f4787b67 issue with mdpost addon and archive.org links which contain a full url as a path/query component 2018-08-13 23:11:10 -07:00
zotlabs
b484441438 sync fixes 2018-07-22 23:06:45 -07:00
zotlabs
cf03855f65 more import work 2018-07-22 22:18:58 -07:00
zotlabs
f8ed09b3fa Merge branch 'red' 2018-07-18 18:55:28 -07:00
zotlabs
5ce50d0a2e mangled urls on redirects 2018-07-18 17:05:38 -07:00
zotlabs
564aa2f134 pass render options to code highlight 2018-07-16 18:12:03 -07:00
zotlabs
2cc6ca0f88 update the photo item_obj format to AS2+ 2018-07-16 16:46:20 -07:00
zotlabs
cc90f71230 trim features (e2ee and bookmarks) 2018-07-08 22:28:15 -07:00
zotlabs
29d973f848 move group to lib 2018-07-03 16:40:54 -07:00
zotlabs
40ab482ada various fixes 2018-07-01 21:07:35 -07:00
zotlabs
1b1d9e502c Merge branch 'red' 2018-06-25 21:02:44 -07:00
zotlabs
66fc12c928 crc32 is potentially reversible 2018-06-25 13:33:23 -07:00
zotlabs
f66fb8e2a8 SECURITY: logging: hash the session_id in case somebody posts log snippets from active sessions; also provide a hashed process_id if using a daemon process (with no session) for easier tracking of related log events 2018-06-25 13:20:12 -07:00
zotlabs
3aa9bcac85 Merge branch 'red' into merge 2018-06-17 19:30:38 -07:00
Mario
9c5df51141 some work on mod group 2018-06-17 16:58:12 +02:00
zotlabs
3b0469a277 finish migrating their_perms (except for federation addons) 2018-06-07 19:44:09 -07:00
zotlabs
9232351cb2 Merge branch 'master' into zapp 2018-06-04 17:47:34 -07:00
zotlabs
e1b85a361c photos not syncing properly if destination is a postgres site 2018-06-04 16:36:13 -07:00
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
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
8189408190 finalize filters and forum notifications 2018-06-02 22:11:11 +02:00
Mario Vavti
9fcb3bf2e8 first cut on restructuring the previously called network tabs 2018-05-30 14:02:58 +02: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
c9fb4fd070 start sorting the permission debacle 2018-05-23 22:50:33 -07:00
zotlabs
afb29176a4 deal with db failure gracefully 2018-05-23 02:33:46 -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
Mario Vavti
0bc2a4f603 fix issues with attachment labels 2018-05-19 11:04:34 +02:00
zotlabs
b1629db876 checkin lots of recent zap/zot6 work 2018-05-18 03:09:38 -07:00
zotlabs
301e405769 fine tuning the refactored tag/mention code 2018-05-14 18:27:12 -07:00