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 |
|
Mario Vavti
|
c771d2809f
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-12-14 10:28:55 +01: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
|
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 |
|
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
|
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 |
|
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
|
85f52d2aed
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-11-22 10:17:18 +01: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 |
|
Mario Vavti
|
0c94747ab1
|
fix typo which prevented propagation of comments
|
2018-11-18 11:02:01 +01:00 |
|
Mario Vavti
|
783cca1e13
|
recalculate photo filesize when rotating an image
(cherry picked from commit f15e32d063)
|
2018-11-17 09:51:28 +01:00 |
|
Max Kostikov
|
238a616292
|
Add filesize for streaming content
|
2018-11-16 23:33:45 +01:00 |
|
Max Kostikov
|
6010b5c619
|
Fix return on wrong sotred in Content-Length size for full size photos
|
2018-11-16 23:14:10 +01:00 |
|
zotlabs
|
e42a401987
|
more work on the mid/uuid conversion
|
2018-11-15 20:50:47 -08:00 |
|
zotlabs
|
39d914c9df
|
add item.uuid to relevant places
|
2018-11-15 16:34:09 -08:00 |
|
zotlabs
|
8d2f4d9dfd
|
mid -> uuid conversions for basic reactions
|
2018-11-15 16:02:29 -08:00 |
|
zotlabs
|
a7d2f9b530
|
remove checkjs and nojs
|
2018-11-15 15:35:06 -08:00 |
|
zotlabs
|
b64dd7ab57
|
Merge branch 'master' into zvi
|
2018-11-14 16:42:03 -08:00 |
|
Mario
|
6ed9443972
|
Merge branch 'patch-20181113b' into 'dev'
Patch 20181113b
See merge request hubzilla/core!1395
|
2018-11-14 09:30:54 +01:00 |
|
Mario
|
08e0f172de
|
Merge branch 'dev' into 'dev'
Remove unneccessary fetch_image_from_url() function
See merge request hubzilla/core!1393
|
2018-11-14 09:30:28 +01:00 |
|
zotlabs
|
cfc43f6dea
|
Merge branch 'master' into zvi
|
2018-11-13 20:37:52 -08:00 |
|
DM42.Net (Matt Dent)
|
f1d168f781
|
Fix double escaping after xss fix
|
2018-11-13 23:06:00 -05:00 |
|
DM42.Net (Matt Dent)
|
ce8073d25e
|
Merge remote-tracking branch red/master into patch-20181113a. Add Mike's fix to search xss and Superblock fix.
|
2018-11-13 20:19:12 -05:00 |
|
zotlabs
|
31f4d9066b
|
xss in search
|
2018-11-13 14:23:56 -08:00 |
|
Max Kostikov
|
cf2f7f2132
|
Update Photo.php
|
2018-11-13 12:52:35 +01:00 |
|
Max Kostikov
|
a145559662
|
Remove uneccessary include/photos.php
|
2018-11-13 11:45:18 +01:00 |
|