Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | revup | redmatrix | 2016-04-28 | 1 | -1/+1 |
* | revup | redmatrix | 2016-04-27 | 1 | -1/+1 |
* | revup | redmatrix | 2016-04-26 | 1 | -1/+1 |
* | revup | redmatrix | 2016-04-25 | 1 | -1/+1 |
* | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-04-23 | 2 | -7224/+7467 |
|\ | |||||
| * | Merge pull request #352 from phellmes/de20160422 | redmatrix | 2016-04-23 | 2 | -7224/+7467 |
| |\ | |||||
| | * | Update DE translation strings | phellmes | 2016-04-22 | 2 | -7224/+7467 |
| |/ | |||||
* / | revup | redmatrix | 2016-04-23 | 1 | -1/+1 |
|/ | |||||
* | revup | redmatrix | 2016-04-22 | 2 | -5131/+5301 |
* | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-04-21 | 1 | -12/+12 |
|\ | |||||
| * | Merge pull request #349 from HaakonME/master | git-marijus | 2016-04-21 | 1 | -12/+12 |
| |\ | |||||
| | * | Updated Hubzilla on OpenShift deploy script to include unofficial repos by ap... | Haakon Meland Eriksen | 2016-04-19 | 1 | -19/+19 |
| | * | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-04-18 | 7 | -11602/+11633 |
| | |\ | |||||
| | * \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2016-04-16 | 1 | -1/+1 |
| | |\ \ | |||||
| | * | | | Commented out extra repos except official addons | Haakon Meland Eriksen | 2016-04-16 | 1 | -12/+12 |
* | | | | | revup #337 | redmatrix | 2016-04-21 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | some crossbrowser rendering work on the comment box | Mario Vavti | 2016-04-20 | 1 | -1/+3 |
* | | | | Use stopImmidiatePropagation() only if we are in a list to not interfere with... | Mario Vavti | 2016-04-20 | 1 | -2/+6 |
* | | | | revup #337 | redmatrix | 2016-04-20 | 1 | -1/+1 |
* | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-04-19 | 2 | -1/+4 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | bring back bbcode buttons for mod/editpost | Mario Vavti | 2016-04-18 | 1 | -0/+1 |
| * | | | fix rpost bbcode buttons and autocomplete | Mario Vavti | 2016-04-18 | 1 | -1/+3 |
* | | | | revup #337 | redmatrix | 2016-04-19 | 1 | -1/+1 |
|/ / / | |||||
* | | | revup #337 | redmatrix | 2016-04-18 | 1 | -1/+1 |
* | | | Spanish and Dutch strings update | jeroenpraat | 2016-04-17 | 4 | -11600/+11628 |
* | | | revup #337 | redmatrix | 2016-04-17 | 1 | -1/+1 |
| |/ |/| | |||||
* | | revup #337 | redmatrix | 2016-04-16 | 1 | -1/+1 |
|/ | |||||
* | nav: move js and css out of template, provide a help button in the panel on s... | Mario Vavti | 2016-04-15 | 3 | -233/+222 |
* | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-04-15 | 4 | -7111/+7178 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-04-15 | 2 | -3091/+3147 |
| |\ | |||||
| | * | Merge pull request #343 from wave72/master | Wave | 2016-04-15 | 2 | -3091/+3147 |
| | |\ | |||||
| | | * | Merge branch 'redmatrix-master' | Paolo Tacconi | 2016-04-15 | 532 | -91509/+104813 |
| | | |\ | |||||
| | | | * | Resolved conflict in view/it/hstrings.php | Paolo Tacconi | 2016-04-15 | 532 | -91509/+104813 |
| | | |/| | | | |/ | | |/| | |||||
| | | * | Updated Italian strings | Paolo Tacconi | 2016-04-15 | 2 | -3091/+3147 |
| * | | | revup + strings #337 | redmatrix | 2016-04-15 | 2 | -4020/+4031 |
| |/ / | |||||
* / / | fix some slight crossbrowser rendering issues with jot | Mario Vavti | 2016-04-15 | 3 | -16/+16 |
|/ / | |||||
* | | commit 1.41.4 | redmatrix | 2016-04-14 | 2 | -1/+34 |
* | | provide general purpose verification class, remove include/session.php (no lo... | redmatrix | 2016-04-14 | 4 | -187/+48 |
* | | Merge branch 'master' into dev | redmatrix | 2016-04-14 | 1 | -2/+1 |
|\ \ | |||||
| * | | revup #337 | redmatrix | 2016-04-14 | 1 | -2/+1 |
* | | | fix marked bug in code | redmatrix | 2016-04-13 | 1 | -2/+1 |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-13 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | some bbcode autocomplete refinement for edit webpage | Mario Vavti | 2016-04-13 | 1 | -2/+2 |
* | | | | refactor the js detection into a checkjs class which is only enabled on deman... | redmatrix | 2016-04-13 | 5 | -19/+50 |
* | | | | Merge branch 'master' into dev | redmatrix | 2016-04-13 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | issue #337 | redmatrix | 2016-04-13 | 1 | -1/+1 |
* | | | | reverse the logic of the jsenabled setting so that sessions without js are pe... | redmatrix | 2016-04-12 | 8 | -26/+26 |
| |/ / |/| | | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-12 | 1 | -2/+3 |
|\ \ \ | |||||
| * | | | improve bbco autocomplete to not execute listNewLineAutocomplete() many times... | Mario Vavti | 2016-04-12 | 1 | -2/+3 |
* | | | | Important work on the sessionhandler to maintain compatibility with php7 and ... | redmatrix | 2016-04-12 | 3 | -58/+65 |
|\ \ \ \ | |/ / / |/| / / | |/ / |