Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | pull in the new object router and a few selected samples for the new controll... | redmatrix | 2016-04-17 | 5 | -1896/+1917 | |
* | | | | | Merge commit '521d404' into dev | redmatrix | 2016-04-17 | 5 | -66/+115 | |
|\ \ \ \ \ | ||||||
| * | | | | | remove the date hack on public feeds which was a temporary fix for an issue l... | redmatrix | 2016-04-17 | 1 | -2/+2 | |
| * | | | | | Convert Channel to new module | redmatrix | 2016-04-15 | 2 | -45/+56 | |
| * | | | | | cleanup and test of new router | redmatrix | 2016-04-15 | 1 | -39/+39 | |
| * | | | | | get init() working with class modules | redmatrix | 2016-04-15 | 2 | -9/+27 | |
| * | | | | | testing the new router/module code | redmatrix | 2016-04-15 | 1 | -1/+21 | |
* | | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| * | | | | | revup #337 | redmatrix | 2016-04-17 | 1 | -1/+1 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-16 | 1 | -1/+1 | |
|\| | | | | |_|/ / |/| | | | ||||||
| * | | | revup #337 | redmatrix | 2016-04-16 | 1 | -1/+1 | |
| | |/ | |/| | ||||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-15 | 0 | -0/+0 | |
|\ \ \ | ||||||
| * | | | Merge branch 'master' into dev | Mario Vavti | 2016-04-15 | 9 | -7360/+7416 | |
| |\| | | ||||||
* | | | | Merge branch 'master' into dev | redmatrix | 2016-04-15 | 5 | -249/+238 | |
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | ||||||
| * | | 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 | |
| |\ \ | ||||||
| * | | | fix some slight crossbrowser rendering issues with jot | Mario Vavti | 2016-04-15 | 3 | -16/+16 | |
* | | | | Merge branch 'master' into dev | redmatrix | 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 | |
| |/ / | ||||||
* / / | filter out a bit more dreport noise - especially for private posts to multipl... | redmatrix | 2016-04-14 | 1 | -0/+11 | |
|/ / | ||||||
* | | 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 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | ||||||
| * | | revup issue #337 | redmatrix | 2016-04-12 | 1 | -1/+2 | |
* | | | remove obsolete jotVideoURL() and jotAudioURL() | redmatrix | 2016-04-11 | 1 | -14/+0 | |
* | | | when saving bookmarks from a post allow choice of bookmark to be saved (defau... | redmatrix | 2016-04-11 | 1 | -1/+10 | |
* | | | move all DB session storage logic to SessionHandler where it belongs | redmatrix | 2016-04-11 | 2 | -4/+10 | |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-11 | 1 | -10/+10 | |
|\ \ \ | ||||||
| * | | | whitespace | Mario Vavti | 2016-04-11 | 1 | -10/+10 | |
* | | | | remove references to ref_session_write - can't use | redmatrix | 2016-04-11 | 1 | -8/+1 | |
|/ / / | ||||||
* | | | Merge branch 'master' into dev | redmatrix | 2016-04-11 | 5 | -3497/+3552 | |
|\| | | ||||||
| * | | revup | redmatrix | 2016-04-11 | 1 | -1/+1 | |
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-04-10 | 4 | -3496/+3550 | |
| |\ \ | ||||||
| | * | | Update Dutch and Spanish | jeroenpraat | 2016-04-10 | 4 | -3496/+3550 |