Commit Graph

Select branches

Hide Pull Requests

3.6RC

CAPTHA

develop

japanese

master

origin

0.10

0.11

0.8

0.9

1.0

1.1

1.10

1.12

1.14

1.14.2

1.2

1.3

1.3.1

1.4

1.6

1.8

2.0

2.2

2.4

2.4.2

2.6

2.6.1

2.6.2

2.6.3

2.8

2.8.1

3.0

3.0.1

3.2

3.2.1

3.2.2

3.4

3.4.1

3.4.2

3.6

3.6.1

Mono Color

• 960f4ed649 Merge branch 'dev' into 'dev' Max Kostikov 2019-05-12 17:15:01 +02:00
• 91ad3bf1b6 Update hstrings.php Max Kostikov 2019-05-12 17:09:59 +02:00
• 91b495d526 Update hmessages.po Max Kostikov 2019-05-12 17:09:15 +02:00
• 973d91d120 add btlogger to unxmlify() Mario Vavti 2019-05-11 16:42:53 +02:00
• bf5deace8e Merge branch 'dev' into 'dev' Max Kostikov 2019-05-11 15:46:16 +02:00
• 0e4acf6299 Replace photo URL for gallery on clonned channel post sync Max Kostikov 2019-05-11 15:40:04 +02:00
• a5cd0061c5 Merge branch 'dev' into 'dev' Mario 2019-05-11 15:39:31 +02:00
• 630e3903fa bump version Mario Vavti 2019-05-10 15:44:15 +02:00
• 0b6a5fad70 update justified gallery lib Mario Vavti 2019-05-10 14:55:37 +02:00
• 67ca1b82cc css fix for bootstrap 4.3.1 Mario Vavti 2019-05-10 14:36:11 +02:00
• 9866053f0c update bootstrap to version 4.3.1 Mario Vavti 2019-05-10 14:21:36 +02:00
• 89a2c1a09c fix issue with color selector Mario Vavti 2019-05-10 13:56:03 +02:00
• 70220d8b9c typo Mario Vavti 2019-05-10 12:21:50 +02:00
• 274f69526f calendar merge: implement channel calendar import in cdav/calendar Mario Vavti 2019-05-10 12:18:37 +02:00
• 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. zotlabs 2019-05-09 22:06:32 -07:00
• b9b65d7dfb Merge branch 'dev' into 'dev' Max Kostikov 2019-05-09 19:40:47 +02:00
• 1545c78d05 Merge branch 'dev' into 'dev' Max Kostikov 2019-05-09 14:41:12 +02:00
• f0c292e77b remove the caldav and event app and make calendar the default app Mario Vavti 2019-05-09 14:39:40 +02:00
• 62336127e3 Add 'Create' button translation Max Kostikov 2019-05-09 14:36:02 +02:00
• 5beaf8ac98 Add 'Create' button translation Max Kostikov 2019-05-09 14:34:58 +02:00
• 9efd484e27 calendar merge: cleanup and comment out some unused code Mario Vavti 2019-05-09 13:43:20 +02:00
• 44d5cf980a Merge branch 'dev' into 'dev' Max Kostikov 2019-05-08 23:30:48 +02:00
• e53650d6c6 another DB update to fix uid_mid index in item table and add xchan_photo_m index to xchan table Mario Vavti 2019-05-08 20:12:54 +02:00
• 5bf9a9828c Merge branch 'channel_update' into 'dev' Max Kostikov 2019-05-08 19:55:21 +02:00
• 24f3bc9f0c Channel update MarioandMax Kostikov 2019-05-08 19:55:21 +02:00
• c200e55f95 remove option which should never have slipped into dev branch Mario Vavti 2019-05-08 16:15:26 +02:00
• ea19d59fca Merge branch 'dev' into 'dev' Max Kostikov 2019-05-08 10:43:06 +02:00
• d34d14c1f4 Replace own image URL in clonned channel posts Max Kostikov 2019-05-08 10:40:46 +02:00
• 7b17306dbd Merge branch 'dev' into 'dev' Max Kostikov 2019-05-08 08:32:57 +02:00
• 6731564c2d Update Photos.php Max Kostikov 2019-05-08 08:30:25 +02:00
• 194ba0cf8d Update PhotoDriver.php Max Kostikov 2019-05-08 08:28:35 +02:00
• 6fc2429540 Merge branch 'dev' into 'dev' Max Kostikov 2019-05-08 01:54:18 +02:00
• bdcbe61273 Respect thumbnail storage location on image editing Max Kostikov 2019-05-08 01:52:10 +02:00
• de5d7bfbd3 Add photo usage detection if not exist on thumbnail save Max Kostikov 2019-05-08 00:49:41 +02:00
• 242878c45c Merge branch 'dev' into 'dev' Mario 2019-05-06 13:49:17 +02:00
• c0911da887 review of last commit zotlabs 2019-05-06 04:19:54 -07:00
• 6e0bf04276 possible xchan (protocol) confusion in include/follow zotlabs 2019-05-06 04:15:34 -07:00
• 56c460d932 Merge branch 'dev' into 'dev' Max Kostikov 2019-05-06 10:46:11 +02:00
• f0933b66a9 Remove 'os_syspath' from direct 'photo' table update Max Kostikov 2019-05-06 10:39:47 +02:00
• 422d633f89 Add system.filesystem_storage_thumbnails description Max Kostikov 2019-05-05 20:17:32 +02:00
• 0537be129c More precise scroll back to initial comment in thread Max Kostikov 2019-05-05 19:00:00 +02:00
• 9b947c8370 Merge branch 'dev' into 'dev' Max Kostikov 2019-05-05 18:15:58 +02:00
• 14eb4326e7 Scroll back to initial low level comment Max Kostikov 2019-05-05 18:13:00 +02:00
• 89a3e8fcc7 Use own variable for "Go to previous comment" hint Max Kostikov 2019-05-05 18:10:53 +02:00
• 6fd5133bed Force to add "go to previous comment" hint Max Kostikov 2019-05-05 18:09:25 +02:00
• e010877490 Scroll back if more than one level in thread Max Kostikov 2019-05-05 18:07:44 +02:00
• f56371c79b Merge branch 'dev' into 'dev' Max Kostikov 2019-05-05 15:41:17 +02:00
• c98f3c5d29 Threaded comments navigation elements fixes Max Kostikov 2019-05-05 15:38:08 +02:00
• 5c8de9d82f Allign arrows position Max Kostikov 2019-05-05 14:28:15 +02:00
• b9c8b6ba23 Merge branch 'dev' into 'dev' Mario 2019-05-05 14:14:07 +02:00
• 6cd968b53b Add arrows to scroll between related comments Max KostikovandMario 2019-05-05 14:14:07 +02:00
• 2aa76d257c Merge branch 'db_update' into 'dev' Max Kostikov 2019-05-04 22:37:21 +02:00
• 32c0be8bde Merge branch 'dev' into 'dev' Max Kostikov 2019-05-04 12:05:38 +02:00
• 88d283a89d found another case where channel_r_photos could get referenced zotlabs 2019-05-04 02:58:57 -07:00
• 66b370c421 Merge branch 'dev' into 'dev' Max Kostikov 2019-05-04 10:32:31 +02:00
• 20bf139b3f strip obsolete channel_(rw)_photos from channel sync packets zotlabs 2019-05-03 15:27:26 -07:00
• 1da4602567 port db update improvements from zap Mario Vavti 2019-05-03 15:13:13 +02:00
• e7ef69e6e7 Merge branch 'dev' into 'dev' Max Kostikov 2019-05-03 14:59:58 +02:00
• d55904d4db Update hstrings.php Max Kostikov 2019-05-03 14:52:43 +02:00
• 740dc59255 Update hmessages.po Max Kostikov 2019-05-03 14:52:08 +02:00
• 98b6362c07 Merge branch 'dev' into 'dev' Mario 2019-05-03 14:16:56 +02:00
• cd829c096b update directory on cover photo changes Mario Vavti 2019-05-03 14:11:14 +02:00
• f127c55802 removing items from ex-connections turns out to be more complicated than originally envisioned zotlabs 2019-05-03 04:09:04 -07:00
• 13247a0e00 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev zotlabs 2019-05-03 04:04:02 -07:00
• 609752d331 Merge branch 'revert-3528610a' into 'dev' Max Kostikov 2019-05-03 10:09:54 +02:00
• 413410d02d Revert "Fix comment edit field expansion on reply on comment" Max Kostikov 2019-05-03 10:09:54 +02:00
• 3528610a51 Fix comment edit field expansion on reply on comment Max Kostikov 2019-05-03 10:03:40 +02:00
• 59ee045c24 parent -> id Mario Vavti 2019-05-03 09:01:53 +02:00
• b1dec12893 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev zotlabs 2019-05-03 00:00:00 -07:00
• 319b0acdd8 fix item query zotlabs 2019-05-02 23:58:51 -07:00
• c605c46f83 Merge branch 'replyto_fixes' into 'dev' Mario 2019-05-03 08:41:01 +02:00
• 9ef692b48c Merge branch 'dev' into 'dev' Mario 2019-05-03 08:39:01 +02:00
• 6da4dfe605 Merge branch 'unfriend_delete_posts_bug' into 'dev' Mario 2019-05-03 08:36:58 +02:00
• 7b4cb31a10 when removed items for unfriended connections, check if the parent has been retained, not just the item zotlabs 2019-05-02 22:34:34 -07:00
• 03ce4d7e2b Merge branch 'dev' of ../hz into dev zotlabs 2019-05-02 21:19:15 -07:00
• f55f5fa92a emojireaction compat zotlabs 2019-05-02 21:18:54 -07:00
• 76757ad1f2 Merge branch 'dev' of /home/macgirvin/hz into dev zotlabs 2019-05-02 20:33:45 -07:00
• 347e88dc65 move apschema to core to use for emojiReaction mapping for zot6 zotlabs 2019-05-02 20:32:26 -07:00
• 746d032e58 more provide xchan_url if there is no xchan_addr Mario Vavti 2019-05-02 13:05:52 +02:00
• b6d598a001 provide xchan_url if there is no xchan_addr Mario Vavti 2019-05-02 12:58:24 +02:00
• b35961c53c Merge branch 'dev' into 'dev' Max Kostikov 2019-05-02 11:42:39 +02:00
• 47fba5827b Merge branch 'dev' into 'dev' Max Kostikov 2019-05-02 11:33:07 +02:00
• 47f75ad8bf Add check if threads are enabled globally Max Kostikov 2019-05-02 11:28:29 +02:00
• 516167c0f8 Revert "Merge branch 'dev' into 'dev'" Max Kostikov 2019-05-02 10:58:00 +02:00
• 238b3a97a8 Merge branch 'dev' into 'dev' Mario 2019-05-02 10:48:55 +02:00
• d4ab8a5a5d Check if 'reply on comment' enabled for this profile Max Kostikov 2019-05-02 10:40:33 +02:00
• 6672299f8a calendar merge: use b64 encoded mid for plink Mario Vavti 2019-05-02 10:11:08 +02:00
• ea5f515f18 Merge branch 'dev' into 'dev' Max Kostikov 2019-05-02 08:33:51 +02:00
• ea6293544d Add Zap threads support Max Kostikov 2019-05-02 08:30:38 +02:00
• cbe35281b9 Merge branch 'dev' into 'dev' Max Kostikov 2019-05-01 21:45:12 +02:00
• 51a0fc45e2 Add threaded comments support Max Kostikov 2019-05-01 21:40:43 +02:00
• 1e7e2bd34f Update Item.php Max Kostikov 2019-05-01 19:10:46 +02:00
• fa2f3d136f Merge branch 'xmlify' into 'dev' Max Kostikov 2019-05-01 16:41:19 +02:00
• 92b6026695 Merge branch 'dev' into 'dev' Max Kostikov 2019-05-01 16:10:40 +02:00
• c9a5f21344 calendar merge: remove deprecated share variable Mario Vavti 2019-05-01 15:52:17 +02:00
• 0174bf3722 Fix missprint Max Kostikov 2019-05-01 15:49:17 +02:00
• 0d003e7450 Preserve parent_mid with threaded comments Max Kostikov 2019-05-01 15:45:12 +02:00
• 8847838c43 address xmlify/unxmlify performance issue Mario Vavti 2019-05-01 15:40:06 +02:00
• 9594ce9a8a calendar merge: fix event_xchan mixup Mario Vavti 2019-05-01 15:35:20 +02:00
• 4a91d09c86 Use thr_parent for comment replies Max Kostikov 2019-05-01 15:33:59 +02:00