Mario Vavti
|
e81e264988
|
remove sizeRangeSuffixes. they can cause issues with profile photos.
|
2019-06-10 22:39:53 +02:00 |
|
Mario
|
eacc29ded0
|
add the thumbrepair script
(cherry picked from commit 15874ac45c)
|
2019-06-10 22:36:10 +02:00 |
|
Mario
|
ea04c93bfd
|
resolve merge conflict
(cherry picked from commit 761fc74a67)
|
2019-06-10 22:35:30 +02:00 |
|
Mario
|
8692977585
|
fix storageconv issue with postgres
(cherry picked from commit 0e2239e50b)
|
2019-06-10 22:35:14 +02:00 |
|
Mario
|
6a40f3ed60
|
Revert "PgSQL compatibility on conversion"
This reverts commit dd1f631d9d
|
2019-06-10 22:34:51 +02:00 |
|
Max Kostikov
|
dd1f631d9d
|
PgSQL compatibility on conversion
(cherry picked from commit 94254e61c1)
|
2019-06-10 22:32:54 +02:00 |
|
Mario
|
15874ac45c
|
add the thumbrepair script
|
2019-06-10 22:30:38 +02:00 |
|
Mario
|
761fc74a67
|
resolve merge conflict
|
2019-06-10 21:52:29 +02:00 |
|
Mario
|
0e2239e50b
|
fix storageconv issue with postgres
|
2019-06-10 21:49:34 +02:00 |
|
Max Kostikov
|
e9a17517d3
|
Merge branch 'dev' into 'dev'
PgSQL compatibility on conversion
See merge request hubzilla/core!1665
|
2019-06-10 20:03:55 +02:00 |
|
Max Kostikov
|
94254e61c1
|
PgSQL compatibility on conversion
|
2019-06-10 19:51:55 +02:00 |
|
harukin
|
32eb81d4ae
|
edit translation
|
2019-06-09 22:50:56 +09:00 |
|
harukin
|
6f7e38b94c
|
edit translation
|
2019-06-09 22:46:17 +09:00 |
|
harukin
|
87f271af29
|
Merge branch 'origin' into 'japanese'
Update 4.2
See merge request harukin/core!60
|
2019-06-09 22:04:05 +09:00 |
|
harukin
|
ff74310e32
|
fix conflict
|
2019-06-09 22:01:25 +09:00 |
|
harukin
|
a181fa2992
|
Merge branch 'origin' into 'master'
Update 4.2
See merge request harukin/core!56
|
2019-06-09 11:19:02 +09:00 |
|
harukin
|
76e879e5de
|
Merge branch 'origin' into 'develop'
Update 4.2
See merge request harukin/core!55
|
2019-06-09 10:54:57 +09:00 |
|
harukin
|
c01ab3ed39
|
edit translation
|
2019-06-08 20:17:36 +09:00 |
|
Mario Vavti
|
9f403a4d6b
|
fix css issue
(cherry picked from commit 55792d5528)
|
2019-06-07 09:58:51 +02:00 |
|
Mario Vavti
|
55792d5528
|
fix css issue
|
2019-06-07 09:51:26 +02:00 |
|
Mario Vavti
|
a3f726baa8
|
fix embedphotos image size
(cherry picked from commit ebc2b23c3a)
|
2019-06-07 08:45:58 +02:00 |
|
Mario Vavti
|
ebc2b23c3a
|
fix embedphotos image size
|
2019-06-07 08:45:08 +02:00 |
|
Mario Vavti
|
e4ca3609d9
|
Merge branch '4.2RC'
|
2019-06-04 10:19:04 +02:00 |
|
Mario Vavti
|
bc092d8d78
|
version 4.2
|
2019-06-04 10:16:06 +02:00 |
|
Mario Vavti
|
dd5933b048
|
Merge branch 'dev' into 4.2RC
|
2019-06-04 10:13:59 +02:00 |
|
Mario Vavti
|
5d6128b25c
|
update changelog
|
2019-06-04 10:13:25 +02:00 |
|
Mario Vavti
|
24cb04c346
|
do not change default timezone in parse_ical_file()
(cherry picked from commit f1b54cf0a4)
|
2019-06-03 22:43:20 +02:00 |
|
Mario Vavti
|
f1b54cf0a4
|
do not change default timezone in parse_ical_file()
|
2019-06-03 22:37:03 +02:00 |
|
Mario Vavti
|
e64a7b87a8
|
fix timezone issue when importing adjusted events
(cherry picked from commit 2b452ea3e8)
|
2019-06-03 21:04:51 +02:00 |
|
Mario Vavti
|
2b452ea3e8
|
fix timezone issue when importing adjusted events
|
2019-06-03 21:03:43 +02:00 |
|
Mario
|
66c6c6c7d1
|
regard timezones in calendar import/export
(cherry picked from commit 5b4aa1afc2)
|
2019-06-03 13:27:16 +02:00 |
|
Mario
|
5b4aa1afc2
|
regard timezones in calendar import/export
|
2019-06-03 13:25:48 +02:00 |
|
Mario Vavti
|
89205276ab
|
update changelog
(cherry picked from commit 6d2ab6a7d6)
|
2019-06-03 11:49:04 +02:00 |
|
Mario Vavti
|
6d2ab6a7d6
|
update changelog
|
2019-06-03 11:48:30 +02:00 |
|
Mario Vavti
|
e6da910ee2
|
Merge branch 'dev' into 4.2RC
|
2019-06-03 11:44:31 +02:00 |
|
Max Kostikov
|
2100ac3cfc
|
Merge branch 'dev' into 'dev'
fix category widget when using articles
See merge request hubzilla/core!1664
|
2019-05-31 23:28:09 +02:00 |
|
zotlabs
|
c7476a1d96
|
fix category widget when using articles
|
2019-05-31 14:19:04 -07:00 |
|
Max Kostikov
|
d8c3033941
|
Merge branch 'dev' into 'dev'
live-update not triggering on mod_search
See merge request hubzilla/core!1662
|
2019-05-30 19:50:58 +02:00 |
|
Max Kostikov
|
7e26ee5a73
|
Merge branch 'dev' into 'dev'
Add single photo URL rewrite for clonned channel
See merge request hubzilla/core!1663
|
2019-05-30 13:45:20 +02:00 |
|
Max Kostikov
|
a8e25ccfe6
|
Add single photo URL rewrite for clonned channel
|
2019-05-30 13:41:32 +02:00 |
|
zotlabs
|
b6267ec7c2
|
live-update not triggering on mod_search
|
2019-05-29 17:04:27 -07:00 |
|
Mario Vavti
|
b6bd2884d5
|
Merge branch 'dev' into 4.2RC
|
2019-05-29 09:08:40 +02:00 |
|
Mario
|
767a235611
|
Merge branch 'dev' into 'dev'
support 'expires' over Zot6
See merge request hubzilla/core!1661
|
2019-05-29 09:06:52 +02:00 |
|
zotlabs
|
620fc06b6c
|
anomolies in calls to datetime_convert in include/import
|
2019-05-28 23:14:22 -07:00 |
|
zotlabs
|
0fa4c89a1b
|
convert AS "instrument" objects to the more appropriate "generator" - this probably should happen in pubcrawl addon also
|
2019-05-28 20:23:03 -07:00 |
|
zotlabs
|
1bf046c142
|
Revert "another forum -> group wording change" (wrong tree)
This reverts commit 7c2aafd4ee.
|
2019-05-28 16:35:41 -07:00 |
|
zotlabs
|
52f8429218
|
support 'expires' over Zot6
|
2019-05-28 16:28:03 -07:00 |
|
zotlabs
|
932b414063
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-05-28 16:16:29 -07:00 |
|
Mario Vavti
|
097b2390db
|
update changelog
(cherry picked from commit ca8d252ad7)
|
2019-05-28 12:31:48 +02:00 |
|
Mario Vavti
|
ca8d252ad7
|
update changelog
|
2019-05-28 12:07:14 +02:00 |
|