Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | 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 |
| | | | |||||
* | | | Some bits | jeroenpraat | 2015-11-20 | 1 | -2/+6 |
| | | | |||||
* | | | move today button from aside to section title | Mario Vavti | 2015-11-19 | 2 | -1/+1 |
| | | | |||||
* | | | css fixes | Mario Vavti | 2015-11-19 | 2 | -0/+16 |
| | | | |||||
* | | | move moment.min.js and remove unneeded files | Mario Vavti | 2015-11-18 | 1 | -1/+1 |
| | | | |||||
* | | | some events refacturing | Mario Vavti | 2015-11-18 | 6 | -87/+69 |
|/ / | |||||
* | | fix admin plugin hooks | redmatrix | 2015-11-17 | 1 | -2/+2 |
| | | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-17 | 6 | -34/+30 |
|\ \ | |||||
| * | | more css fixes | Mario Vavti | 2015-11-17 | 5 | -15/+13 |
| | | | |||||
| * | | css fixes | Mario Vavti | 2015-11-17 | 2 | -7/+9 |
| | | | |||||
| * | | show jotnets toggle button only if there are jotnets and whitespace fixes | Mario Vavti | 2015-11-17 | 1 | -14/+10 |
| | | | |||||
* | | | photo album widget permissions issue | redmatrix | 2015-11-17 | 1 | -2/+2 |
|/ / | |||||
* | | fix api/direct_messages/new at least for the json case. We seem to have a ↵ | redmatrix | 2015-11-16 | 1 | -12/+30 |
| | | | | | | | | missing template for XML | ||||
* | | nl+es and some other bits | jeroenpraat | 2015-11-14 | 7 | -1138/+1160 |
| | | |||||
* | | really basic photo album widget for content regions | redmatrix | 2015-11-12 | 1 | -0/+2 |
| | | |||||
* | | Small update to Bluegrid and generic-content-wrapper-styled to dreport | jeroenpraat | 2015-11-12 | 1 | -1/+1 |
| | | |||||
* | | add avatars to likes/dislikes/etc. | redmatrix | 2015-11-09 | 1 | -0/+6 |
| | | |||||
* | | remove list bullets from extended like list | redmatrix | 2015-11-09 | 2 | -1/+5 |
| | | |||||
* | | This is better | jeroenpraat | 2015-11-09 | 1 | -2/+2 |
| | | |||||
* | | Using bootstrap classes, so other themes/schemas also work. Plus margin when ↵ | jeroenpraat | 2015-11-09 | 2 | -7/+2 |
| | | | | | | | | collapsed. | ||||
* | | Merge pull request #137 from wave72/master | Wave | 2015-11-09 | 2 | -1823/+1876 |
|\| | | | | | Updated Italian strings | ||||
| * | Updated Italian strings | Paolo Tacconi | 2015-11-09 | 2 | -1823/+1876 |
| | | |||||
* | | some more db doco | redmatrix | 2015-11-08 | 1 | -1/+1 |
| | | |||||
* | | make jotnets modal | redmatrix | 2015-11-08 | 2 | -3/+19 |
| | | |||||
* | | Quick fix: Moved Twitter select box to the top of ACL selector | Tobias Luther | 2015-11-08 | 1 | -3/+6 |
| | | |||||
* | | Fix ffsapi for non-English languages (or better when 's was used in the ↵ | jeroenpraat | 2015-11-08 | 4 | -3610/+3716 |
|/ | | | | strings) - Update nl+es | ||||
* | Firefox share (that seems now the official name) button added to misc. settings. | jeroenpraat | 2015-11-05 | 2 | -5/+17 |
| | |||||
* | Chat page improved (I think). Works now better with diff. resolutions, font ↵ | jeroenpraat | 2015-11-04 | 6 | -18/+39 |
| | | | | sizes and languages. Fixed follow field on conn. page. Small schemas updates. | ||||
* | Merge pull request #125 from wave72/master | Wave | 2015-11-04 | 2 | -638/+678 |
|\ | | | | | Updated Italian strings | ||||
| * | Updated Italian strings | Paolo Tacconi | 2015-11-04 | 2 | -638/+678 |
| | | |||||
* | | Merge pull request #119 from sasiflo/master | redmatrix | 2015-11-04 | 3 | -5/+5 |
|\ \ | | | | | | | Some small rebranding for Hubzilla transition from Red Matrix | ||||
| * \ | Merge branch 'rebranding' | sasiflo | 2015-11-03 | 3 | -5/+5 |
| |\ \ | |||||
| | * | | Some small rebranding for Hubzilla transition from Red Matrix | sasiflo | 2015-11-03 | 3 | -5/+5 |
| | | | | |||||
* | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-11-03 | 4 | -4/+14 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/photo/photo_driver.php include/text.php mod/post.php |