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

• 5ff0f09a45 Merge branch 'patch-16' into 'dev' Mario 2018-08-12 13:59:07 +02:00
• 5afe779ffc prevent json-ld bombing, turn off browser autocomplete on channel sources creation zotlabs 2018-08-11 16:16:54 -07:00
• af042ccf07 OAuth2 UI and settings updates M.Dent 2018-08-10 13:51:45 -04:00
• e587fe5ce8 Add user_id = local_channel() to the where clause of updates M.Dent 2018-08-10 12:44:57 -04:00
• 0b31c677f2 Fixes to OAuth2 connect-with-openid. Add zothash Claim. Add zotwebbie Claim. M.Dent 2018-08-09 22:35:12 -04:00
• d3362dfa0c Add translation for missed string Max Kostikov 2018-08-10 16:56:22 +02:00
• 7890157f52 revert debug comment from the last commit Mario Vavti 2018-08-09 23:07:50 +02:00
• b3d1ea4cd5 fix zid leaking to nonzot sites if markdown is enabled Mario Vavti 2018-08-09 17:03:20 +02:00
• 7c842f3170 search form action for channel search needs the channel address Mario Vavti 2018-08-09 13:47:57 +00:00
• 054c5da294 search form action for channel search needs the channel address Mario Vavti 2018-08-09 15:47:57 +02:00
• 5c5a808290 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-08-09 11:07:38 +02:00
• 5c30b2f271 update install.txt Mario Vavti 2018-08-08 09:10:03 +02:00
• ce2216f544 Merge branch 'patch-15' into 'dev' Mario 2018-08-08 09:07:26 +02:00
• 1d13cc1601 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge zotlabs 2018-08-06 21:32:45 -07:00
• 166879b8b0 bring some Zot6 libraries and interfaces to red/hubzilla zotlabs 2018-08-06 17:43:22 -07:00
• aeb9d5cd90 create alter_pdl hook zotlabs 2018-08-05 23:19:33 -07:00
• 8e9d076216 ability for addons to create .pdl files and load them automatically zotlabs 2018-08-04 13:50:49 -07:00
• 0d48cb959f Add XMLreader in PHP requirements Max Kostikov 2018-08-03 19:32:51 +02:00
• d908f53607 add app_options field zotlabs 2018-08-02 22:49:30 -07:00
• 238551b024 Merge branch 'fixactivityorderwithfilters' into 'master' Mario 2018-08-02 18:16:25 +00:00
• 4e6539efec Merge branch 'fixactivityorderwithfilters' into 'master' Mario 2018-08-02 20:16:25 +02:00
• c806279fa9 update certs zotlabs 2018-08-01 21:32:05 -07:00
• ee1fde4262 Add GET for filtered forums DM42.Net (Matt Dent) 2018-08-01 21:12:44 -04:00
• 4d0611b7d4 hubzilla core issue #1258 zotlabs 2018-08-01 16:12:44 -07:00
• 1358303e42 Merge branch 'dev' into 'dev' Mario 2018-07-31 12:42:01 +00:00
• c17f0fb44f Merge branch 'dev' into 'dev' Mario 2018-07-31 14:42:01 +02:00
• 569cd6c57c Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mario Vavti 2018-07-31 14:39:51 +02:00
• 0cfaf34a22 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge zotlabs 2018-07-30 18:11:49 -07:00
• e8aeecc4c9 When checking permissions ignore checking site "Block Public" settings in cases where site permissions aren't applicable zotlabs 2018-07-30 17:41:37 -07:00
• edf834188d Update Spanish translation Manuel Jiménez Friaza 2018-07-30 12:03:03 +02:00
• 4e402dca7d Merge branch 'patch-13' into 'dev' Mario 2018-07-30 10:01:19 +02:00
• 7f6bf7170a Merge branch 'patch-9' into 'dev' Mario 2018-07-28 19:22:51 +00:00
• 0ed9d3c62c Merge branch 'patch-8' into 'dev' Mario 2018-07-28 19:22:12 +00:00
• 149071bf0c Update network.php gia vecandMario 2018-07-29 17:19:37 +00:00
• 720e691f33 Merge branch 'patch-1' into 'master' Mario 2018-07-30 09:47:41 +02:00
• 32614e4074 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge zotlabs 2018-07-29 18:00:56 -07:00
• 9dc5a3bfc9 this may conflict zotlabs 2018-07-29 17:59:40 -07:00
• 8db006d9a1 Update network.php gia vec 2018-07-29 19:19:37 +02:00
• cb4afd39bd Workaround on possible error Max Kostikov 2018-07-29 16:26:33 +02:00
• e078caffd8 Update php2po.php Max Kostikov 2018-07-29 14:20:01 +02:00
• 90a9febb6c Workaround on possible error Max Kostikov 2018-07-29 12:05:53 +02:00
• d00761628f fix sql empty query error in db update 1216 3.6.1 Mario Vavti 2018-07-29 06:05:41 +00:00
• e4a1286aae fix sql empty query error in db update 1216 Mario Vavti 2018-07-29 08:05:41 +02:00
• 08a8011456 Merge branch 'patch-12' into 'dev' Mario 2018-07-29 07:14:09 +02:00
• 6c10af29ee verrsion bump Mario Vavti 2018-07-29 07:09:46 +02:00
• ae62d6fb86 wrong class name Mario Vavti 2018-07-29 04:58:35 +00:00
• d2e0ecd6a3 fix unsanitised xchan_name zotlabsandMario 2018-07-29 00:17:12 +00:00
• 13386ddbd7 SECURITY: sanitise vcard fields zotlabsandMario 2018-07-28 22:33:20 +00:00
• 643b6f0aa3 version Mario Vavti 2018-07-29 07:00:30 +02:00
• 45d262d6c0 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mario Vavti 2018-07-29 06:59:10 +02:00
• 5dbd11c6ed wrong class name Mario Vavti 2018-07-29 06:58:35 +02:00
• 3fcb6df0f1 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-07-29 06:43:55 +02:00
• 9701516228 fix unsanitised xchan_name zotlabs 2018-07-28 17:17:12 -07:00
• 77dfe63d90 Process msgctxt plurals Max Kostikov 2018-07-29 02:11:27 +02:00
• 2367d94a42 SECURITY: sanitise vcard fields zotlabs 2018-07-28 15:33:20 -07:00
• d85c849668 Merge branch 'patch-11' into 'dev' Mario 2018-07-28 21:23:31 +02:00
• cbd8c07265 Merge branch 'patch-9' into 'dev' Mario 2018-07-28 21:22:51 +02:00
• 3a6d3cb396 Merge branch 'patch-8' into 'dev' Mario 2018-07-28 21:22:12 +02:00
• 6e52f552cf Merge branch 'patch-7' into 'dev' Mario 2018-07-28 21:20:01 +02:00
• 973114caf6 Merge branch 'patch-6' into 'dev' Mario 2018-07-28 21:19:40 +02:00
• 17291e04df app update and ownership issues zotlabsandMario 2018-07-27 20:59:27 +00:00
• e27e0ca198 Plural form strings export added Max Kostikov 2018-07-28 17:36:48 +02:00
• 27329e39e4 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-07-28 09:33:17 +02:00
• 38c2070aab Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge zotlabs 2018-07-27 15:27:52 -07:00
• a0f28708ab don't sync system apps zotlabs 2018-07-27 15:05:29 -07:00
• e25d205a7f app delete issue with base installed apps and app photo being reloaded uneccessarily zotlabs 2018-07-27 14:36:06 -07:00
• e28dab17d6 app update and ownership issues zotlabs 2018-07-27 13:59:27 -07:00
• 05b3237bae Update nav.php Max Kostikov 2018-07-27 11:50:04 +02:00
• 4fd9d1ee5f Update Apps.php Max Kostikov 2018-07-27 11:29:38 +02:00
• 0fe7004d38 Update Apps.php Max Kostikov 2018-07-27 11:03:02 +02:00
• 06b0dbdfba Update hstrings.php Max Kostikov 2018-07-26 12:21:33 +02:00
• 48fb3d3653 Update hmessages.po Max Kostikov 2018-07-26 12:20:53 +02:00
• baa5fd9739 Update passchanged_eml.tpl Max Kostikov 2018-07-26 12:19:59 +02:00
• e01c277c56 Update lostpass_eml.tpl Max Kostikov 2018-07-26 12:18:54 +02:00
• 7062a7ce66 fix sql error Mario Vavti 2018-07-26 07:32:52 +00:00
• ec3a066e4e fix sql error Mario Vavti 2018-07-26 09:32:52 +02:00
• b0c8e75c6e Fix duplicate transport displaying kostikov 2018-07-25 22:28:21 +02:00
• 52ad5b7df5 version 3.6 3.6 Mario Vavti 2018-07-25 10:28:52 +02:00
• 1b1d11dcf1 Merge branch '3.6RC' Mario Vavti 2018-07-25 10:19:19 +02:00
• 35200e5f1b Merge branch '3.6RC' of https://framagit.org/hubzilla/core into 3.6RC Mario Vavti 2018-07-25 10:15:23 +02:00
• d39942902c Merge branch 'patch-4' into 'dev' Mario 2018-07-23 19:57:43 +02:00
• 87fc4e6588 Merge branch 'patch-5' into 'dev' Mario 2018-07-23 19:57:10 +02:00
• 091ef33f18 Merge branch 'patch-2' into 'dev' 3.6RC Mario 2018-07-23 19:55:00 +02:00
• 84e57d040b Merge branch 'patch-2' into 'dev' Mario 2018-07-23 19:55:00 +02:00
• a4f64c02d0 Update hstrings.php kostikov 2018-07-23 12:20:50 +02:00
• 278eeb5ee9 Update hmessages.po kostikov 2018-07-23 12:19:46 +02:00
• 3342fc2244 Update hstrings.php kostikov 2018-07-23 12:15:10 +02:00
• 87857fe5d9 Update hmessages.po kostikov 2018-07-23 12:14:33 +02:00
• 64efd07f6b Escape internal quotes in translation on export kostikov 2018-07-22 19:39:53 +02:00
• aa01c2f4db update changelog Mario Vavti 2018-07-21 22:01:59 +02:00
• 6be66d6df9 update changelog Mario Vavti 2018-07-21 22:01:59 +02:00
• 740015339d Add var to respect current hstrings.php format kostikovandMario 2018-07-20 16:40:35 +02:00
• b7778ca1f9 Update php2po.php kostikovandMario 2018-07-20 00:22:04 +02:00
• ddd77ee6ee Update update_fail_eml.tpl kostikovandMario 2018-07-20 19:28:45 +02:00
• b625b5f645 Update register_verify_eml.tpl kostikovandMario 2018-07-20 19:27:29 +02:00
• c9e272a78d Update register_open_eml.tpl kostikovandMario 2018-07-20 19:26:54 +02:00
• 9bfb63fd98 Update passchanged_eml.tpl kostikovandMario 2018-07-20 19:26:24 +02:00
• 21ecf54b73 Update lostpass_eml.tpl kostikovandMario 2018-07-20 19:25:46 +02:00
• 429e3ce30a Add new file kostikovandMario 2018-07-20 19:21:58 +02:00
• 26e20d35c2 Update hstrings.php kostikovandMario 2018-07-20 10:25:03 +02:00