aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Resolving merge conflictHaakon Meland Eriksen2015-11-299-302/+49
|
* My version of jot.tplHaakon Meland Eriksen2015-11-281-49/+58
|
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-2827-4462/+4962
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/datetime.php include/text.php mod/events.php version.inc view/css/mod_events.css view/theme/redbasic/css/style.css view/tpl/event_head.tpl view/tpl/events-js.tpl view/tpl/jot.tpl
| * fix tpl if clauseMario Vavti2015-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
| | | |
| * | | 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 ↵redmatrix2015-11-251-1/+1
| | | | | | | | somebody else's realm.
| * 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
| | |
| | * note to self: do not make things more complicated than they need to be.Mario Vavti2015-11-251-2/+3
| | |
| | * events: make sure default finish date is one hour after start date and shift ↵Mario Vavti2015-11-252-7/+26
| | | | | | | | | | | | the finishdate if startdate is shifted
| * | removed block style on dropdown contact name and details, added ↵redmatrix2015-11-253-4/+5
| |/ | | | | | | dropdown-menu-img-sm on nav search dropdown; as many dropdowns were unuseable
| * fix event form initial valuesredmatrix2015-11-241-6/+14
| |
| * add (blank?) label param to other instances of datetimeselredmatrix2015-11-243-4/+6
| |
| * Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-11-242-1946/+1997
| |\
| | * Merge pull request #187 from wave72/masterWave2015-11-242-1946/+1997
| | |\ | | | | | | | | Updated Italian strings
| | | * Updated Italian stringsPaolo Tacconi2015-11-242-1946/+1997
| | | |
| * | | efent form template fixesMario Vavti2015-11-243-54/+28
| |/ /
| * | open form on dbl-clickMario Vavti2015-11-241-1/+4
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 12:49:08 +0000