Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-20 | 2 | -3/+9 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | 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 | |
* | | | | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-20 | 1 | -1/+1 | |
|\| | | | | | | | ||||||
| * | | | | | | | revup #337 | redmatrix | 2016-04-20 | 1 | -1/+1 | |
* | | | | | | | | missing class instance pointer in Pconfig module upgrade | redmatrix | 2016-04-19 | 1 | -1/+1 | |
* | | | | | | | | remove test files which were committed by accident | redmatrix | 2016-04-19 | 3 | -164/+0 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-19 | 1 | -1/+1 | |
|\| | | | | | | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-04-19 | 2 | -1/+4 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| * | | | | | revup #337 | redmatrix | 2016-04-19 | 1 | -1/+1 | |
* | | | | | | a bit more namespace wrangling | redmatrix | 2016-04-18 | 5 | -9/+9 | |
* | | | | | | module updates | redmatrix | 2016-04-18 | 317 | -26132/+27211 | |
* | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-18 | 2 | -1/+4 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | Merge branch 'master' into dev | Mario Vavti | 2016-04-18 | 1 | -0/+1 | |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | ||||||
| | * | | | | bring back bbcode buttons for mod/editpost | Mario Vavti | 2016-04-18 | 1 | -0/+1 | |
| * | | | | | Merge branch 'master' into dev | Mario Vavti | 2016-04-18 | 1 | -1/+3 | |
| |\| | | | | ||||||
| | * | | | | fix rpost bbcode buttons and autocomplete | Mario Vavti | 2016-04-18 | 1 | -1/+3 | |
| | |/ / / | ||||||
* | / / / | convert all the _well_known service controllers which are a bit touchy when i... | redmatrix | 2016-04-18 | 9 | -228/+253 | |
|/ / / / | ||||||
* | | | | Merge branch 'master' into dev | redmatrix | 2016-04-18 | 5 | -11601/+11629 | |
|\| | | | ||||||
| * | | | revup #337 | redmatrix | 2016-04-18 | 1 | -1/+1 | |
| * | | | Spanish and Dutch strings update | jeroenpraat | 2016-04-17 | 4 | -11600/+11628 | |
* | | | | some issues with GNU-Social's implementation of events in feeds. The summary ... | redmatrix | 2016-04-18 | 1 | -2/+2 | |
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-17 | 20 | -315/+348 | |
|\ \ \ \ | ||||||
| * | | | | Making sure the great new context help works with all thmes and schema's (3rd... | jeroenpraat | 2016-04-18 | 6 | -6/+62 | |
| * | | | | Merge pull request #345 from anaqreon/context-help | redmatrix | 2016-04-18 | 15 | -315/+292 | |
| |\ \ \ \ | ||||||
| | * | | | | Recover lost language translation accommodation and doc/context restructuring | Andrew Manning | 2016-04-17 | 12 | -110/+38 | |
| | * | | | | New help panel that slides in from the top and pushes the content down so it ... | Andrew Manning | 2016-04-17 | 3 | -205/+254 | |
| |/ / / / | ||||||
* | | | | | 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 |