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

• f965209eee check public scopes against visitor in item_permissions_sql() redmatrix 2015-09-28 19:45:57 -07:00
• 5c526995d8 resolve conflicts redmatrix 2015-09-28 19:07:31 -07:00
• 50ee82e8bd Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-28 19:06:10 -07:00
• 8a3c909c74 ignore self delivery in process_delivery redmatrix 2015-09-28 19:05:45 -07:00
• 3a8e1e0484 process_delivery: ignore self redmatrix 2015-09-28 19:04:36 -07:00
• 3b53cd56ef Merge branch 'deadsite' redmatrix 2015-09-28 17:15:34 -07:00
• 30e88a4f6b typo redmatrix 2015-09-28 17:15:04 -07:00
• e5f47cd14b create site records for all queued sites and check for death redmatrix 2015-09-28 17:13:11 -07:00
• 6368b09337 a clear is needed after floating Mario Vavti 2015-09-28 21:51:04 +02:00
• b97102da01 private mail: bring additional inbox/outbox views and ajaxify single message drop Mario Vavti 2015-09-28 17:40:38 +02:00
• dbeae16dc1 add site_type to queries, first few - several more to go. redmatrix 2015-09-28 04:21:29 -07:00
• edbcba6f11 schema support for additional site types redmatrix 2015-09-28 04:15:21 -07:00
• ed876a9c52 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-27 18:03:40 -07:00
• 67fe8fc4a7 well there's one problem... redmatrix 2015-09-27 18:00:37 -07:00
• 55b530f0fd Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-27 17:00:41 -07:00
• 3a2c3ea8fa Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-27 16:47:58 -07:00
• aae51a9b23 add some safety checks on the sending side of sync redmatrix 2015-09-27 16:47:25 -07:00
• cd2b811555 move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts. redmatrix 2015-09-26 23:44:30 -07:00
• 15d1a6c937 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-09-26 13:28:24 -07:00
• 9ab335626c import_xchan_photo: check the return headers to ensure it's an image content-type of some form as imagick chucks a wobbly if you try to initialise an image with an html error page. redmatrix 2015-09-26 13:25:34 -07:00
• 451db7dd98 Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2015-09-25 23:26:47 +02:00
• d6293730fc private mail: some work on conversations view Mario Vavti 2015-09-25 23:26:28 +02:00
• 8e410f14b1 Merge remote-tracking branch 'upstream/master' zottel 2015-09-25 22:25:35 +02:00
• 49000dadda Another Spanish update jeroenpraat 2015-09-25 21:25:42 +02:00
• 9bde18492a As a result of the logo vote: replaced favicon, remade alternative hubzilla avatar and uploaded 6 logo variants. Originals courtesy of Iko. jeroenpraat 2015-09-25 21:17:48 +02:00
• b22fa9f7f4 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-09-25 17:52:58 +02:00
• a7b2d23e9b Merge remote-tracking branch 'upstream/master' zottel 2015-09-25 11:19:42 +02:00
• ba94f824b9 deliveries per process ui for setting redmatrix 2015-09-25 01:31:58 -07:00
• 8aec437c23 remove redundant code redmatrix 2015-09-24 23:02:41 -07:00
• 98f656cfcb delivery optimisations redmatrix 2015-09-24 22:51:47 -07:00
• e558ddae3f clean up the delivery reports to make them manageable, more approachable, and translateable redmatrix 2015-09-24 18:19:33 -07:00
• 2c665e5e4c add Diaspora (actually any external service which uses the queue) to delivery reports redmatrix 2015-09-24 17:41:05 -07:00
• 2fe3d16bbe Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-09-24 16:58:32 -07:00
• 2844f276b9 Document the additional content export options redmatrix 2015-09-24 16:57:17 -07:00
• 414b5ea6f3 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-09-24 23:32:18 +02:00
• c42dcd5ac9 Merge pull request #55 from git-marijus/master redmatrix 2015-09-25 06:37:38 +10:00
• b9723aa85b some heavy private mail restructuring - work in progress Mario Vavti 2015-09-24 14:07:44 +02:00
• 03fb13e749 Merge remote-tracking branch 'upstream/master' zottel 2015-09-24 12:50:27 +02:00
• e04f04ef0f Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-23 22:33:48 -07:00
• 0f3c2c4b24 add vdata field for caldav redmatrix 2015-09-23 22:32:46 -07:00
• 8a94a4938f dummy update redmatrix 2015-09-23 22:31:49 -07:00
• b553ffd55d timezone tweaks redmatrix 2015-09-23 20:59:19 -07:00
• e45958b967 add plugin hooks to channel sync/import/export redmatrix 2015-09-23 18:27:04 -07:00
• 006ca4421a Merge pull request #4 from redmatrix/master mrjive 2015-09-23 17:13:55 +02:00
• 0bfdb45b41 Merge remote-tracking branch 'upstream/master' zottel 2015-09-23 08:59:28 +02:00
• 8cbccb20ef Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-09-23 07:43:17 +02:00
• f506f73d3f Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-22 22:31:53 -07:00
• 7734bbfe4d problems with extended item import and signatures redmatrix 2015-09-22 22:30:09 -07:00
• d35c5bcb2f merge issue redmatrix 2015-09-22 19:16:13 -07:00
• c699d3a17a Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-22 19:14:21 -07:00
• d16ac62a51 don't send sync packets to deleted hubloc locations redmatrix 2015-09-22 19:13:10 -07:00
• 2fa5b8c0a2 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-22 18:41:53 -07:00
• 15feeb7bfe inverted logic syncing deleted hublocs redmatrix 2015-09-22 18:40:03 -07:00
• 02ecc93998 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-22 16:50:55 -07:00
• 34291d5938 add names to delivery report for sync delivery redmatrix 2015-09-22 16:50:08 -07:00
• e726adc27b Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-22 16:45:14 -07:00
• 642f460dca report the channel sync redmatrix 2015-09-22 16:43:36 -07:00
• 1d7d9818fa Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-22 16:26:28 -07:00
• c2dcc68803 backport item sync redmatrix 2015-09-22 16:19:08 -07:00
• d7c9f2ccba Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-09-22 19:02:20 +02:00
• 7dd61c05dc allow self delivery until we figure out why clone sync of posted items isn't doing it's thing redmatrix 2015-09-22 04:39:36 -07:00
• 1c1155513a add one more test redmatrix 2015-09-22 04:28:05 -07:00
• f84151e1fe fix foreach warning redmatrix 2015-09-22 04:24:54 -07:00
• 5ec3d3e36d Merge pull request #3 from redmatrix/master mrjive 2015-09-22 13:11:54 +02:00
• 4b13f0e025 since this is now usable, protect the displayed delivery reports from XSS injection redmatrix 2015-09-22 04:08:03 -07:00
• 2869ccfe39 delivery reports - crude but mostly functional at least for zot deliveries redmatrix 2015-09-22 04:04:51 -07:00
• 8ead4745f8 Merge pull request #54 from git-marijus/master redmatrix 2015-09-22 19:41:08 +10:00
• 15b241cc3e remove dummy update from merge redmatrix 2015-09-22 02:34:34 -07:00
• 2b07a69b93 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-22 02:34:05 -07:00
• 5068ce0569 dummy update redmatrix 2015-09-22 02:33:24 -07:00
• 0b1b11ea53 heavy lifting for delivery reports redmatrix 2015-09-22 02:32:04 -07:00
• ea9f169a6c fix consensus items - issue #53 Mario Vavti 2015-09-22 10:59:19 +02:00
• cbd7f89066 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-09-22 07:34:42 +02:00
• 146ff6f703 more progress on delivery reports. Store the remote results from zot sites locally. redmatrix 2015-09-21 22:30:28 -07:00
• 326ae5ff6b Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-21 20:29:18 -07:00
• 8c16f12d7a issue #52 - try all matching hublocs for remote auth, not just the "best one". redmatrix 2015-09-21 20:20:16 -07:00
• 477228d4ff issue #50 - cloud listings produce white screen for unauthenticated viewer redmatrix 2015-09-21 20:17:48 -07:00
• 9baaa6fa56 issue #51 redmatrix 2015-09-21 20:05:54 -07:00
• 49d11ed9f8 Merge pull request #2 from redmatrix/master mrjive 2015-09-21 15:41:17 +02:00
• 7834274bff Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-09-21 07:31:36 +02:00
• d2565d0f61 looks like chat has been neglected a bit recently redmatrix 2015-09-20 21:37:18 -07:00
• 4fde0bf62e Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-20 20:58:55 -07:00
• a679081993 new delivery report format redmatrix 2015-09-20 20:21:54 -07:00
• 177292de13 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-20 18:10:25 -07:00
• efcb4abfd0 improve on the last attempt redmatrix 2015-09-20 18:08:06 -07:00
• 1501d1c570 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-20 18:03:41 -07:00
• 59a56ac77f catch the timestamp also redmatrix 2015-09-20 17:47:41 -07:00
• 35f09f4f74 remove system flags from channel import packet redmatrix 2015-09-20 17:45:23 -07:00
• 421dfce599 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-09-20 16:55:53 -07:00
• b240c15014 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-20 16:55:24 -07:00
• 9de8df496a we need the xchan record also redmatrix 2015-09-20 16:52:21 -07:00
• 4f65066572 Removed hot_deploy Haakon Meland Eriksen 2015-09-20 23:06:25 +02:00
• c38687725d kick right aside out a little earlier Mario Vavti 2015-09-20 22:12:00 +02:00
• 099f236f45 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-09-20 21:29:41 +02:00
• 996cd7e2ab Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-20 00:28:22 -07:00
• 77df590f65 initial checkin delivery report class redmatrix 2015-09-20 00:27:25 -07:00
• ce064188c6 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-09-19 22:48:22 -07:00
• 5d6f59a598 clone new connections redmatrix 2015-09-19 22:46:59 -07:00
• f4a4cf1402 clone new connection requests redmatrix 2015-09-19 15:36:07 -07:00
• 032ef0ca34 Merge remote-tracking branch 'upstream/master' zottel 2015-09-19 20:11:59 +02:00