aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-0222-1930/+2609
|\
| * Merge pull request #271 from wave72/masterWave2016-02-022-1907/+1968
| |\
| | * Updated Italian stringsPaolo Tacconi2016-02-022-1907/+1968
| * | change aside width to reflect recent widget style changesMario Vavti2016-02-023-3/+6
| * | minor tweaksredmatrix2016-02-012-3/+6
| * | slight formatting improvementsredmatrix2016-02-011-1/+1
| * | adjust for folks that still have 175px profile photosredmatrix2016-02-011-1/+1
| * | missing templateredmatrix2016-02-011-0/+50
| * | profile embeds (still needs a bit of work)redmatrix2016-02-013-0/+87
| * | add photos to the profile "likes this" dropdownsredmatrix2016-02-014-6/+8
| * | more oembed provider work - channel articlesredmatrix2016-02-015-4/+154
| * | oep for the photo top pageredmatrix2016-01-312-3/+68
| * | add album embed (embed the most recent photo with link to album)redmatrix2016-01-312-1/+62
| * | minor changes to changelogredmatrix2016-01-311-4/+4
| * | rev updateredmatrix2016-01-312-1/+93
| * | add zid1.2redmatrix2016-01-311-0/+4
| * | add oembed provider for photosredmatrix2016-01-317-9/+110
* | | 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