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

• fea532af4d rework salmon - important, update addons also if you have enabled gnusoc addon redmatrix 2016-03-20 19:55:53 -07:00
• f5b22dfd5b erge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2016-03-21 00:41:09 +01:00
• 48e62bb50a Merge pull request #329 from git-marijus/master redmatrix 2016-03-21 10:22:30 +11:00
• 513078e1f7 Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2016-03-20 23:52:55 +01:00
• 23151100de Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-03-20 15:32:09 -07:00
• eb68b66c58 issue #330 - permit archived connections in ACLs. If they are to be blocked for delivery (or some other purpose) this should probably happen in the delivery mechanism (or other related sub-system) rather than the permissions mechanism, although currently we still attempt direct delivery to archived connections. Technically "archived" means merely that we won't 'poll' the connection according to the current definition. redmatrix 2016-03-20 15:27:26 -07:00
• 1ddb43b0d3 an attempt to visualize the supremacy of dont show over show in the acl selector Mario Vavti 2016-03-20 23:07:39 +01:00
• 9fcd470aca fix #328 by using a seperate query instead of group_concat Mario Vavti 2016-03-20 20:26:55 +01:00
• 23419e4c26 Update NL + es_ES strings. jeroenpraat 2016-03-20 14:39:22 +01:00
• 34b42566b6 add fixme Mario Vavti 2016-03-20 02:25:59 +01:00
• f7ff48f806 Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2016-03-20 01:46:13 +01:00
• 30cf56bdb5 make >>indicate group members<< in acl selector work again on group > show or group > dont show is selected Mario Vavti 2016-03-20 01:45:56 +01:00
• 77094f8d2b make the admin side menu extensible and provide a hook for a channel "move" operation that federation plugins might use to re-establish connections after a channel move. redmatrix 2016-03-19 16:17:19 -07:00
• 51cd4e8519 missing return false for map link Mario Vavti 2016-03-19 02:20:59 +01:00
• bd249b276d add use as cover photo link to photos view Mario Vavti 2016-03-18 17:49:31 +01:00
• b6ae2bff01 change rev 1.3.1 redmatrix 2016-03-17 18:42:32 -07:00
• 21c1f89eba SECURITY: DAV authentication issue redmatrix 2016-03-17 18:40:03 -07:00
• df61970b39 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-03-17 12:16:25 -07:00
• f82afca84d no xchan here if using zot protocol redmatrix 2016-03-17 12:15:28 -07:00
• eca119d695 See issue https://github.com/redmatrix/hubzilla-addons/issues/17 (UNO: enable the Diaspora protocol for all channels (if addon is enabled) - I had to do this during channel creation and not in the addon itself, or else the member can't change this after the channel is created. Tested it on UNO and normal Hubzilla. If this is not the right place for this, please move it. If not wanted at all, please discuss. jeroenpraat 2016-03-17 15:48:44 +01:00
• 40162cd6b7 some work on profile listing Mario Vavti 2016-03-17 12:56:55 +01:00
• a41a05e6c0 bring more structure to profiles edit Mario Vavti 2016-03-17 11:50:53 +01:00
• a83cdbeb39 typo redmatrix 2016-03-16 22:02:19 -07:00
• 6d4fe5c56f Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-03-16 21:06:15 -07:00
• 3a8f6e6576 more federation backend redmatrix 2016-03-16 21:05:52 -07:00
• 38eb79705e lots of work on federated channel discovery redmatrix 2016-03-16 18:00:13 -07:00
• f7ddd44c2e Merge pull request #327 from anaqreon/ownmapp-typo git-marijus 2016-03-16 23:10:24 +01:00
• 2165733ddc move buttons to dropdown menu and some cleanup Mario Vavti 2016-03-16 23:07:29 +01:00
• d22b21c56f still more janitor work on profiles Mario Vavti 2016-03-16 13:45:24 +01:00
• 4188419b30 more federation backend work redmatrix 2016-03-15 17:54:06 -07:00
• d98d7003ed even more janitor work on profiles Mario Vavti 2016-03-15 21:38:03 +01:00
• 1692380ac7 Misspelling of ownMapp Andrew Manning 2016-03-15 10:54:45 -04:00
• 01a28ddf8d Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-03-15 01:32:41 -07:00
• e8d19659c0 some heavy lifting porting the old salmon code redmatrix 2016-03-15 00:50:03 -07:00
• b673b6835d federation work redmatrix 2016-03-14 22:14:17 -07:00
• ef7494359f some re-working of webfinger and hcard parsing which will be necessary going forward. redmatrix 2016-03-14 18:12:35 -07:00
• b8e8517725 Merge branch 'master' of https://github.com/redmatrix/hubzilla jeroenpraat 2016-03-14 15:46:57 +01:00
• def0454952 update nl + es-es strings jeroenpraat 2016-03-14 15:43:51 +01:00
• 2f5862713e Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-03-13 18:16:11 -07:00
• 6729c27b77 git update everything redmatrix 2016-03-13 18:15:38 -07:00
• fbfa391965 Merge pull request #323 from phellmes/de20160313 redmatrix 2016-03-14 10:45:54 +11:00
• 38beabb508 fix spacing Mario Vavti 2016-03-13 21:27:29 +01:00
• a8d5c83251 Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2016-03-13 21:19:33 +01:00
• 370a007ee2 more janitor work on profiles Mario Vavti 2016-03-13 21:19:15 +01:00
• 7747a23a78 Merge pull request #324 from einervonvielen/install-script_add-hubsites_stop-hubzilla redmatrix 2016-03-14 06:19:18 +11:00
• c573670821 Install script: Added plugin hubsites and stop of apache, mysql EinerVonVielen 2016-03-13 16:32:34 +01:00
• a752d44313 Update DE translation strings phellmes 2016-03-13 13:29:14 +01:00
• 9406ff714b Merge pull request #322 from einervonvielen/homeinstall_with_plugins redmatrix 2016-03-13 15:21:00 +11:00
• cc29e27acc issue #320 - regression, after removing channel attached to an authenticated session the session was not completely cleared. redmatrix 2016-03-12 19:53:07 -08:00
• b2563528ee Added installation of extended plugins and themes to homeinstall script EinerVonVielen 2016-03-13 02:37:38 +01:00
• 70ad69d38c Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-03-12 16:47:11 -08:00
• cb0c43bc68 provide service federation overview - how to go about it and the appropriate places to attach your plugin. redmatrix 2016-03-12 16:45:53 -08:00
• 7efffbf102 Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2016-03-12 22:14:08 +01:00
• 2d8deb6082 some janitor work on profiles Mario Vavti 2016-03-12 22:13:46 +01:00
• 5de79cdb10 Merge pull request #321 from einervonvielen/fix_german_help_link_to_github Jeroen van Riet Paap 2016-03-12 22:04:56 +01:00
• 6837c2ef1e Fix: German help > link to of project in github. The link Pointed to redmatrix. Now the link points to hubzilla. EinerVonVielen 2016-03-12 21:46:13 +01:00
• 4e9440396c remove superfluous return Mario Vavti 2016-03-11 10:54:04 +01:00
• 32c23ef562 some minor cleanups redmatrix 2016-03-10 15:43:59 -08:00
• 107f80892a UNO: Hide bookmark tools in items (#^ and in menu) jeroenpraat 2016-03-10 19:39:38 +01:00
• fbcb711945 we've come a long way since this faq entry on the limits of cloning was written redmatrix 2016-03-09 19:03:09 -08:00
• e95a494041 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-03-09 16:23:46 -08:00
• 7732532964 handle UNO move channel operation redmatrix 2016-03-09 15:56:51 -08:00
• bb09b8a385 Update doc jeroenpraat 2016-03-09 23:25:37 +01:00
• b9b46a3f88 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-03-09 14:18:11 -08:00
• 7bb461380e issue #319 - make sure we have a local_channel() and an App::channel before trying to change the default schema for a channel redmatrix 2016-03-09 14:15:50 -08:00
• f5f79b39b8 Merge pull request #318 from git-marijus/master redmatrix 2016-03-10 09:03:59 +11:00
• 14e55e8bd6 should have probably done that on tag release Mario Vavti 2016-03-09 13:06:24 +01:00
• bc9d5f5a48 Merge pull request #317 from git-marijus/master redmatrix 2016-03-09 20:10:48 +11:00
• c2cdd41e81 Issue #316 make /display updates work. Basically copy and paste what we do on load and add $simple_update to the query. Mario Vavti 2016-03-09 10:04:33 +01:00
• 256cd6baac work on implementing account/channel move (as opposed to clone) redmatrix 2016-03-09 00:46:17 -08:00
• 843cc1481a isue #315 redmatrix 2016-03-08 16:46:47 -08:00
• cf4dc2caa8 move "generator" to HttpMeta redmatrix 2016-03-08 16:21:35 -08:00
• 1258f9bb21 turn 'OpenGraph' into a more general purpose HTTP meta facility for setting any meta header redmatrix 2016-03-08 16:06:58 -08:00
• 5f41d06bb9 revup redmatrix 2016-03-08 15:50:34 -08:00
• 8f4fe106ef Merge pull request #314 from wave72/master Wave 2016-03-08 15:54:54 +01:00
• d74274c7e4 Updated Italian strings Paolo Tacconi 2016-03-08 15:51:21 +01:00
• d59268a5d8 removed id by mistake - add it again Mario Vavti 2016-03-08 11:47:17 +01:00
• f364343b55 add generic-content-wrapper and setction-content-wrapper to profile_edit.tpl Mario Vavti 2016-03-08 11:43:21 +01:00
• 9debfa348a add syslog loglevels to dba functions redmatrix 2016-03-07 20:43:52 -08:00
• 32e903e956 a bit of page cleanup for edit profiles redmatrix 2016-03-07 18:49:17 -08:00
• bd8fe768d3 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-03-07 16:55:12 -08:00
• 848c038970 issue #313 redmatrix 2016-03-07 16:54:58 -08:00
• 24fa201218 Small, but important fix for Dutch jeroenpraat 2016-03-08 01:47:01 +01:00
• 1a77fb4c1d Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2016-03-07 15:12:09 -08:00
• 76467b5a35 allow modules/addons to override the og:title field redmatrix 2016-03-07 15:11:11 -08:00
• d5db25808a Facebook scraper "OpenGraph" support; modules will need to set the required fields (type, image, url) as well as any desired optional or type specific fields. We will set the title during pagebuild. redmatrix 2016-03-07 15:03:53 -08:00
• 6824fb9f93 Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2016-03-07 21:48:12 +01:00
• b2216f8203 prevent page jumping if the narrow navbar setting is used Mario Vavti 2016-03-07 21:47:52 +01:00
• 0799a0a3be Spanish and Dutch strings + fix es>es-es link jeroenpraat 2016-03-07 20:29:14 +01:00
• a2e0574fce Merge pull request #312 from jeroenpraat/master redmatrix 2016-03-08 06:03:55 +11:00
• 68d7ab6b55 Merge pull request #308 from HaakonME/master Jeroen van Riet Paap 2016-03-07 19:53:58 +01:00
• 4a2c805270 Merge pull request #310 from einervonvielen/updated_homeinstall_instructions Jeroen van Riet Paap 2016-03-07 19:49:58 +01:00
• 7d5b266227 Merge pull request #309 from tluther/master Jeroen van Riet Paap 2016-03-07 19:47:47 +01:00
• 1f56ff5407 Update DerivedTheme1.md Jeroen van Riet Paap 2016-03-07 17:07:34 +01:00
• 95f5f3d44d Show only schema selector when Redbasic (so not a derived theme) Jeroen van Riet Paap 2016-03-07 17:06:10 +01:00
• 7a5213cc8e Set the schema to the default schema in derived themes. Jeroen van Riet Paap 2016-03-07 17:03:02 +01:00
• f1f19372ad Update config.php Jeroen van Riet Paap 2016-03-07 17:01:12 +01:00
• 276f44328e Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2016-03-07 06:00:26 +01:00
• da3f1326e0 revup redmatrix 2016-03-06 15:32:46 -08:00
• a013ddbb91 Doc: Minor correction cloud URL in cloud.bb Tobias Luther 2016-03-06 21:32:36 +01:00