aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Resolving merge conflictHaakon Meland Eriksen2015-11-295-184/+49
* My version of jot.tplHaakon Meland Eriksen2015-11-281-49/+58
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-2814-8/+357
|\
| * fix tpl if clauseMario Vavti2015-11-281-1/+1
| * add templatesMario Vavti2015-11-272-0/+23
| * move events tools to aside widgetMario Vavti2015-11-274-24/+19
| * css fixesMario Vavti2015-11-273-71/+23
| * unset does not work in webkit browsersMario Vavti2015-11-271-1/+1
| * add spinner to eventsMario Vavti2015-11-273-1/+11
| * lost calendar iconMario Vavti2015-11-261-1/+1
| * various css fixesMario Vavti2015-11-264-10/+17
| * beautify event item codeMario Vavti2015-11-262-0/+21
| * default timepicker to 15 min steps. abbr -> spanMario Vavti2015-11-261-3/+3
| * 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-262-2/+4
| * css fixesMario Vavti2015-11-262-1/+2
| * first iteration on the event itemMario Vavti2015-11-265-4/+27
| * document that you probably shouldn't set a primary directory server in somebo...redmatrix2015-11-251-1/+1
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-254-52/+34
| |\
| | * some basic event stylingMario Vavti2015-11-253-50/+19
| | * 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-251-2/+13
| * | removed block style on dropdown contact name and details, added dropdown-menu...redmatrix2015-11-252-3/+4
| |/
| * 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 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
| * | some event heavy lifting - please test and report issuesMario Vavti2015-11-249-306/+154
* | | Removed my version of jot.tplHaakon Meland Eriksen2015-11-2816-2535/+2213
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-242-10/+41
|\| |
| * | issue #185 - prevent liveUpdate from updating while the built-in html5 media ...redmatrix2015-11-231-1/+20
| * | Merge pull request #182 from anaqreon/url-selectedredmatrix2015-11-241-9/+21
| |\ \
| | * \ Merge branch 'master' of https://github.com/redmatrix/hubzilla into url-selectedAndrew Manning2015-11-2012-3280/+3370
| | |\ \
| | * | | If text is selected in profile-jot-text when the link button is pressed, the ...Andrew Manning2015-11-201-9/+21
* | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-231-1/+1
|\| | | |
| * | | | delivery report tweaksredmatrix2015-11-221-1/+1
* | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-212-0/+3
|\| | | |
| * | | | make calendar week start (sun or mon) configurableMario Vavti2015-11-212-0/+3
| | |/ / | |/| |
* | | | Space between Preview and Submit in jot.tplHaakon Meland Eriksen2015-11-201-1/+1
* | | | Space between Preview and Submit in jot.tplHaakon Meland Eriksen2015-11-201-0/+2
* | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-205-3193/+3279
|\| | |
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-11-204-3192/+3278
| |\ \ \
| | * | | update es+nljeroenpraat2015-11-204-3192/+3278
| * | | | make calendar language awareMario Vavti2015-11-201-1/+1
| |/ / /
* | | | Rearranging buttonsHaakon Meland Eriksen2015-11-201-1/+1
* | | | Rearranging buttonsHaakon Meland Eriksen2015-11-201-10/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 08:21:46 +0000