Mario Vavti
|
f0c292e77b
|
remove the caldav and event app and make calendar the default app
|
2019-05-09 14:39:40 +02:00 |
|
Mario Vavti
|
9efd484e27
|
calendar merge: cleanup and comment out some unused code
|
2019-05-09 13:43:20 +02:00 |
|
Max Kostikov
|
44d5cf980a
|
Merge branch 'dev' into 'dev'
another DB update to fix uid_mid index in item table and add xchan_photo_m index to xchan table
See merge request hubzilla/core!1641
|
2019-05-08 23:30:48 +02:00 |
|
Mario Vavti
|
e53650d6c6
|
another DB update to fix uid_mid index in item table and add xchan_photo_m index to xchan table
|
2019-05-08 20:12:54 +02:00 |
|
Max Kostikov
|
5bf9a9828c
|
Merge branch 'channel_update' into 'dev'
Channel update
See merge request hubzilla/core!1639
|
2019-05-08 19:55:21 +02:00 |
|
Mario
|
24f3bc9f0c
|
Channel update
|
2019-05-08 19:55:21 +02:00 |
|
Mario Vavti
|
c200e55f95
|
remove option which should never have slipped into dev branch
|
2019-05-08 16:15:26 +02:00 |
|
Max Kostikov
|
ea19d59fca
|
Merge branch 'dev' into 'dev'
Replace own image URL in clonned channel posts
See merge request hubzilla/core!1638
|
2019-05-08 10:43:06 +02:00 |
|
Max Kostikov
|
d34d14c1f4
|
Replace own image URL in clonned channel posts
|
2019-05-08 10:40:46 +02:00 |
|
Max Kostikov
|
7b17306dbd
|
Merge branch 'dev' into 'dev'
Change thumbnails processing logic on image edit
See merge request hubzilla/core!1637
|
2019-05-08 08:32:57 +02:00 |
|
Max Kostikov
|
6731564c2d
|
Update Photos.php
|
2019-05-08 08:30:25 +02:00 |
|
Max Kostikov
|
194ba0cf8d
|
Update PhotoDriver.php
|
2019-05-08 08:28:35 +02:00 |
|
Max Kostikov
|
6fc2429540
|
Merge branch 'dev' into 'dev'
Respect thumbnail storage location on image editing
See merge request hubzilla/core!1636
|
2019-05-08 01:54:18 +02:00 |
|
Max Kostikov
|
bdcbe61273
|
Respect thumbnail storage location on image editing
|
2019-05-08 01:52:10 +02:00 |
|
Max Kostikov
|
de5d7bfbd3
|
Add photo usage detection if not exist on thumbnail save
|
2019-05-08 00:49:41 +02:00 |
|
Mario
|
242878c45c
|
Merge branch 'dev' into 'dev'
possible xchan confusion include/follow
See merge request hubzilla/core!1635
|
2019-05-06 13:49:17 +02:00 |
|
zotlabs
|
c0911da887
|
review of last commit
|
2019-05-06 04:19:54 -07:00 |
|
zotlabs
|
6e0bf04276
|
possible xchan (protocol) confusion in include/follow
|
2019-05-06 04:15:34 -07:00 |
|
Max Kostikov
|
56c460d932
|
Merge branch 'dev' into 'dev'
Remove 'os_syspath' from direct 'photo' table update
See merge request hubzilla/core!1634
|
2019-05-06 10:46:11 +02:00 |
|
Max Kostikov
|
f0933b66a9
|
Remove 'os_syspath' from direct 'photo' table update
|
2019-05-06 10:39:47 +02:00 |
|
Max Kostikov
|
422d633f89
|
Add system.filesystem_storage_thumbnails description
|
2019-05-05 20:17:32 +02:00 |
|
Max Kostikov
|
0537be129c
|
More precise scroll back to initial comment in thread
|
2019-05-05 19:00:00 +02:00 |
|
Max Kostikov
|
9b947c8370
|
Merge branch 'dev' into 'dev'
Threaded comments usability imrovements
See merge request hubzilla/core!1633
|
2019-05-05 18:15:58 +02:00 |
|
Max Kostikov
|
14eb4326e7
|
Scroll back to initial low level comment
|
2019-05-05 18:13:00 +02:00 |
|
Max Kostikov
|
89a3e8fcc7
|
Use own variable for "Go to previous comment" hint
|
2019-05-05 18:10:53 +02:00 |
|
Max Kostikov
|
6fd5133bed
|
Force to add "go to previous comment" hint
|
2019-05-05 18:09:25 +02:00 |
|
Max Kostikov
|
e010877490
|
Scroll back if more than one level in thread
|
2019-05-05 18:07:44 +02:00 |
|
Max Kostikov
|
f56371c79b
|
Merge branch 'dev' into 'dev'
Threaded comments navigation elements fixes
See merge request hubzilla/core!1632
|
2019-05-05 15:41:17 +02:00 |
|
Max Kostikov
|
c98f3c5d29
|
Threaded comments navigation elements fixes
|
2019-05-05 15:38:08 +02:00 |
|
Max Kostikov
|
5c8de9d82f
|
Allign arrows position
|
2019-05-05 14:28:15 +02:00 |
|
Mario
|
b9c8b6ba23
|
Merge branch 'dev' into 'dev'
Add arrows to scroll between related comments
See merge request hubzilla/core!1629
|
2019-05-05 14:14:07 +02:00 |
|
Max Kostikov
|
6cd968b53b
|
Add arrows to scroll between related comments
|
2019-05-05 14:14:07 +02:00 |
|
Max Kostikov
|
2aa76d257c
|
Merge branch 'db_update' into 'dev'
port db update improvements from zap
See merge request hubzilla/core!1628
|
2019-05-04 22:37:21 +02:00 |
|
Max Kostikov
|
32c0be8bde
|
Merge branch 'dev' into 'dev'
found another case where channel_r_photos could get referenced
See merge request hubzilla/core!1631
|
2019-05-04 12:05:38 +02:00 |
|
zotlabs
|
88d283a89d
|
found another case where channel_r_photos could get referenced
|
2019-05-04 02:58:57 -07:00 |
|
Max Kostikov
|
66b370c421
|
Merge branch 'dev' into 'dev'
strip obsolete channel_(rw)_photos from channel sync packets
See merge request hubzilla/core!1630
|
2019-05-04 10:32:31 +02:00 |
|
zotlabs
|
20bf139b3f
|
strip obsolete channel_(rw)_photos from channel sync packets
|
2019-05-03 15:27:26 -07:00 |
|
Mario Vavti
|
1da4602567
|
port db update improvements from zap
|
2019-05-03 15:13:13 +02:00 |
|
Max Kostikov
|
e7ef69e6e7
|
Merge branch 'dev' into 'dev'
Update Russian translation
See merge request hubzilla/core!1627
|
2019-05-03 14:59:58 +02:00 |
|
Max Kostikov
|
d55904d4db
|
Update hstrings.php
|
2019-05-03 14:52:43 +02:00 |
|
Max Kostikov
|
740dc59255
|
Update hmessages.po
|
2019-05-03 14:52:08 +02:00 |
|
Mario
|
98b6362c07
|
Merge branch 'dev' into 'dev'
removing items from ex-connections turns out to be more complicated than originally envisioned
See merge request hubzilla/core!1626
|
2019-05-03 14:16:56 +02:00 |
|
Mario Vavti
|
cd829c096b
|
update directory on cover photo changes
|
2019-05-03 14:11:14 +02:00 |
|
zotlabs
|
f127c55802
|
removing items from ex-connections turns out to be more complicated than originally envisioned
|
2019-05-03 04:09:04 -07:00 |
|
zotlabs
|
13247a0e00
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-05-03 04:04:02 -07:00 |
|
Max Kostikov
|
609752d331
|
Merge branch 'revert-3528610a' into 'dev'
Revert "Fix comment edit field expansion on reply on comment"
See merge request kostikov/core!1
|
2019-05-03 10:09:54 +02:00 |
|
Max Kostikov
|
413410d02d
|
Revert "Fix comment edit field expansion on reply on comment"
This reverts commit 3528610a51
|
2019-05-03 10:09:54 +02:00 |
|
Max Kostikov
|
3528610a51
|
Fix comment edit field expansion on reply on comment
|
2019-05-03 10:03:40 +02:00 |
|
Mario Vavti
|
59ee045c24
|
parent -> id
|
2019-05-03 09:01:53 +02:00 |
|
zotlabs
|
b1dec12893
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-05-03 00:00:00 -07:00 |
|