zotlabs
|
390a570b51
|
Merge branch 'zap' into dev
|
2018-09-17 13:00:40 -07:00 |
|
zotlabs
|
926c63ee84
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-17 13:00:02 -07:00 |
|
zotlabs
|
79af06d6e1
|
Merge branch 'dev'
|
2018-09-17 12:58:54 -07:00 |
|
zotlabs
|
fcc7358a44
|
Merge branch 'dev' into 1.0
|
2018-09-17 12:58:41 -07:00 |
|
zotlabs
|
01d38494d9
|
fix install check
|
2018-09-17 12:58:05 -07:00 |
|
Mario
|
c4c1b1f5a2
|
Merge branch 'patch-3' into 'dev'
Save combined view while deleting or recalling first message in thread
See merge request hubzilla/core!1273
|
2018-09-17 13:29:52 +02:00 |
|
Max Kostikov
|
12b9106fc7
|
Update zot.php
|
2018-09-17 13:16:04 +02:00 |
|
Max Kostikov
|
faaffdd618
|
Update message.php
|
2018-09-17 13:15:43 +02:00 |
|
Max Kostikov
|
774729b221
|
Update msglib.php
|
2018-09-17 13:15:24 +02:00 |
|
Mario Vavti
|
1455fa6bc3
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-09-17 11:36:25 +02:00 |
|
Mario Vavti
|
a9853e6033
|
seperate settings for mod network
|
2018-09-17 11:36:11 +02:00 |
|
Mario
|
eefa47776b
|
Merge branch 'trap-template-errors' into 'dev'
Trap errors in template rendering. Output a generic error and log problem.
See merge request hubzilla/core!1274
|
2018-09-17 11:03:37 +02:00 |
|
Mario
|
0b12a7e66f
|
Merge branch 'delete-attach-hook' into 'dev'
delete_attach hook
See merge request hubzilla/core!1275
|
2018-09-17 11:00:22 +02:00 |
|
Mario
|
3019d8341d
|
Merge branch 'app-list-hook' into 'dev'
Add hook to allow addons to filter the list returned by app_list
See merge request hubzilla/core!1276
|
2018-09-17 10:55:47 +02:00 |
|
Mario Vavti
|
dcacfc1124
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-09-17 10:31:13 +02:00 |
|
Mario Vavti
|
2f6cb764a4
|
prepare submodule to interact with route
|
2018-09-17 10:30:47 +02:00 |
|
zotlabs
|
d6841635ff
|
Merge branch 'dev'
|
2018-09-16 22:08:00 -07:00 |
|
zotlabs
|
30154b0f0b
|
Merge branch 'zap' into dev
|
2018-09-16 22:07:35 -07:00 |
|
zotlabs
|
ea2db5d7aa
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-16 22:07:18 -07:00 |
|
zotlabs
|
6d9b38dad8
|
discover issue
|
2018-09-16 22:05:04 -07:00 |
|
zotlabs
|
dad5039b09
|
Merge branch 'dev'
|
2018-09-16 22:04:54 -07:00 |
|
zotlabs
|
6ccbb9a14d
|
Merge branch 'dev' into 1.0
|
2018-09-16 22:04:44 -07:00 |
|
zotlabs
|
cf64349379
|
usort : use class function
|
2018-09-16 22:04:11 -07:00 |
|
zotlabs
|
a94481c73d
|
Merge branch 'dev'
|
2018-09-16 21:46:14 -07:00 |
|
zotlabs
|
0eb1752ed5
|
duplicate
|
2018-09-16 21:45:44 -07:00 |
|
zotlabs
|
f9c264400b
|
Merge branch 'dev'
|
2018-09-16 21:44:09 -07:00 |
|
zotlabs
|
f0266b4837
|
Merge branch 'zap' into dev
|
2018-09-16 21:43:20 -07:00 |
|
zotlabs
|
8d565a8305
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-16 21:43:06 -07:00 |
|
zotlabs
|
943edb4c14
|
simplify AP discovery
|
2018-09-16 21:42:41 -07:00 |
|
zotlabs
|
e9f862b2d6
|
Merge branch 'dev'
|
2018-09-16 21:42:28 -07:00 |
|
zotlabs
|
488cf522ed
|
Merge branch 'dev' into 1.0
|
2018-09-16 21:42:16 -07:00 |
|
zotlabs
|
0aaaa882ad
|
simplify activitypub discovery
|
2018-09-16 21:41:24 -07:00 |
|
zotlabs
|
c3a74b3ece
|
setup and channel sync fixes from upstream
|
2018-09-16 20:01:53 -07:00 |
|
M.Dent
|
a0cf2b53e0
|
Add hook to allow addons to filter the list returned by app_list
|
2018-09-16 23:01:17 -04:00 |
|
zotlabs
|
593a5072d9
|
Some improvements to setup checks: image library and pdo support
|
2018-09-16 20:00:20 -07:00 |
|
zotlabs
|
27617efbfb
|
Merge branch 'dev'
|
2018-09-16 19:05:12 -07:00 |
|
zotlabs
|
6ab12597f5
|
do not sync the channel_moved field
|
2018-09-16 18:59:12 -07:00 |
|
zotlabs
|
e38adcef70
|
Merge branch 'zap'
|
2018-09-16 18:42:25 -07:00 |
|
zotlabs
|
a8f4091551
|
Merge branch 'zap' into dev
|
2018-09-16 18:42:07 -07:00 |
|
zotlabs
|
ee8cdafd92
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-16 18:41:56 -07:00 |
|
zotlabs
|
f3d8730f42
|
resolve naming dispute over network app
|
2018-09-16 18:37:15 -07:00 |
|
zotlabs
|
4005a0217f
|
resolve naming dispute over network app
|
2018-09-16 18:37:02 -07:00 |
|
zotlabs
|
29f4230474
|
resolve naming dispute over network app
|
2018-09-16 18:35:43 -07:00 |
|
zotlabs
|
347e391e51
|
Merge branch 'dev' into 1.0
|
2018-09-16 17:07:35 -07:00 |
|
zotlabs
|
3c3f395d24
|
Merge branch 'zap' into dev
|
2018-09-16 17:06:34 -07:00 |
|
zotlabs
|
72f098e1c0
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-16 17:05:54 -07:00 |
|
zotlabs
|
1856d39237
|
correct owner attribution
|
2018-09-16 17:05:39 -07:00 |
|
zotlabs
|
d476b46fcf
|
correct owner attribution
|
2018-09-16 17:04:47 -07:00 |
|
zotlabs
|
e6e253d200
|
Merge branch 'dev'
|
2018-09-16 01:33:05 -07:00 |
|
zotlabs
|
fb50c7881b
|
Merge branch 'dev' into 1.0
|
2018-09-16 01:32:50 -07:00 |
|