aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #201 from wave72/masterWave2015-11-302-6634/+6637
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Updated Italian stringsPaolo Tacconi2015-11-302-6634/+6637
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #3 from redmatrix/masterWave2015-11-25525-14424/+116761
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | generalise the site black|white allow lists, also add a channel black|white l...redmatrix2015-11-294-26/+63
* | | | | | | | | | | | | | | | | | | | | | | | | | | 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 instead...redmatrix2015-11-293-97/+115
| |_|/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | 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 one...redmatrix2015-11-292-1/+5
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | 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 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
* | | | | | | | | | | | | | | | | | | | | | | | | | improve event renderingMario Vavti2015-11-261-6/+8
| |/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | add locationMario Vavti2015-11-261-4/+6
* | | | | | | | | | | | | | | | | | | | | | | | | fix event renderingMario Vavti2015-11-261-10/+11
* | | | | | | | | | | | | | | | | | | | | | | | | we also need nofinish in the object. css ficesMario Vavti2015-11-263-2/+6
* | | | | | | | | | | | | | | | | | | | | | | | | css fixesMario Vavti2015-11-262-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | | also catch the other objectMario Vavti2015-11-261-0/+5
* | | | | | | | | | | | | | | | | | | | | | | | | first iteration on the event itemMario Vavti2015-11-269-5/+84
|/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | document that you probably shouldn't set a primary directory server in somebo...redmatrix2015-11-251-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | issue #185redmatrix2015-11-256-10/+12
* | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-256-68/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | some basic event stylingMario Vavti2015-11-255-61/+36
| * | | | | | | | | | | | | | | | | | | | | | | | add a if clause for the case we do not have a finish dateMario Vavti2015-11-251-6/+7