aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | Merge pull request #9 from redmatrix/mastermrjive2015-12-04150-33202/+45858
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #8 from redmatrix/mastermrjive2015-11-11671-9079/+101813
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7 from redmatrix/mastermrjive2015-10-26124-21709/+23747
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #6 from redmatrix/mastermrjive2015-10-0245-36246/+38546
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #5 from redmatrix/mastermrjive2015-09-2997-3163/+137724
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #4 from redmatrix/mastermrjive2015-09-232-8/+31
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #3 from redmatrix/mastermrjive2015-09-2218-149/+312
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #2 from redmatrix/mastermrjive2015-09-2152-428/+662
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #1 from redmatrix/mastermrjive2015-09-1711-66/+61
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | update the poke page layout and UIredmatrix2016-02-042-28/+55
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | add system black/white list for embeds ahead of personal configredmatrix2016-02-041-0/+28
* | | | | | | | | | | | | | | | | | | | | | | poke basic config settingredmatrix2016-02-042-10/+18
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'embedsec'redmatrix2016-02-037-9/+162
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | finish moving block_public to the new security pageredmatrix2016-02-031-3/+0
| * | | | | | | | | | | | | | | | | | | | | | | don't implement the default embed whitelist just yetredmatrix2016-02-031-2/+3
| * | | | | | | | | | | | | | | | | | | | | | | heavy lifting on admin security pageredmatrix2016-02-035-4/+59
| * | | | | | | | | | | | | | | | | | | | | | | admin security page for configuring white and black lists and other security ...redmatrix2016-02-034-3/+103
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | | | | | | | | change view_storage from perms_public to perms_specific in the social_private...redmatrix2016-02-031-1/+1
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | more zcard tweaksredmatrix2016-02-023-4/+8
* | | | | | | | | | | | | | | | | | | | | | some zcard cleanup - still eneds a lot more workredmatrix2016-02-024-20/+130
* | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | 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 https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-01-273-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