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

• 4f285911f0 form cleanup (profile_photo and cover_photo), admin 'user_approve' not found, missing close div in mood_content.tpl redmatrix 2016-02-14 16:15:55 -08:00
• 8ccddfefd9 Spanish and Dutch string update jeroenpraat 2016-02-14 16:18:03 +01:00
• 4351a83d16 Merge pull request #282 from royalterra/master redmatrix 2016-02-14 07:13:22 +11:00
• ddefe3b3ac add https://blablanet.es faillback server royalterra 2016-02-13 15:16:09 +00:00
• b77c5ae61e Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-02-13 11:02:43 +01:00
• dd2d12350c Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-02-12 14:03:09 -08:00
• ade91f8190 directory modes reversed redmatrix 2016-02-12 14:02:50 -08:00
• d04aef4c44 don't confuse people with matrix Jeroen van Riet Paap 2016-02-12 17:17:26 +01:00
• 689a6dc085 https://blablanet.es/siteinfo/json reports itself as directory_mode DIRECTORY_MODE_PRIMARY. AFAIK this should not be the case as we can only have one primary per realm. Mario Vavti 2016-02-12 11:12:47 +01:00
• 0b487122f6 tryout: introduce loading of images before rendering content and provide some detailed logging in js-console Mario Vavti 2016-02-12 11:00:50 +01:00
• ac4a8fde3a Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-02-12 06:28:40 +01:00
• 31aaf40ade Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-02-11 20:37:42 -08:00
• af7c7642bb whitespace redmatrix 2016-02-11 20:37:30 -08:00
• d939173c0e Merge pull request #278 from royalterra/master redmatrix 2016-02-12 14:31:29 +11:00
• a87efe45e0 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-02-11 15:25:26 -08:00
• 55515a25d1 guest photo upload failing when js_upload is in use due to non-existent acl parameters redmatrix 2016-02-11 15:24:21 -08:00
• 7d7a254238 Merge pull request #1 from royalterra/royalterra-patch-1 royalterra 2016-02-11 22:35:45 +00:00
• 564a5ea4d5 Update boot.php Failback Server blablanet.es royalterra 2016-02-11 22:21:03 +00:00
• d9c59a19fb update readmore.js to a more recent version Mario Vavti 2016-02-11 13:51:37 +01:00
• 83b5adf194 feed dates are always UTC. This means we will need another mechanism to pass localised dates to items_fetch() redmatrix 2016-02-10 23:05:47 -08:00
• a26d1794fe feed dates weren't being honoured. When that was fixed they turned out to be reversed. redmatrix 2016-02-10 23:00:40 -08:00
• 06a1258a9a put a sane lower time limit on content search for public feed requests redmatrix 2016-02-10 19:29:00 -08:00
• d31d3df4ea hook changes to support pubsubhubbub redmatrix 2016-02-10 19:12:28 -08:00
• 91801d2e2c rev update redmatrix 2016-02-10 13:55:51 -08:00
• 95c686de6e Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-02-09 20:30:30 +01:00
• bcb94f8238 Merge branch 'master' of https://github.com/redmatrix/hubzilla jeroenpraat 2016-02-09 16:15:49 +01:00
• 1d2260b44e Castellano and Nederlands string updates jeroenpraat 2016-02-09 16:15:20 +01:00
• 81c10fc739 Merge pull request #276 from phellmes/invite git-marijus 2016-02-09 15:57:45 +01:00
• 191a2fd5be [invite module] remove trailing spaces from translatable strings phellmes 2016-02-09 14:20:26 +01:00
• 97be144913 [invite module] update UI template phellmes 2016-02-09 14:07:54 +01:00
• 8c99228c8a Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-02-09 06:03:43 +01:00
• f984502499 need to re-arrange a few things for a short vcard redmatrix 2016-02-08 19:33:25 -08:00
• 315ce6d880 lots more zcard tweaks redmatrix 2016-02-08 18:16:42 -08:00
• 3da8f9b13c duplicated lines in en config file redmatrix 2016-02-08 14:51:03 -08:00
• a14b87baf2 make yet another recommended security header optional - this time because of piwik. Personally I think if you want to track people you really don't understand this project and its history, but whatever.... redmatrix 2016-02-08 14:48:11 -08:00
• 90fd23e0cd try that patch again redmatrix 2016-02-08 14:19:49 -08:00
• d96e985be0 Revert "sort out the well-known acme-challenge mess - at least on apache" redmatrix 2016-02-08 14:06:44 -08:00
• c8788204a9 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-02-08 13:58:25 -08:00
• be99c7fe12 sort out the well-known acme-challenge mess - at least on apache redmatrix 2016-02-08 13:57:40 -08:00
• 48963f62f9 avoid collapsing only above the viewport Mario Vavti 2016-02-08 22:19:38 +01:00
• 00ae6bdac6 a few tweaks to uno settings page to allow a default ACL to be created redmatrix 2016-02-07 21:06:17 -08:00
• a606173e07 change register workflow if uno is set redmatrix 2016-02-07 20:11:08 -08:00
• d8e6fd5df0 provide get_server_role() to abstract different roles and capabilities redmatrix 2016-02-07 18:11:10 -08:00
• ec950de205 block public was still referenced in admin/site template redmatrix 2016-02-07 15:44:42 -08:00
• 62e7fa6a23 update UI template for 'mood' module redmatrix 2016-02-07 15:38:54 -08:00
• 2935c5fe1a Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-02-06 12:57:25 +01:00
• 021584d782 fix uno import by disabling for now redmatrix 2016-02-05 23:45:16 -08:00
• a5c111ef4f uno stuff redmatrix 2016-02-05 23:13:33 -08:00
• 7868e47643 more uno groundwork redmatrix 2016-02-05 13:32:15 -08:00
• b4e3cd000f rev update redmatrix 2016-02-05 00:06:35 -08:00
• 9c3568800c remove blackout setting now that the keepout plugin performs the same tasks (plus a lot more) redmatrix 2016-02-04 23:59:09 -08:00
• 9cf105f8ea initial uno config redmatrix 2016-02-04 23:58:31 -08:00
• a8456782b5 will probably need this to make it work redmatrix 2016-02-04 22:39:56 -08:00
• 2afdba48f0 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-02-05 06:28:52 +01:00
• 4250895243 make strict transport security header optional redmatrix 2016-02-04 20:38:22 -08:00
• bfeb89075f comment buttons hook redmatrix 2016-02-04 19:06:11 -08:00
• 721f61a71d update docs redmatrix 2016-02-04 18:38:36 -08:00
• a6e5d26aea Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-02-04 18:36:36 -08:00
• d586f64e40 update the poke page layout and UI redmatrix 2016-02-04 18:35:40 -08:00
• a0900ba052 Merge pull request #274 from mrjive/master redmatrix 2016-02-05 11:11:36 +11:00
• 40b00ab362 add system black/white list for embeds ahead of personal config redmatrix 2016-02-04 16:09:36 -08:00
• 18208fab84 poke basic config setting redmatrix 2016-02-04 11:58:56 -08:00
• 8f810a3dcf Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-02-04 06:01:15 +01:00
• c598bbb8a9 Merge branch 'embedsec' redmatrix 2016-02-03 20:33:34 -08:00
• e6f388d869 finish moving block_public to the new security page redmatrix 2016-02-03 20:32:26 -08:00
• 24e2eedd0f don't implement the default embed whitelist just yet redmatrix 2016-02-03 20:29:46 -08:00
• c75f76f740 heavy lifting on admin security page redmatrix 2016-02-03 20:24:46 -08:00
• 006efbd906 change view_storage from perms_public to perms_specific in the social_private role redmatrix 2016-02-03 15:44:36 -08:00
• 28386d7471 admin security page for configuring white and black lists and other security options. redmatrix 2016-02-03 15:23:24 -08:00
• f9545dc359 Added section-title-wrapper and section-conent-wrapper to search result page in /help mrjive 2016-02-03 14:02:34 -08:00
• e527a52f6a Merge pull request #21 from redmatrix/master mrjive 2016-02-03 22:46:54 +01:00
• a7ed50ecd4 more zcard tweaks redmatrix 2016-02-02 19:39:47 -08:00
• 06dcaaa821 some zcard cleanup - still eneds a lot more work redmatrix 2016-02-02 17:14:07 -08:00
• 36ac48779c Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-02-02 17:51:34 +01:00
• 88669fa033 Merge pull request #271 from wave72/master Wave 2016-02-02 16:59:03 +01:00
• 225aa28a1b Updated Italian strings Paolo Tacconi 2016-02-02 16:52:25 +01:00
• f1245206ce change aside width to reflect recent widget style changes Mario Vavti 2016-02-02 12:40:40 +01:00
• 7f453949a1 minor tweaks redmatrix 2016-02-01 23:09:45 -08:00
• 38f385f67d slight formatting improvements redmatrix 2016-02-01 21:23:47 -08:00
• 5f5342c0d3 adjust for folks that still have 175px profile photos redmatrix 2016-02-01 21:21:22 -08:00
• 15e003f030 missing template redmatrix 2016-02-01 21:14:36 -08:00
• 5edbc00865 profile embeds (still needs a bit of work) redmatrix 2016-02-01 21:09:50 -08:00
• 723a49ccee add photos to the profile "likes this" dropdowns redmatrix 2016-02-01 17:42:53 -08:00
• ff487a0271 more oembed provider work - channel articles redmatrix 2016-02-01 14:52:08 -08:00
• 337735094b Merge pull request #20 from redmatrix/master mrjive 2016-02-01 11:25:07 +01:00
• 01b5b13475 oep for the photo top page redmatrix 2016-01-31 20:44:54 -08:00
• fd9f792f90 add album embed (embed the most recent photo with link to album) redmatrix 2016-01-31 20:05:47 -08:00
• e8ded61efb minor changes to changelog redmatrix 2016-01-31 19:26:02 -08:00
• b0e098bb68 rev update redmatrix 2016-01-31 19:16:32 -08:00
• f26c698f4a add zid 1.2 redmatrix 2016-01-31 16:33:25 -08:00
• a341c889b7 add oembed provider for photos redmatrix 2016-01-31 15:55:27 -08:00
• 0cd82ec680 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-01-31 10:38:19 +01:00
• 1f87fef968 es-es+nl strings and fixing css maintained schemas jeroenpraat 2016-01-30 23:44:45 +01:00
• c8d0a2b4bb one more css fix Mario Vavti 2016-01-30 14:40:45 +01:00
• 385709853b css fixes Mario Vavti 2016-01-30 14:26:38 +01:00
• 0405a49df1 fix a slight regression Mario Vavti 2016-01-30 13:47:58 +01:00
• 76484f1541 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-01-30 12:05:49 +01:00
• b6543beca2 do not make a difference if there are images or not for now Mario Vavti 2016-01-30 01:34:27 +01:00
• da198fdda5 more on collapsing Mario Vavti 2016-01-30 01:28:01 +01:00
• 24f912e0b2 Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2016-01-30 00:31:09 +01:00