| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-03-02 | 28 | -1505/+1764 |
| |\ | |||||
| | * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-01 | 12 | -52/+57 |
| | |\ | |||||
| | | * | 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 | ||||
| | | | | | * | 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 |
| | | | | | |||||
| | | * | | Small fix for deleted forum channels showing in the forum widget (had this ↵ | jeroenpraat | 2016-03-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | after migration from RM on 1 or 2 channels) | ||||
| | * | | | Allow configuration of the display order of profile fields. This is an ↵ | redmatrix | 2016-03-01 | 2 | -9/+83 |
| | | | | | | | | | | | | | | | | | important piece of a more general profile configuration framework which will eventually be accessible via the admin page. | ||||
| | * | | | revup | redmatrix | 2016-03-01 | 1 | -1/+1 |
| | | |/ | |/| | |||||
| | * | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-29 | 9 | -92/+9774 |
| | |\| | |||||
| | | * | 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 ↵ | Mario Vavti | 2016-02-29 | 1 | -28/+19 |
| | | | | | | | | | | | | | code a little | ||||
| | | * | revert es-es update. something went wrong. later today I will examine what. | jeroenpraat | 2016-02-29 | 2 | -84/+9767 |
| | | | | |||||
| | * | | abconfig | redmatrix | 2016-02-29 | 10 | -10/+187 |
| | | | | |||||
| | * | | revup | redmatrix | 2016-02-29 | 1 | -1/+1 |
| | |/ | |||||
| | * | 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 |
| | |/ | |||||
| * | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-02-28 | 5 | -1345/+1332 |
| |\| | |||||
| | * | I haven't investigated 'why', but the addition of the router class in ↵ | redmatrix | 2016-02-27 | 1 | -0/+3 |
| | | | | | | | | | https://github.com/redmatrix/hubzilla/commit/1db3409f36f408bfc49816e1fab3df4b53b8f19e resulted in the setup global variable $install_wizard_pass to not get initiated at the global level when the setup module file was included. This corrects the situation and makes install work but without explaining why the variable wasn't instantiated in the first place. This may be important - if any other modules use global variables internally. I don't believe that any do, but the behaviour needs to be resolved or documented. | ||||
| | * | 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 | ||||
| | | | * | Update DE translation strings | phellmes | 2016-02-27 | 2 | -1342/+1326 |
| | | | | | |||||
| | * | | | z_fetch_url and z_post_url returning false | redmatrix | 2016-02-27 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-02-27 | 4 | -1355/+1344 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | 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 |
| | |/ | | | | | | | this is not supported by the backend at the moment. | ||||
| * | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-02-27 | 25 | -1160/+1170 |
| |\| | |||||
| | * | 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 ↵ | Mario Vavti | 2016-02-26 | 2 | -4/+4 |
| | | | | | | | | | | | | | by body text. | ||||
| | | * | 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 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |