DM42.Net (Matt Dent)
|
de7cb6d6ad
|
Fix syntax error
|
2018-12-14 13:59:41 -05:00 |
|
DM42.Net (Matt Dent)
|
eb297104de
|
Make Affinity Slider (optionally) 'sticky' across page loads. (default is current behavior: reset slider with each page load)
|
2018-12-14 12:55:49 -05:00 |
|
DM42.Net (Matt Dent)
|
3f06a857c2
|
ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed.
|
2018-12-14 09:55:27 -05:00 |
|
Mario Vavti
|
c771d2809f
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-12-14 10:28:55 +01:00 |
|
zotlabs
|
fc78206049
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-12-13 16:13:13 -08:00 |
|
zotlabs
|
6464099364
|
regression: the ability to order apps messed up since adding pinned apps to the ordering
|
2018-12-12 19:11:30 -08:00 |
|
M. Dent
|
4cb4f17500
|
Merge branch 'photo-hook' into 'dev'
add photo_view_filter hook and fix minor issue with unset auto_save_draft…
See merge request hubzilla/core!1425
|
2018-12-10 21:49:12 +01:00 |
|
Mario Vavti
|
15a689c6f5
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-12-10 10:38:06 +01:00 |
|
Mario Vavti
|
7894fed741
|
add photo_view_filter hook and fix minor issue with unset auto_save_draft variable which resultet in a javascript error
|
2018-12-10 10:37:29 +01:00 |
|
zotlabs
|
30efeb5bec
|
home notifications won't expand if there are more than 300 unseen network notifications ahead of them.
|
2018-12-09 20:24:04 -08:00 |
|
zotlabs
|
214b81e491
|
rmagic discovery for z6 networks
|
2018-12-09 16:37:15 -08:00 |
|
zotlabs
|
e60fb17524
|
total_identities restriction off by one
|
2018-12-09 11:20:57 -08:00 |
|
Mario Vavti
|
7f65d82a74
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-12-06 12:50:23 +01:00 |
|
zotlabs
|
8ab1f31058
|
reset page title if article has no title.
|
2018-12-05 16:24:30 -08:00 |
|
Mario Vavti
|
5d9f993352
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-12-04 11:39:14 +01:00 |
|
Mario
|
eaa52c19a8
|
Merge branch 'photocache' into 'dev'
Less dependence on cache logic
See merge request hubzilla/core!1417
|
2018-12-04 11:38:58 +01:00 |
|
zotlabs
|
42aeb19562
|
partial solution for obj|tgt multiple (zot and zot6) encodings; the zot6 version will be stored under $item['obj']['asld']
|
2018-12-03 20:09:57 -08:00 |
|
zotlabs
|
ffc3dba682
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-12-03 19:19:31 -08:00 |
|
zotlabs
|
1acc5ceb5f
|
more merging
|
2018-12-03 19:18:20 -08:00 |
|
zotlabs
|
7d694dca07
|
more work on z6 commenting
|
2018-12-03 18:50:45 -08:00 |
|
zotlabs
|
7a693500c4
|
fix generated plink
|
2018-12-03 14:21:33 -08:00 |
|
Max Kostikov
|
1c44912aff
|
Update Photo.php
|
2018-12-03 21:33:32 +01:00 |
|
Max Kostikov
|
b586fcebab
|
Update Photo.php
|
2018-12-03 21:21:23 +01:00 |
|
Max Kostikov
|
244c0d828a
|
Update Photo.php
|
2018-12-03 13:29:27 +01:00 |
|
Max Kostikov
|
57ebd7e170
|
New logic for less dependence on cache logic
|
2018-12-03 13:10:55 +01:00 |
|
Mario Vavti
|
c50e3a702a
|
more notifications fixes
(cherry picked from commit 9ef6c57ca5)
|
2018-12-03 10:49:08 +01:00 |
|
M. Dent
|
0b38ab259c
|
Merge branch 'photocache' into 'dev'
Add Photo Cache addon support
See merge request hubzilla/core!1412
|
2018-12-02 19:33:54 +01:00 |
|
Mario Vavti
|
237c6eed50
|
fallback to url if we have not got an addr
(cherry picked from commit a3ba7f0788)
|
2018-12-02 11:39:04 +01:00 |
|
Mario Vavti
|
fdb0459288
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-12-01 21:43:54 +01:00 |
|
zotlabs
|
c6acb6191c
|
allow notification filtering by name or addr
|
2018-11-30 19:03:14 -08:00 |
|
Max Kostikov
|
f3831fa77f
|
Better cache settings logic
|
2018-11-29 21:27:06 +01:00 |
|
Max Kostikov
|
6aa99a903f
|
Code cleanup
|
2018-11-29 11:56:56 +01:00 |
|
Max Kostikov
|
bd0fc8a2d7
|
Add photo cache hooks
|
2018-11-29 10:38:25 +01:00 |
|
Max Kostikov
|
476bd7400d
|
Add photo cache cleanup
|
2018-11-29 10:37:39 +01:00 |
|
Max Kostikov
|
bd10d48338
|
Update database with expires field for photo
|
2018-11-29 10:36:56 +01:00 |
|
M. Dent
|
0bd38290e6
|
Merge branch 'pg-fixes' into 'dev'
fix db upgrade 1228 for postgres
See merge request hubzilla/core!1403
|
2018-11-28 03:49:22 +01:00 |
|
zotlabs
|
19e4f3c2f0
|
prevent incompatible export files (osada/zap) from being imported. This is to keep your DB from getting trashed. We probably need a similar thing for item import since the object formats aren't compatible
|
2018-11-27 11:53:02 -08:00 |
|
M. Dent
|
6b02c664fb
|
Do not store serialized pconfig value received via to Module/Pconfig.php
|
2018-11-25 10:22:09 +01:00 |
|
Mario
|
bc9f2922e0
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-11-23 22:04:51 +01:00 |
|
zotlabs
|
c5a9b00eae
|
Organization actor type was missing
|
2018-11-23 12:25:05 -08:00 |
|
Mario
|
f408ff982c
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-11-23 15:42:40 +01:00 |
|
zotlabs
|
9a8d1200ec
|
use uuid in file storage
|
2018-11-22 18:39:38 -08:00 |
|
Mario
|
16c7aa2813
|
fix db upgrade 1228 for postgres
|
2018-11-22 12:52:08 +01:00 |
|
Mario
|
85f52d2aed
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-11-22 10:17:18 +01:00 |
|
zotlabs
|
ea235c0c67
|
no mention notifications from mastodon (and pleroma)
|
2018-11-21 20:03:58 -08:00 |
|
Mario Vavti
|
e30be643c9
|
fix call to undefined function
(cherry picked from commit 0bba9482df)
|
2018-11-21 13:27:21 +01:00 |
|
zotlabs
|
6481c9dca1
|
use this form instead
|
2018-11-19 15:20:28 -08:00 |
|
zotlabs
|
7aaa1973f4
|
push recent changes
|
2018-11-19 15:04:08 -08:00 |
|
Mario
|
73b836c73d
|
Revert "Fix return on wrong sotred in Content-Length size for full size photos"
This reverts commit 6010b5c619
|
2018-11-19 13:11:18 +01:00 |
|
Mario
|
af0c2f59cc
|
Revert "Add filesize for streaming content"
This reverts commit 238a616292
|
2018-11-19 13:11:04 +01:00 |
|