aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-308-555/+598
|\
| * do not make a difference if there are images or not for nowMario Vavti2016-01-301-3/+3
| |
| * more on collapsingMario Vavti2016-01-301-53/+20
| |
| * Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-01-303-530/+532
| |\
| | * move permission check before global block checkredmatrix2016-01-293-530/+532
| | |
| * | it is not perfect but it still may ease the collapsing of items above the ↵Mario Vavti2016-01-301-3/+47
| |/ | | | | | | viewport a little...
| * add peer filtering to all .well-known servicesredmatrix2016-01-282-1/+18
| |
| * widget_item - provide ability to use the page title instead of the ↵redmatrix2016-01-283-8/+21
| | | | | | | | message_id to locate the desired item. You can use either, but the page title is often easier to use and discover.
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-281-0/+4
|\|
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-273-3/+3
| |\
| * | block_public_blackout settingredmatrix2016-01-271-0/+4
| | |
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-283-3/+3
|\ \ \ | | |/ | |/|
| * | remark in the private notes encryptedJeroen van Riet Paap2016-01-281-1/+1
| | | | | | | | | Notes are not encrypted and are readable in the database by the admin. Made a remark about that. Probably this needs to be fixed, but till than, it's better to warn people.
| * | no trailing slashJeroen van Riet Paap2016-01-271-1/+1
| | |
| * | no trailing slashJeroen van Riet Paap2016-01-271-1/+1
| |/ | | | | it will break your system
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-2735-517/+577
|\|
| * lower caution level from danger to warning for ignore buttonMario Vavti2016-01-271-1/+1
| |
| * provide an icon to make 'add privacy group' stand out from the list of ↵redmatrix2016-01-272-2/+2
| | | | | | | | groups. Please revert if you think it's too messy.
| * rename collections to privacy groupsredmatrix2016-01-2616-491/+496
| |
| * control the generation or acceptance of directory keywordsredmatrix2016-01-263-3/+12
| |
| * bring back the ability to ignore a pending connection request without ↵redmatrix2016-01-264-3/+8
| | | | | | | | deleting it and without always having it in your face and without jumping through hoops.
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-268-10/+19
| |\
| | * Linking new connection notification to pending connections (see Channel 1) ↵jeroenpraat2016-01-278-10/+19
| | | | | | | | | | | | and improved email notifications about new connections. Could not find a way to do this also for the generic notifications. Added hub domain of channel address on the new channel page. A few people on my hub didn't understood. This example will make it more clear. Some minor bits.
| * | add abook_account to cloned abook records, was missingredmatrix2016-01-261-1/+2
| |/
| * change help text on other channel expiration setting to inform that there is ↵redmatrix2016-01-262-1/+24
| | | | | | | | a system limit. Ignore imported feed content that is older than expiration interval.
| * fix undefined variable reference in widget_itemredmatrix2016-01-262-7/+15
| |
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-2511-3177/+3198
|\|
| * don't provide notification icons on manage page for delegated channelsredmatrix2016-01-242-1/+2
| |
| * regression: channel name missing on delegate section of manage pageredmatrix2016-01-241-0/+1
| |
| * cleanup and add comments about what we're trying to do hereredmatrix2016-01-242-3/+12
| |
| * make exec the default for proc_run - use system.use_proc_open to use ↵redmatrix2016-01-242-5/+5
| | | | | | | | proc_open. Also prohibit delegated channels from manually invoking new_channel under the delegated account.
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-244-3169/+3173
| |\
| | * es-es+nl string updatejeroenpraat2016-01-244-3169/+3173
| | |
| * | remote delegation issue when already logged in with different account on ↵redmatrix2016-01-243-1/+7
| |/ | | | | | | same site.
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-244-4/+11
|\|
| * update hidden_configs with proc_run_use_execredmatrix2016-01-231-0/+3
| |
| * provide option to use exec in proc_runredmatrix2016-01-233-4/+8
| |
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-229-1297/+1329
|\|
| * docJeroen van Riet Paap2016-01-221-1/+1
| |
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-223-2/+8
| |\
| | * Merge pull request #266 from anaqreon/activitystreamsredmatrix2016-01-221-0/+6
| | |\ | | | | | | | | Activitystreams
| | | * Merge branch 'master' of https://github.com/redmatrix/hubzilla into ↵Andrew Manning2016-01-2164-1543/+1805
| | | |\ | | | | | | | | | | | | | | | activitystreams
| | | * | Added more ActivityStreams schema support to boot.php for gamesAndrew Manning2016-01-211-0/+6
| | | | |
| | * | | Merge pull request #267 from bashrc/bashrc/noderedmatrix2016-01-222-2/+2
| | |\ \ \ | | | | | | | | | | | | Change node script types
| | | * | | Change node script typesBob Mottram2016-01-222-2/+2
| | |/ / /
| * / / / provide mechanism for custom .well-known handlers and static files (e.g. for ↵redmatrix2016-01-225-1294/+1320
| |/ / / | | | | | | | | | | | | letsencypt ownership verification). Document that if you create a .well-known directory to validate a letsencrypt cert you need to remove it before installing hubzilla. We probably need a check for this in the install checklist.
* | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-2217-8/+31
|\| | |
| * | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-215-0/+1
| |\ \ \ | | | |/ | | |/|
| | * | Merge pull request #265 from bashrc/bashrc/tidyingredmatrix2016-01-225-0/+1
| | |\ \ | | | | | | | | | | General tidying
| | | * | Executable flash files ???Bob Mottram2016-01-211-0/+0
| | | | |