 Mario Vavti
|
fdb0459288
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-12-01 21:43:54 +01:00 |
|
 zotlabs
|
6f22e47feb
|
typo
|
2018-11-30 22:39:10 -08:00 |
|
|
zotlabs
|
c6acb6191c
|
allow notification filtering by name or addr
|
2018-11-30 19:03:14 -08:00 |
|
|
zotlabs
|
6cade7d935
|
attached photo permissions regression
|
2018-11-30 13:54:17 -08:00 |
|
 M. Dent
|
cded6b1136
|
Merge branch 'es-es' into 'dev'
Revision 1 doc/es-es/about/about.bb
See merge request hubzilla/core!1410
|
2018-11-28 05:32:10 +01:00 |
|
|
M. Dent
|
19f0ce7e37
|
Merge branch 'default2flex-conversion' into 'dev'
use flex for the default template
See merge request hubzilla/core!1409
|
2018-11-28 04:03:39 +01:00 |
|
|
M. Dent
|
a88a515fa0
|
Merge branch 'composer-updates' into 'dev'
update jquery-file-upload and psr-log via composer
See merge request hubzilla/core!1408
|
2018-11-28 03:55:13 +01:00 |
|
|
M. Dent
|
a4b2eac0f0
|
Merge branch 'update-imagesloaded' into 'dev'
update imagesloaded to version 4.1.4 via composer
See merge request hubzilla/core!1407
|
2018-11-28 03:52:53 +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 |
|
 Manuel Jiménez Friaza
|
8bede7b81f
|
Merge branch 'cherry-pick-5ac08ec3' into 'es-es'
Revision 1 doc/es-es/about/about.bb
See merge request mjfriaza/core!3
|
2018-11-26 12:59:03 +01:00 |
|
 Manuel Jiménez Friaza
|
37d563c30e
|
Revision 1 doc/es-es/about/about.bb
(cherry picked from commit 5ac08ec3aa)
|
2018-11-26 12:53:24 +01:00 |
|
|
Mario
|
3775be4ce9
|
use flex for the default template
|
2018-11-26 12:44:10 +01:00 |
|
|
Mario
|
e5883dd605
|
Merge branch 'patch-20181120a' into 'dev'
Do not store serialized pconfig value received via to Module/Pconfig.php
See merge request hubzilla/core!1402
|
2018-11-25 10:22:09 +01: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
|
c7ae3fdc9a
|
update jquery-file-upload and psr-log via composer
|
2018-11-25 10:18:26 +01:00 |
|
|
Mario
|
c667572d3e
|
update imagesloaded to version 4.1.4 via composer
|
2018-11-25 10:09:26 +01:00 |
|
|
Mario
|
9bbd6ff67d
|
Merge branch 'es-es' into 'dev'
Update es-es
See merge request hubzilla/core!1406
|
2018-11-24 21:16:59 +01:00 |
|
|
Manuel Jiménez Friaza
|
ca98a566ee
|
Update es-es
|
2018-11-24 13:23:20 +01:00 |
|
|
Manuel Jiménez Friaza
|
f865d6e5da
|
Resolved merge conflicts
|
2018-11-24 13:01:01 +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
|
8e71324514
|
fix mastodon tag notifications (again)
|
2018-11-21 20:25:59 -08: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 |
|
|
Mario Vavti
|
0bba9482df
|
fix call to undefined function
|
2018-11-21 13:21:29 +01:00 |
|
|
Mario
|
07fd2dbc99
|
Merge branch 'dev' into 'dev'
Update Russian translation
See merge request hubzilla/core!1400
|
2018-11-20 11:08:27 +01:00 |
|
|
Mario Vavti
|
f8a8559523
|
fix typo which prevented propagation of comments
(cherry picked from commit 0c94747ab1)
|
2018-11-20 10:09:46 +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 |
|
 Max Kostikov
|
4dea1b5a0d
|
Replace hmessages.po
|
2018-11-19 13:52:31 +01:00 |
|
|
Max Kostikov
|
da44ab0529
|
Replace hstrings.php
|
2018-11-19 13:51:54 +01: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
|
1044e8e91a
|
version 3.8.5
|
2018-11-19 11:12:32 +01:00 |
|
|
Mario Vavti
|
dffc0a4ed8
|
changelog
(cherry picked from commit 5cb4cdaa5e)
|
2018-11-19 11:11:47 +01:00 |
|
|
Mario Vavti
|
ba4b1cb5af
|
Merge branch 'master' of https://framagit.org/hubzilla/core
|
2018-11-19 11:10:36 +01:00 |
|
|
Mario Vavti
|
5cb4cdaa5e
|
changelog
|
2018-11-19 11:10:22 +01:00 |
|
|
Mario Vavti
|
0525eb2d29
|
update sql schemas to include update column in pconfig table
(cherry picked from commit ae97649948)
|
2018-11-19 10:45:33 +01:00 |
|
|
Mario
|
7be1d9e45a
|
Merge branch 'patch-20181118a' into 'dev'
Patch 20181118a - fix delayed publication of posts
See merge request hubzilla/core!1398
(cherry picked from commit f34af496ec)
3787c490 Fix: delayed items propagate before publication on cloned channels
|
2018-11-19 10:45:01 +01:00 |
|
|
Mario
|
f34af496ec
|
Merge branch 'patch-20181118a' into 'dev'
Patch 20181118a - fix delayed publication of posts
See merge request hubzilla/core!1398
|
2018-11-19 10:44:41 +01:00 |
|
|
Mario Vavti
|
ae97649948
|
update sql schemas to include update column in pconfig table
|
2018-11-19 10:42:18 +01:00 |
|
 DM42.Net (Matt Dent)
|
3787c490d4
|
Fix: delayed items propagate before publication on cloned channels
|
2018-11-18 07:00:06 -05:00 |
|
|
Max Kostikov
|
c3f1aae570
|
Merge branch 'mod-zot-fix' into 'dev'
fix typo which prevented propagation of comments
See merge request hubzilla/core!1399
|
2018-11-18 11:21:07 +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 |
|