| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Resolving merge conflict | Haakon Meland Eriksen | 2015-11-29 | 3 | -105/+49 |
| | | |||||
| * | My version of jot.tpl | Haakon Meland Eriksen | 2015-11-28 | 1 | -49/+58 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-28 | 10 | -4/+292 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | 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 clause | Mario Vavti | 2015-11-28 | 1 | -1/+1 |
| | | | |||||
| | * | add templates | Mario Vavti | 2015-11-27 | 2 | -0/+23 |
| | | | |||||
| | * | move events tools to aside widget | Mario Vavti | 2015-11-27 | 2 | -24/+0 |
| | | | |||||
| | * | unset does not work in webkit browsers | Mario Vavti | 2015-11-27 | 1 | -1/+1 |
| | | | |||||
| | * | add spinner to events | Mario Vavti | 2015-11-27 | 2 | -1/+6 |
| | | | |||||
| | * | lost calendar icon | Mario Vavti | 2015-11-26 | 1 | -1/+1 |
| | | | |||||
| | * | various css fixes | Mario Vavti | 2015-11-26 | 3 | -10/+11 |
| | | | |||||
| | * | beautify event item code | Mario Vavti | 2015-11-26 | 2 | -0/+21 |
| | | | |||||
| | * | default timepicker to 15 min steps. abbr -> span | Mario Vavti | 2015-11-26 | 1 | -3/+3 |
| | | | |||||
| | * | improve event rendering | Mario Vavti | 2015-11-26 | 1 | -6/+8 |
| | | | |||||
| | * | add location | Mario Vavti | 2015-11-26 | 1 | -4/+6 |
| | | | |||||
| | * | fix event rendering | Mario Vavti | 2015-11-26 | 1 | -10/+11 |
| | | | |||||
| | * | first iteration on the event item | Mario Vavti | 2015-11-26 | 3 | -0/+15 |
| | | | |||||
| | * | some basic event styling | Mario Vavti | 2015-11-25 | 1 | -1/+1 |
| | | | |||||
| | * | add a if clause for the case we do not have a finish date | Mario Vavti | 2015-11-25 | 1 | -6/+7 |
| | | | |||||
| | * | note to self: do not make things more complicated than they need to be. | Mario Vavti | 2015-11-25 | 1 | -2/+3 |
| | | | |||||
| | * | events: make sure default finish date is one hour after start date and shift ↵ | Mario Vavti | 2015-11-25 | 1 | -2/+13 |
| | | | | | | | | | the finishdate if startdate is shifted | ||||
| | * | efent form template fixes | Mario Vavti | 2015-11-24 | 1 | -30/+23 |
| | | | |||||
| | * | open form on dbl-click | Mario Vavti | 2015-11-24 | 1 | -1/+4 |
| | | | |||||
| | * | some event heavy lifting - please test and report issues | Mario Vavti | 2015-11-24 | 5 | -199/+146 |
| | | | |||||
| * | | Removed my version of jot.tpl | Haakon Meland Eriksen | 2015-11-28 | 8 | -414/+178 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-24 | 1 | -9/+21 |
| |\| | |||||
| | * | Merge pull request #182 from anaqreon/url-selected | redmatrix | 2015-11-24 | 1 | -9/+21 |
| | |\ | | | | | | | Place link around selected text | ||||
| | | * | Merge branch 'master' of https://github.com/redmatrix/hubzilla into url-selected | Andrew Manning | 2015-11-20 | 4 | -82/+70 |
| | | |\ | |||||
| | | * | | If text is selected in profile-jot-text when the link button is pressed, the ↵ | Andrew Manning | 2015-11-20 | 1 | -9/+21 |
| | | | | | | | | | | | | | | | | | input URL is applied around the text. Otherwise, the normal link data fetch occurs. | ||||
| * | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-23 | 1 | -1/+1 |
| |\| | | | |||||
| | * | | | delivery report tweaks | redmatrix | 2015-11-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-21 | 2 | -0/+3 |
| |\| | | | |||||
| | * | | | make calendar week start (sun or mon) configurable | Mario Vavti | 2015-11-21 | 2 | -0/+3 |
| | | |/ | |/| | |||||
| * | | | Space between Preview and Submit in jot.tpl | Haakon Meland Eriksen | 2015-11-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Space between Preview and Submit in jot.tpl | Haakon Meland Eriksen | 2015-11-20 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-20 | 1 | -1/+1 |
| |\| | | |||||
| | * | | make calendar language aware | Mario Vavti | 2015-11-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Rearranging buttons | Haakon Meland Eriksen | 2015-11-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Rearranging buttons | Haakon Meland Eriksen | 2015-11-20 | 1 | -10/+3 |
| | | | | |||||
| * | | | Rearranging buttons | Haakon Meland Eriksen | 2015-11-20 | 1 | -3/+5 |
| | | | | |||||
| * | | | Rearranging buttons | Haakon Meland Eriksen | 2015-11-20 | 1 | -6/+8 |
| | | | | |||||
| * | | | Rearranging buttons | Haakon Meland Eriksen | 2015-11-20 | 1 | -6/+6 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-20 | 1 | -0/+2 |
| |\| | | |||||
| | * | | Had to switch these 2. Sorry. | jeroenpraat | 2015-11-20 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-19 | 2 | -1/+1 |
| |\| | | |||||
| | * | | move today button from aside to section title | Mario Vavti | 2015-11-19 | 2 | -1/+1 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-19 | 3 | -82/+68 |
| |\| | | |||||
| | * | | move moment.min.js and remove unneeded files | Mario Vavti | 2015-11-18 | 1 | -1/+1 |
| | | | | |||||
| | * | | some events refacturing | Mario Vavti | 2015-11-18 | 3 | -82/+68 |
| | |/ | |||||
| * | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-18 | 2 | -2/+2 |
| |\| | |||||
| | * | more css fixes | Mario Vavti | 2015-11-17 | 2 | -2/+2 |
| | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |