harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,707 Commits 6 Branches 36 Tags 152 MiB
028cbdcffa
Commit Graph

24707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Max Kostikov
bf5deace8e Merge branch 'dev' into 'dev' 
Replace photo URL for gallery on clonned channel post sync

See merge request hubzilla/core!1645
 2019-05-11 15:46:16 +02:00
Max Kostikov
0e4acf6299 Replace photo URL for gallery on clonned channel post sync 2019-05-11 15:40:04 +02:00
Mario
a5cd0061c5 Merge branch 'dev' into 'dev' 
use 'cache' flag to bbcode() on content destined for Zot6. We've seen rendered...

See merge request hubzilla/core!1644
 2019-05-11 15:39:31 +02:00
Mario Vavti
630e3903fa bump version 2019-05-10 15:44:15 +02:00
Mario Vavti
0b6a5fad70 update justified gallery lib 2019-05-10 14:55:37 +02:00
Mario Vavti
67ca1b82cc css fix for bootstrap 4.3.1 2019-05-10 14:36:11 +02:00
Mario Vavti
9866053f0c update bootstrap to version 4.3.1 2019-05-10 14:21:36 +02:00
Mario Vavti
89a2c1a09c fix issue with color selector 2019-05-10 13:56:03 +02:00
Mario Vavti
70220d8b9c typo 2019-05-10 12:21:50 +02:00
Mario Vavti
274f69526f calendar merge: implement channel calendar import in cdav/calendar 2019-05-10 12:18:37 +02:00
zotlabs
d7026fe36b use 'cache' flag to bbcode() on content destined for Zot6. We've seen rendered map HTML in a couple of places and these should never be rendered for outgoing content as they will only be purified on the other end. 2019-05-09 22:06:32 -07:00
Max Kostikov
b9b65d7dfb Merge branch 'dev' into 'dev' 
remove the caldav and event app and make calendar the default app

See merge request hubzilla/core!1643
 2019-05-09 19:40:47 +02:00
Max Kostikov
1545c78d05 Merge branch 'dev' into 'dev' 
Add 'Create' button translation in CalDAV

See merge request hubzilla/core!1642
 2019-05-09 14:41:12 +02:00
Mario Vavti
f0c292e77b remove the caldav and event app and make calendar the default app 2019-05-09 14:39:40 +02:00
Max Kostikov
62336127e3 Add 'Create' button translation 2019-05-09 14:36:02 +02:00
Max Kostikov
5beaf8ac98 Add 'Create' button translation 2019-05-09 14:34:58 +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