Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-12-05 | 1 | -0/+4 |
|\ | |||||
| * | Enlarge the default mail composition text area. | Andrew Manning | 2015-12-04 | 1 | -0/+4 |
| | | |||||
* | | Updated Norwegian translation | Haakon Meland Eriksen | 2015-12-05 | 2 | -7002/+7197 |
|/ | |||||
* | es+nl and bluegrid update | jeroenpraat | 2015-12-03 | 5 | -13295/+13301 |
| | |||||
* | fix nav search popup active background color | Mario Vavti | 2015-12-02 | 1 | -0/+7 |
| | |||||
* | fix attachment rendering for mail | Mario Vavti | 2015-12-02 | 2 | -0/+10 |
| | |||||
* | fix badge padding in narrow navbar | Mario Vavti | 2015-12-01 | 2 | -1/+1 |
| | |||||
* | make narrow navbar setting work again | Mario Vavti | 2015-12-01 | 2 | -3/+1 |
| | |||||
* | Merge pull request #201 from wave72/master | Wave | 2015-11-30 | 2 | -6634/+6637 |
|\ | | | | | Updated Italian strings | ||||
| * | Updated Italian strings | Paolo Tacconi | 2015-11-30 | 2 | -6634/+6637 |
| | | |||||
* | | css fixes | Mario Vavti | 2015-11-28 | 5 | -22/+43 |
| | | |||||
* | | 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 | 4 | -24/+19 |
| | | |||||
* | | css fixes | Mario Vavti | 2015-11-27 | 3 | -71/+23 |
| | | |||||
* | | unset does not work in webkit browsers | Mario Vavti | 2015-11-27 | 1 | -1/+1 |
| | | |||||
* | | add spinner to events | Mario Vavti | 2015-11-27 | 3 | -1/+11 |
| | | |||||
* | | lost calendar icon | Mario Vavti | 2015-11-26 | 1 | -1/+1 |
| | | |||||
* | | various css fixes | Mario Vavti | 2015-11-26 | 4 | -10/+17 |
| | | |||||
* | | 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 |
| | | |||||
* | | we also need nofinish in the object. css fices | Mario Vavti | 2015-11-26 | 2 | -2/+4 |
| | | |||||
* | | css fixes | Mario Vavti | 2015-11-26 | 2 | -1/+2 |
| | | |||||
* | | first iteration on the event item | Mario Vavti | 2015-11-26 | 5 | -4/+27 |
| | | |||||
* | | document that you probably shouldn't set a primary directory server in ↵ | redmatrix | 2015-11-25 | 1 | -1/+1 |
| | | | | | | | | somebody else's realm. | ||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-25 | 4 | -52/+34 |
|\ \ | |||||
| * | | some basic event styling | Mario Vavti | 2015-11-25 | 3 | -50/+19 |
| | | | |||||
| * | | 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 | ||||
* / | removed block style on dropdown contact name and details, added ↵ | redmatrix | 2015-11-25 | 2 | -3/+4 |
|/ | | | | dropdown-menu-img-sm on nav search dropdown; as many dropdowns were unuseable | ||||
* | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-11-24 | 2 | -1946/+1997 |
|\ | |||||
| * | Merge pull request #187 from wave72/master | Wave | 2015-11-24 | 2 | -1946/+1997 |
| |\ | | | | | | | Updated Italian strings | ||||
| | * | Updated Italian strings | Paolo Tacconi | 2015-11-24 | 2 | -1946/+1997 |
| | | | |||||
* | | | efent form template fixes | Mario Vavti | 2015-11-24 | 3 | -54/+28 |
|/ / | |||||
* | | 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 | 9 | -306/+154 |
| | | |||||
* | | issue #185 - prevent liveUpdate from updating while the built-in html5 media ↵ | redmatrix | 2015-11-23 | 1 | -1/+20 |
| | | | | | | | | player is "active". This will not have any affect on flash or other media players, and could potentially get confused if you have more than one media player actively playing at any given time. | ||||
* | | 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 | 12 | -3280/+3370 |
| |\ \ | |||||
| * | | | 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. | ||||
* | | | | delivery report tweaks | redmatrix | 2015-11-22 | 1 | -1/+1 |
| | | | | |||||
* | | | | make calendar week start (sun or mon) configurable | Mario Vavti | 2015-11-21 | 2 | -0/+3 |
| |/ / |/| | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-11-20 | 4 | -3192/+3278 |
|\ \ \ | |||||
| * | | | update es+nl | jeroenpraat | 2015-11-20 | 4 | -3192/+3278 |
| | | | | |||||
* | | | | make calendar language aware | Mario Vavti | 2015-11-20 | 1 | -1/+1 |
|/ / / | |||||
* | | | Had to switch these 2. Sorry. | jeroenpraat | 2015-11-20 | 1 | -0/+2 |
| | | |