| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-18 | 4 | -9/+10 |
| |\ | |||||
| | * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-18 | 2 | -8/+8 |
| | |\ | |||||
| | | * | Pass in account_id. Required for bulk identity importer. | ken restivo | 2015-11-18 | 2 | -5/+5 |
| | | | | |||||
| | | * | Use provided account_id instead of user's logged in account_id. Necessary ↵ | ken restivo | 2015-11-18 | 1 | -3/+3 |
| | | | | | | | | | | | | | for bulk importer. | ||||
| | * | | wsod viewing photo widget | redmatrix | 2015-11-18 | 2 | -1/+2 |
| | |/ | |||||
| * | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-18 | 3 | -3/+25 |
| |\| | |||||
| | * | fix admin plugin hooks | redmatrix | 2015-11-17 | 3 | -3/+25 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-18 | 10 | -19/+23 |
| |\| | |||||
| | * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-17 | 13 | -230/+599 |
| | |\ | |||||
| | | * | whitespace | Mario Vavti | 2015-11-17 | 1 | -1/+1 |
| | | | | |||||
| | | * | more css fixes | Mario Vavti | 2015-11-17 | 6 | -16/+14 |
| | | | | |||||
| | * | | photo album widget permissions issue | redmatrix | 2015-11-17 | 4 | -3/+9 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-17 | 14 | -233/+622 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | missing closing " for src attribute | Mario Vavti | 2015-11-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | update bootstrap lib 3.3.4 -> 3.3.5 | Mario Vavti | 2015-11-17 | 6 | -195/+568 |
| | | | | |||||
| | * | | 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 ↵ | redmatrix | 2015-11-16 | 4 | -16/+34 |
| | | | | | | | | | missing template for XML | ||||
| * | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-16 | 10 | -26/+51 |
| |\| | |||||
| | * | tag_deliver of an edit to an already uplinked item wasn't resetting ↵ | redmatrix | 2015-11-15 | 1 | -1/+4 |
| | | | | | | | | | permissions and ownership bits before starting delivery chain on the edit. | ||||
| | * | allow plugins to also log to a different named logfile and also alter the ↵ | redmatrix | 2015-11-15 | 1 | -1/+1 |
| | | | | | | | | | log message | ||||
| | * | add logger plugin hook | redmatrix | 2015-11-15 | 1 | -0/+16 |
| | | | |||||
| | * | permission issues editing wall-to-wall posts | redmatrix | 2015-11-15 | 3 | -9/+19 |
| | | | |||||
| | * | issue with dead hub detection | redmatrix | 2015-11-15 | 1 | -1/+1 |
| | | | |||||
| | * | revert html in markdown for posts, but trim the input before processing the ↵ | redmatrix | 2015-11-15 | 2 | -2/+2 |
| | | | | | | | | | markdown | ||||
| | * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-15 | 7 | -1138/+1160 |
| | |\ | |||||
| | * | | issues connecting to local forum | redmatrix | 2015-11-15 | 3 | -13/+9 |
| | | | | |||||
| * | | | 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 |
| | |/ | |||||
| * | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-14 | 4 | -533/+543 |
| |\| | |||||
| | * | superblock enhancements | redmatrix | 2015-11-13 | 4 | -533/+543 |
| | | | |||||
| * | | 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 | 16 | -10/+132 |
| |\| | |||||
| | * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-11-12 | 3 | -4/+4 |
| | |\ | |||||
| | | * | Add note about base64 and urlencode. | ken restivo | 2015-11-12 | 1 | -2/+2 |
| | | | | |||||
| | | * | Fix spelling of documentation. | ken restivo | 2015-11-12 | 2 | -2/+2 |
| | | | | |||||
| | * | | really basic photo album widget for content regions | redmatrix | 2015-11-12 | 3 | -0/+87 |
| | |/ | |||||
| | * | allow pdl content | redmatrix | 2015-11-12 | 4 | -1/+23 |
| | | | |||||
| | * | issue #154 | redmatrix | 2015-11-12 | 1 | -0/+11 |
| | | | |||||
| | * | small fixes, removed old unused database row, and log more prominently a ↵ | redmatrix | 2015-11-12 | 3 | -2/+3 |
| | | | | | | | | | missing directory server URL | ||||
| | * | Small update to Bluegrid and generic-content-wrapper-styled to dreport | jeroenpraat | 2015-11-12 | 2 | -3/+4 |
| | | | |||||
| * | | 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 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-12 | 5 | -10/+34 |
| |\| | |||||
| | * | will also need api doco | redmatrix | 2015-11-11 | 2 | -1/+24 |
| | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |