aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-01-3112-1995/+2059
|\
| * es-es+nl strings and fixing css maintained schemasjeroenpraat2016-01-309-1990/+2040
| * one more css fixMario Vavti2016-01-301-1/+1
| * css fixesMario Vavti2016-01-302-3/+17
| * fix a slight regressionMario Vavti2016-01-301-1/+1
* | 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 vie...Mario Vavti2016-01-301-3/+47
| |/
| * add peer filtering to all .well-known servicesredmatrix2016-01-282-1/+18
| * widget_item - provide ability to use the page title instead of the message_id...redmatrix2016-01-283-8/+21
* | 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
| * | no trailing slashJeroen van Riet Paap2016-01-271-1/+1
| * | no trailing slashJeroen van Riet Paap2016-01-271-1/+1
| |/
* | 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 groups...redmatrix2016-01-272-2/+2
| * 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 deletin...redmatrix2016-01-264-3/+8
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-268-10/+19
| |\
| | * Linking new connection notification to pending connections (see Channel 1) an...jeroenpraat2016-01-278-10/+19
| * | 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
| * 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 proc_ope...redmatrix2016-01-242-5/+5
| * 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 same...redmatrix2016-01-243-1/+7
| |/
* | 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
| | |\
| | | * Merge branch 'master' of https://github.com/redmatrix/hubzilla into activitys...Andrew Manning2016-01-2164-1543/+1805
| | | |\
| | | * | 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 typesBob Mottram2016-01-222-2/+2
| | |/ / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 20:24:59 +0000