| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-06 | 181 | -13477/+15456 |
| |\ | |||||
| | * | add missing smarty files | Mario Vavti | 2015-12-06 | 67 | -0/+5003 |
| | | | |||||
| | * | update smarty to 3.1.28-dev which fixes a bug where changes in a template ↵ | Mario Vavti | 2015-12-06 | 89 | -6944/+5412 |
| | | | | | | | | | are only visible on the second pageload which is annoying for developing | ||||
| | * | remove more unneeded smarty files | Mario Vavti | 2015-12-06 | 23 | -4430/+0 |
| | | | |||||
| | * | remove composer release notes | Mario Vavti | 2015-12-06 | 1 | -29/+0 |
| | | | |||||
| | * | update smarty library - seems to bring some performance improvement | Mario Vavti | 2015-12-06 | 86 | -9403/+12370 |
| | | | |||||
| | * | fix css issue in directory | Mario Vavti | 2015-12-06 | 3 | -6/+6 |
| | | | |||||
| * | | version | redmatrix | 2015-12-06 | 1 | -1/+1 |
| | | | |||||
| * | | change text "Red developers" in update failed email | redmatrix | 2015-12-05 | 1 | -1/+1 |
| | | | |||||
| * | | move the instance stuff to abook where it belongs | redmatrix | 2015-12-05 | 4 | -2/+11 |
| |/ | |||||
| * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-05 | 5 | -7004/+7203 |
| |\ | |||||
| | * | Merge pull request #209 from HaakonME/master | redmatrix | 2015-12-06 | 3 | -7003/+7198 |
| | |\ | | | | | | | Updated Norwegian strings for Hubzilla 1.0 | ||||
| | | * | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-12-05 | 7 | -13/+17 |
| | | |\ | | |/ | |/| | |||||
| | * | | Merge pull request #208 from anaqreon/mail-text-height | redmatrix | 2015-12-05 | 1 | -0/+4 |
| | |\ \ | | | | | | | | | Enlarge the default mail composition text area. | ||||
| | | * | | Enlarge the default mail composition text area. | Andrew Manning | 2015-12-04 | 1 | -0/+4 |
| | |/ / | |||||
| | * | | fix rendering of unseen forum posts count | Mario Vavti | 2015-12-04 | 1 | -1/+1 |
| | | | | |||||
| | | * | Updated Norwegian translation | Haakon Meland Eriksen | 2015-12-05 | 2 | -7002/+7197 |
| | | | | |||||
| | | * | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-12-03 | 19 | -13331/+13365 |
| | | |\ | |||||
| | | * \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-12-01 | 11 | -6759/+6830 |
| | | |\ \ | |||||
| | | * \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-29 | 7 | -30/+51 |
| | | |\ \ \ | |||||
| | | * | | | | Resolving merge conflict | Haakon Meland Eriksen | 2015-11-29 | 9 | -302/+49 |
| | | | | | | | |||||
| | | * | | | | My version of jot.tpl | Haakon Meland Eriksen | 2015-11-28 | 1 | -49/+58 |
| | | | | | | | |||||
| | | * | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-28 | 27 | -4462/+4962 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/datetime.php include/text.php mod/events.php version.inc view/css/mod_events.css view/theme/redbasic/css/style.css view/tpl/event_head.tpl view/tpl/events-js.tpl view/tpl/jot.tpl | ||||
| | | * | | | | | Removed my version of jot.tpl | Haakon Meland Eriksen | 2015-11-28 | 31 | -2752/+2496 |
| | | | | | | | | |||||
| | | * | | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-24 | 9 | -42/+96 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-23 | 7 | -5/+59 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | Documenting the need to change database server address from 127.0.0.1 to ↵ | Haakon Meland Eriksen | 2015-11-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | localhost when installing Hubzilla on OpenShift with the deploy script | ||||
| | | * | | | | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-22 | 4 | -346/+886 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-21 | 4 | -2/+11 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-21 | 3 | -6/+25 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-21 | 9 | -27/+75 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | Space between Preview and Submit in jot.tpl | Haakon Meland Eriksen | 2015-11-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Space between Preview and Submit in jot.tpl | Haakon Meland Eriksen | 2015-11-20 | 1 | -0/+2 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-20 | 20 | -4575/+4735 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | 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 | 13 | -13/+65 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-19 | 6 | -3/+19 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-19 | 2 | -4/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-19 | 26 | -5770/+16731 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-18 | 4 | -9/+10 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-18 | 3 | -3/+25 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-18 | 10 | -19/+23 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-17 | 14 | -233/+622 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-16 | 10 | -26/+51 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-15 | 7 | -1138/+1160 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-11-14 | 4 | -533/+543 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |