Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-20 | 5 | -3193/+3279 |
|\ | |||||
| * | 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 |
| |/ | |||||
* | | 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 | 2 | -2/+8 |
|\| | |||||
| * | Had to switch these 2. Sorry. | jeroenpraat | 2015-11-20 | 1 | -0/+2 |
| * | Some bits | jeroenpraat | 2015-11-20 | 1 | -2/+6 |
* | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-19 | 4 | -1/+17 |
|\| | |||||
| * | 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 |
* | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-19 | 6 | -87/+69 |
|\| | |||||
| * | 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 |
* | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-18 | 1 | -2/+2 |
|\| | |||||
| * | fix admin plugin hooks | redmatrix | 2015-11-17 | 1 | -2/+2 |
* | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-18 | 6 | -17/+15 |
|\| | |||||
| * | 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 |
| * | | photo album widget permissions issue | redmatrix | 2015-11-17 | 1 | -2/+2 |
* | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-17 | 4 | -33/+49 |
|\ \ \ | | |/ | |/| | |||||
| * | | 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 |
| |/ | |||||
| * | fix api/direct_messages/new at least for the json case. We seem to have a mis... | redmatrix | 2015-11-16 | 1 | -12/+30 |
* | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-15 | 7 | -1138/+1160 |
|\| | |||||
| * | nl+es and some other bits | jeroenpraat | 2015-11-14 | 7 | -1138/+1160 |
* | | Reorder buttons HME | Haakon Meland Eriksen | 2015-11-13 | 1 | -45/+43 |
* | | Adding original jot.tpl from GitHub | Haakon Meland Eriksen | 2015-11-13 | 1 | -49/+54 |
* | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-13 | 2 | -1/+3 |
|\| | |||||
| * | 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 |
* | | Reorder buttons | Haakon Meland Eriksen | 2015-11-13 | 1 | -53/+48 |
* | | Reverted changes - got white screen | Haakon Meland Eriksen | 2015-11-13 | 1 | -47/+52 |
* | | Regrouped post buttons | Haakon Meland Eriksen | 2015-11-13 | 1 | -7/+8 |
* | | Regrouped post buttons | Haakon Meland Eriksen | 2015-11-13 | 1 | -3/+0 |
* | | Regrouped post buttons | Haakon Meland Eriksen | 2015-11-12 | 1 | -21/+12 |
* | | Regrouped post buttons | Haakon Meland Eriksen | 2015-11-12 | 1 | -31/+29 |
* | | Make upload and encrypt easier on phones by editing jot.tpl | Haakon Meland Eriksen | 2015-11-12 | 1 | -13/+11 |
* | | Promoted upload of images and encryption | Haakon Meland Eriksen | 2015-11-11 | 1 | -0/+10 |
* | | Rearranged comment buttons back | Haakon Meland Eriksen | 2015-11-11 | 1 | -13/+10 |
* | | Rearranged comment buttons | Haakon Meland Eriksen | 2015-11-11 | 1 | -10/+13 |
|/ | |||||
* | 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 |
* | Merge pull request #137 from wave72/master | Wave | 2015-11-09 | 2 | -1823/+1876 |
|\ |