Mike Macgirvin
|
04f58be4b5
|
Merge branch 'dev' of https://framagit.org/zot/zap into dev
|
2019-04-02 06:29:33 +11:00 |
|
Mike Macgirvin
|
e875a2b6a7
|
fix version
|
2019-04-02 06:28:11 +11:00 |
|
Mike Macgirvin
|
ada1522f3e
|
Merge branch 'dev' of https://gitlab.com/macgirvin/zap into dev
|
2019-04-02 06:24:52 +11:00 |
|
zotlabs
|
72e5e64d89
|
allow escaped quotes in vidoe posters
|
2019-04-01 12:23:48 -07:00 |
|
Zot
|
ec249ba721
|
Merge branch 'patch-20190211a' into 'dev'
Return all listeners
See merge request zot/zap!1
|
2019-04-01 05:49:33 +02:00 |
|
Zot
|
9963f8fc67
|
Merge branch 'patch-1' into 'master'
Fix link to OpenWebAuth spec doc
See merge request zot/zap!2
|
2019-04-01 05:48:40 +02:00 |
|
zotlabs
|
47283ba2ef
|
filter out a specific unusual activity
|
2019-03-31 18:01:20 -07:00 |
|
Mike Macgirvin
|
691ecb4c0b
|
Merge branch 'master' of https://gitlab.com/macgirvin/zap
|
2019-03-31 10:01:29 +11:00 |
|
Mike Macgirvin
|
c00f5118a0
|
Merge branch 'dev' of https://gitlab.com/macgirvin/zap
|
2019-03-31 10:00:19 +11:00 |
|
zotlabs
|
ad021811d8
|
make sure enough info in edited photos is changed to actually update on the other end
|
2019-03-30 15:56:37 -07:00 |
|
zotlabs
|
42dcc86e3e
|
linkinfo honour link-only setting for images, local videos. Photo editing anomalies.
|
2019-03-30 15:01:25 -07:00 |
|
zotlabs
|
bf2a92b83b
|
check service class limits on file sync
|
2019-03-29 22:09:55 -07:00 |
|
zotlabs
|
5bcf392816
|
add hierarchy to channels for collection support and other purposes
|
2019-03-29 13:27:23 -07:00 |
|
Mike Macgirvin
|
529bbf7cd0
|
composer update
|
2019-03-29 16:09:57 +11:00 |
|
Mike Macgirvin
|
d80ecf86d9
|
Merge branch 'master' of https://gitlab.com/macgirvin/zap
|
2019-03-29 11:16:29 +11:00 |
|
zotlabs
|
0e7cb611b9
|
Merge branch 'dev'
|
2019-03-28 17:15:24 -07:00 |
|
zotlabs
|
d68bdd03ed
|
detect comment moderation with even more precision
|
2019-03-28 16:41:06 -07:00 |
|
Mike Macgirvin
|
ea7e95490f
|
Merge branch 'dev' of https://gitlab.com/macgirvin/zap
|
2019-03-28 15:45:15 +11:00 |
|
zotlabs
|
72d0ca4c56
|
typo
|
2019-03-27 21:44:34 -07:00 |
|
zotlabs
|
933fd80c79
|
typo
|
2019-03-27 21:44:08 -07:00 |
|
Mike Macgirvin
|
3c3934cae1
|
Merge branch 'master' of https://gitlab.com/macgirvin/zap
|
2019-03-28 15:19:16 +11:00 |
|
zotlabs
|
4a98388904
|
rev update
|
2019-03-27 21:18:02 -07:00 |
|
zotlabs
|
26f31b9926
|
Merge branch 'dev'
|
2019-03-27 21:17:30 -07:00 |
|
zotlabs
|
94eb4f8060
|
delivery: work on a copy of the data
|
2019-03-27 21:16:54 -07:00 |
|
zotlabs
|
0bb49829a6
|
let people know there's nothing in the moderation queue if the query returns empty
|
2019-03-27 20:30:12 -07:00 |
|
zotlabs
|
b137417f97
|
more work on moderation notices
|
2019-03-27 20:20:36 -07:00 |
|
zotlabs
|
4d48f5e7bf
|
make moderation notifications go to the right place
|
2019-03-27 19:20:35 -07:00 |
|
zotlabs
|
aaff7c54cf
|
jotgetlink modal
|
2019-03-26 17:01:55 -07:00 |
|
zotlabs
|
83a79d4b6b
|
fixes from upstream
|
2019-03-26 16:06:06 -07:00 |
|
Pascal Deklerck
|
b9a6b7552a
|
Fix link to OpenWebAuth
|
2019-03-25 15:17:55 +01:00 |
|
zotlabs
|
0030bdac40
|
xchan_instance_url was still being referenced, add expire app
|
2019-03-24 22:46:31 -07:00 |
|
zotlabs
|
395d7ba802
|
make categories app translateable
|
2019-03-24 20:18:13 -07:00 |
|
zotlabs
|
532019c382
|
missing use statement
|
2019-03-24 20:11:24 -07:00 |
|
zotlabs
|
2499086f69
|
appify categories
|
2019-03-24 20:08:23 -07:00 |
|
zotlabs
|
1595bdc2aa
|
cleanup/remove unused xchan fields
|
2019-03-24 18:40:33 -07:00 |
|
zotlabs
|
3a95d71821
|
more prep work for collections
|
2019-03-23 15:23:59 -07:00 |
|
zotlabs
|
c3e9840a7d
|
sync apps, fix some warnings and prepare for a jot link modal
|
2019-03-21 21:57:43 -07:00 |
|
zotlabs
|
bc4d615701
|
update help text for content filters
|
2019-03-19 17:23:33 -07:00 |
|
Mike Macgirvin
|
dcda63c685
|
Merge branch 'master' of https://gitlab.com/macgirvin/zap
|
2019-03-20 09:26:52 +11:00 |
|
zotlabs
|
dd2c86aaf9
|
Merge branch 'dev'
|
2019-03-19 15:25:32 -07:00 |
|
zotlabs
|
503456cc1c
|
incorrect logic function in item_permissions_sql, fix video poster
|
2019-03-19 15:23:45 -07:00 |
|
zotlabs
|
2f8b1e550b
|
profile gender configurability
|
2019-03-18 21:33:50 -07:00 |
|
zotlabs
|
7169bd1ebc
|
xss issue from upstream, messagefilter enhancements
|
2019-03-18 19:19:04 -07:00 |
|
zotlabs
|
2df403c4ec
|
missing function
|
2019-03-17 21:18:32 -07:00 |
|
zotlabs
|
80463d4754
|
add video with poster option to bbcode
|
2019-03-17 20:49:54 -07:00 |
|
zotlabs
|
7937637cbd
|
update util/service_class to use serialise (with an s)
|
2019-03-18 11:42:59 +11:00 |
|
zotlabs
|
d07927e1d3
|
update util/service_class to use serialise (with an s)
|
2019-03-17 17:41:13 -07:00 |
|
zotlabs
|
b9c0c4e282
|
rev update
|
2019-03-17 17:34:57 -07:00 |
|
Mike Macgirvin
|
84d20b4318
|
Merge branch 'master' of https://gitlab.com/macgirvin/zap
|
2019-03-18 11:33:21 +11:00 |
|
zotlabs
|
d4e1c9943b
|
Merge branch 'dev'
|
2019-03-17 17:27:38 -07:00 |
|