aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix mail attachment and photo permissions. issue #202Mario Vavti2015-12-021-4/+5
|
* Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-12-024-7/+11
|\
| * issue #204redmatrix2015-12-011-1/+1
| |
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-011-1/+6
| |\
| | * Merge pull request #200 from anaqreon/update-addon-scriptredmatrix2015-12-021-1/+6
| | |\ | | | | | | | | Update addon script
| | | * Merge branch 'master' of https://github.com/redmatrix/hubzilla into ↵Andrew Manning2015-11-306-122/+177
| | | |\ | | | | | | | | | | | | | | | update-addon-script
| | | * | Abort addon update if repo does not existAndrew Manning2015-11-301-1/+6
| | | | |
| * | | | usercache is no longer usedredmatrix2015-12-012-5/+4
| |/ / /
* / / / fix attachment rendering for mailMario Vavti2015-12-024-2/+13
|/ / /
* | | fix badge padding in narrow navbarMario Vavti2015-12-012-1/+1
| | |
* | | make narrow navbar setting work againMario Vavti2015-12-012-3/+1
| | |
* | | versionredmatrix2015-11-301-1/+1
| | |
* | | Merge pull request #201 from wave72/masterWave2015-11-302-6634/+6637
|\ \ \ | |_|/ |/| | Updated Italian strings
| * | Updated Italian stringsPaolo Tacconi2015-11-302-6634/+6637
| | |
| * | Merge pull request #3 from redmatrix/masterWave2015-11-25525-14424/+116761
| |\ \ | | | | | | | | Update branch
* | | | generalise the site black|white allow lists, also add a channel black|white ↵redmatrix2015-11-294-26/+63
| | | | | | | | | | | | | | | | list for future use
* | | | report correct directory mode for standalone directories in siteinforedmatrix2015-11-291-1/+1
| | | |
* | | | create get_site_info() function so we can have a siteinfo.json module ↵redmatrix2015-11-293-97/+115
| |_|/ |/| | | | | | | | instead of or actually in addition to siteinfo/json
* | | issue #189redmatrix2015-11-292-1/+7
| | |
* | | don't try to pull public content from dead sitesredmatrix2015-11-291-1/+4
| | |
* | | log whatever is showing up in the delivery hash array since it seems that ↵redmatrix2015-11-292-1/+5
| | | | | | | | | | | | one site has something unusual there and it is throwing errors.
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-287-30/+51
|\ \ \
| * | | reflect in form if we are editing or creatingMario Vavti2015-11-281-7/+7
| | | |
| * | | css fixesMario Vavti2015-11-285-22/+43
| | | |
| * | | fix tpl if clauseMario Vavti2015-11-281-1/+1
| | | |
* | | | versionredmatrix2015-11-281-1/+1
|/ / /
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-2713-107/+128
|\ \ \
| * | | Reverted.ken restivo2015-11-271-6/+0
| | | |
| * | | Re-reading zottel's excellent docs, 70 seems the recommended default. Changed.ken restivo2015-11-271-1/+1
| | | |
| * | | More sane defaults, to avoid problems. Addresses #188ken restivo2015-11-271-0/+1
| | | |
| * | | Safe defaults to prevent #188ken restivo2015-11-271-0/+6
| | | |
| * | | add templatesMario Vavti2015-11-272-0/+23
| | | |
| * | | move events tools to aside widgetMario Vavti2015-11-275-25/+34
| | | |
| * | | css fixesMario Vavti2015-11-273-71/+23
| | | |
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-11-271-0/+41
| |\ \ \
| | * \ \ Merge pull request #193 from zzottel/mastergit-marijus2015-11-271-0/+41
| | |\ \ \ | | | | | | | | | | | | added info about Apache settings to avoid Apache running wild
| | | * | | added info about Apache settings to avoid Apache running wildzottel2015-11-271-0/+41
| | | | | |
| * | | | | fixes #194 - New directory server is selected on every directory page reloadMario Vavti2015-11-271-1/+1
| |/ / / /
| * | | | unset does not work in webkit browsersMario Vavti2015-11-271-1/+1
| | | | |
| * | | | only show edit icon for your own events and minoe cleanupMario Vavti2015-11-271-18/+3
| | | | |
| * | | | add spinner to eventsMario Vavti2015-11-273-1/+11
| |/ / /
* / / / document dreport expiration settingredmatrix2015-11-273-4449/+4454
|/ / /
* | | don't show item_delayed_publish items in tag cloudsredmatrix2015-11-262-4/+3
| | |
* | | lost calendar iconMario Vavti2015-11-261-1/+1
| | |
* | | various css fixesMario Vavti2015-11-265-10/+18
| | |
* | | beautify event item codeMario Vavti2015-11-263-45/+53
| | |
* | | default timepicker to 15 min steps. abbr -> spanMario Vavti2015-11-262-4/+4
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-11-261-1/+1
|\ \ \
| * \ \ Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-2610-13/+105
| |\ \ \
| * | | | versionredmatrix2015-11-261-1/+1
| | | | |