| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' of https://github.com/redmatrix/hubzilla | jeroenpraat | 2016-03-01 | 21 | -62/+244 |
|\ |
|
| * | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-01 | 1 | -1/+1 |
| |\ |
|
| | * | Merge pull request #304 from phormanns/master | redmatrix | 2016-03-02 | 1 | -1/+1 |
| | |\ |
|
| | | * | fix typo in postgres schema | Peter Hormanns | 2016-03-01 | 1 | -1/+1 |
| | |/ |
|
| * / | fix js error and add id to field input block | Mario Vavti | 2016-03-01 | 2 | -2/+2 |
| |/ |
|
| * | fix padding | Mario Vavti | 2016-03-01 | 1 | -1/+1 |
| * | do not show empty buttons if not logged in | Mario Vavti | 2016-03-01 | 2 | -2/+2 |
| * | another resize issue | Mario Vavti | 2016-03-01 | 1 | -0/+1 |
| * | fix resize issue | Mario Vavti | 2016-03-01 | 1 | -1/+6 |
| * | move preview content outside of editor space | Mario Vavti | 2016-03-01 | 1 | -1/+2 |
| * | adjust padding | Mario Vavti | 2016-03-01 | 1 | -2/+2 |
| * | set line-height to initial | Mario Vavti | 2016-03-01 | 1 | -1/+1 |
| * | another css fix | Mario Vavti | 2016-03-01 | 1 | -1/+1 |
| * | css fixes to make jot look better with background colors or images | Mario Vavti | 2016-03-01 | 5 | -44/+42 |
| * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-29 | 9 | -92/+9774 |
| |\ |
|
| * | | abconfig | redmatrix | 2016-02-29 | 10 | -10/+187 |
| * | | revup | redmatrix | 2016-02-29 | 1 | -1/+1 |
* | | | Small fix for deleted forum channels showing in the forum widget (had this af... | jeroenpraat | 2016-03-01 | 1 | -1/+1 |
| |/
|/| |
|
* | | provide footer bbcode | Mario Vavti | 2016-02-29 | 3 | -5/+14 |
* | | remove unused variable | Mario Vavti | 2016-02-29 | 1 | -4/+0 |
* | | simplify profile edit button(s) and make it useful for multiple profiles | Mario Vavti | 2016-02-29 | 3 | -53/+72 |
* | | update es-es. tested it and it works now. Don't know what happened earlier. | jeroenpraat | 2016-02-29 | 2 | -1342/+1326 |
* | | fix deletion of files from filesystem | Mario Vavti | 2016-02-29 | 1 | -1/+1 |
* | | do not process update activity if there is no item to update and simplify cod... | Mario Vavti | 2016-02-29 | 1 | -28/+19 |
* | | revert es-es update. something went wrong. later today I will examine what. | jeroenpraat | 2016-02-29 | 2 | -84/+9767 |
|/ |
|
* | build_sync_packet - no need to sleep after the last sync delivery. | redmatrix | 2016-02-28 | 1 | -1/+5 |
* | stop the PHP warnings from Thomas's buggered sitekey | redmatrix | 2016-02-28 | 1 | -1/+1 |
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-28 | 2 | -9767/+84 |
|\ |
|
| * | update es-es strings | jeroenpraat | 2016-02-28 | 2 | -9767/+84 |
* | | revup | redmatrix | 2016-02-28 | 1 | -1/+1 |
|/ |
|
* | I haven't investigated 'why', but the addition of the router class in https:/... | redmatrix | 2016-02-27 | 1 | -0/+3 |
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-27 | 6 | -2697/+2670 |
|\ |
|
| * | Merge pull request #302 from phellmes/de20160227 | redmatrix | 2016-02-28 | 2 | -1342/+1326 |
| |\ |
|
| | * | Update DE translation strings | phellmes | 2016-02-27 | 2 | -1342/+1326 |
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-02-27 | 2 | -1355/+1339 |
| |\ \ |
|
| | * | | update NL strings | jeroenpraat | 2016-02-27 | 2 | -1355/+1339 |
| | |/ |
|
| * / | missing include | Mario Vavti | 2016-02-27 | 1 | -0/+1 |
| |/ |
|
| * | make attach_delete() return and comment out album rename functionality since ... | Mario Vavti | 2016-02-27 | 2 | -0/+4 |
* | | z_fetch_url and z_post_url returning false | redmatrix | 2016-02-27 | 2 | -3/+3 |
|/ |
|
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-26 | 6 | -57/+39 |
|\ |
|
| * | fix link to photo album and make sure that small photos are not overwritten b... | Mario Vavti | 2016-02-26 | 2 | -4/+4 |
| * | several photo item template fixes | Mario Vavti | 2016-02-26 | 3 | -19/+25 |
| * | some improvement for file activity | Mario Vavti | 2016-02-26 | 1 | -7/+8 |
| * | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-02-26 | 4 | -6/+22 |
| |\ |
|
| * | | get rid of duplicate function | Mario Vavti | 2016-02-26 | 1 | -27/+2 |
* | | | turn timezone aware birthdays into a feature for those who want an uncluttere... | redmatrix | 2016-02-26 | 5 | -1081/+1068 |
* | | | small improvements to profile like activity | redmatrix | 2016-02-25 | 2 | -4/+10 |
| |/
|/| |
|
* | | this reverts ea54987ca4c36 | redmatrix | 2016-02-25 | 1 | -1/+1 |
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-25 | 8 | -10/+18 |
|\| |
|
| * | revert f62ec4132ed571288737423de386054a4cc8b0d5 - allow one self to be added ... | Mario Vavti | 2016-02-25 | 2 | -3/+3 |