zotlabs
|
57ed9ec8e2
|
zot6 protocol edge case
|
2019-06-13 18:28:33 -07:00 |
|
harukin
|
5434b53a99
|
edit translation
|
2019-06-13 21:50:53 +09:00 |
|
harukin
|
f4361818e0
|
edit translation
|
2019-06-13 21:34:18 +09:00 |
|
Mario Vavti
|
801ab611ed
|
more work on linked item/resource deletion for photos and events, deprecate the force flag in drop_item() and comment out goaway() in drop_item().
|
2019-06-13 13:34:04 +02:00 |
|
Mario Vavti
|
bc34167c84
|
port delete fixes from zap
|
2019-06-12 12:46:29 +02:00 |
|
Mario Vavti
|
decd0dc035
|
more work on event item deletion
|
2019-06-12 11:27:39 +02:00 |
|
Mario Vavti
|
9ac9c693ad
|
initial support for deleting event items if an event is removed
|
2019-06-12 10:07:18 +02:00 |
|
Mario
|
9b2cd69c0f
|
Merge branch 'dev' into 'dev'
attach sync issues
See merge request hubzilla/core!1668
|
2019-06-12 10:00:17 +02:00 |
|
zotlabs
|
b3f1a19db6
|
zot6 deletion issue
|
2019-06-11 20:22:57 -07:00 |
|
zotlabs
|
f3b6708a92
|
attach sync issues
|
2019-06-11 18:00:42 -07:00 |
|
harukin
|
99cdc7af32
|
edit translation
|
2019-06-12 09:45:14 +09:00 |
|
Mario
|
8848885d9a
|
Merge branch 'patch-1' into 'master'
Add resize on image scale to 4 and 7
See merge request hubzilla/core!1667
|
2019-06-11 17:16:41 +02:00 |
|
Max Kostikov
|
c1cab6789e
|
Add resize on image scale to 4 and 7
|
2019-06-11 12:55:28 +02:00 |
|
Max Kostikov
|
907777eeb0
|
Add resize on image scale to 4 and 7
|
2019-06-11 12:53:46 +02:00 |
|
Mario Vavti
|
7889612edc
|
remove sizeRangeSuffixes. they can cause issues with profile photos.
(cherry picked from commit e81e264988)
|
2019-06-10 22:40:36 +02:00 |
|
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 |
|