| Commit message (Expand) | Author | Age | Files | Lines |
* | provide a mechanism for global template values (macro replacements that are a... | redmatrix | 2016-08-24 | 1 | -0/+6 |
* | revert cover photo changes | redmatrix | 2016-08-24 | 1 | -20/+8 |
* | allow changing the server role - as well as configuring any of the three opti... | redmatrix | 2016-08-23 | 4 | -5/+30 |
* | cover photo: adjustments to display the entire photo on manual scrollback (pa... | redmatrix | 2016-08-23 | 1 | -1/+2 |
* | several cover photo widget enhancements: | redmatrix | 2016-08-23 | 1 | -8/+19 |
* | include port in pdo url when host is 'localhost' | redmatrix | 2016-08-23 | 1 | -0/+2 |
* | change default server role | redmatrix | 2016-08-22 | 1 | -2/+2 |
* | optional server role compatibility checks for plugins | redmatrix | 2016-08-22 | 4 | -2/+18 |
* | public forum fallback checking (when custom/expert permissions are applied) w... | redmatrix | 2016-08-22 | 1 | -5/+4 |
* | doco updates | redmatrix | 2016-08-22 | 4 | -2/+155 |
* | server role management, part 1 | redmatrix | 2016-08-22 | 3 | -12/+37 |
* | remove references to tinymce which were causing console errors | redmatrix | 2016-08-21 | 2 | -85/+4 |
* | make zid() do the right things when confronted with url fragments | redmatrix | 2016-08-21 | 1 | -0/+10 |
* | Merge branch 'git-marijus-dev' into dev | redmatrix | 2016-08-21 | 10 | -103/+125 |
|\ |
|
| * | Merge branch 'dev' of https://github.com/git-marijus/hubzilla into git-mariju... | redmatrix | 2016-08-21 | 10 | -103/+125 |
|/| |
|
| * | move jotnets to jot and some cleanup (mostly whitespace) | Mario Vavti | 2016-08-21 | 10 | -103/+124 |
* | | issue #496 | redmatrix | 2016-08-21 | 2 | -1/+3 |
* | | Merge branch 'zp' into dev | redmatrix | 2016-08-19 | 1 | -4/+31 |
|\ \ |
|
| * | | block backdoor delivery of bulk imported items | redmatrix | 2016-08-19 | 1 | -4/+31 |
| |/ |
|
* / | string update | redmatrix | 2016-08-19 | 1 | -3697/+3724 |
|/ |
|
* | remove insecure repository warning. | redmatrix | 2016-08-18 | 4 | -31/+31 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-17 | 2 | -6106/+6089 |
|\ |
|
| * | Merge pull request #492 from wave72/dev | hubzilla | 2016-08-17 | 2 | -6106/+6089 |
| |\ |
|
| | * | Updated Italian strings | Wave72 | 2016-08-17 | 2 | -6106/+6089 |
| |/ |
|
* / | import anomaly | redmatrix | 2016-08-17 | 1 | -4/+6 |
|/ |
|
* | don't set session theme unless logged in. | redmatrix | 2016-08-16 | 3 | -1/+11 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-16 | 4 | -43/+30 |
|\ |
|
| * | Merge pull request #491 from mjfriaza/dev | hubzilla | 2016-08-17 | 1 | -0/+12 |
| |\ |
|
| | * | Add Spanish context help settings/features page | Manuel Jiménez Friaza | 2016-08-16 | 1 | -0/+12 |
| |/ |
|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-16 | 5 | -35/+83 |
| |\ |
|
| * | | rename limited -> custom | Mario Vavti | 2016-08-16 | 3 | -17/+17 |
| * | | remove unneeded function | Mario Vavti | 2016-08-16 | 1 | -26/+1 |
* | | | get rid of ugly code construct | redmatrix | 2016-08-16 | 1 | -8/+1 |
| |/
|/| |
|
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-15 | 1 | -14/+1 |
|\| |
|
| * | only check settings-form for dirty state and remove redundant javascript | Mario Vavti | 2016-08-16 | 1 | -14/+1 |
* | | move schema settings into the display settings main so we can set theme:schem... | redmatrix | 2016-08-15 | 5 | -35/+83 |
|/ |
|
* | Use double quotes for strings passed via templates to javascript. Some transl... | redmatrix | 2016-08-15 | 1 | -5/+5 |
* | Merge pull request #487 from git-marijus/dev | hubzilla | 2016-08-16 | 3 | -128/+79 |
|\ |
|
| * | provide group options serverside and minor cleanup | Mario Vavti | 2016-08-15 | 3 | -124/+30 |
| * | implement groups in the acl select. please notice that selecting *custom sele... | Mario Vavti | 2016-08-15 | 1 | -17/+62 |
* | | fix attached photo/file permissions on clones | redmatrix | 2016-08-15 | 3 | -134/+140 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-15 | 2 | -47/+7 |
|\ \ |
|
| * \ | Merge pull request #488 from einervonvielen/dev_homeinstall_merge_master-dev | hubzilla | 2016-08-16 | 2 | -47/+7 |
| |\ \
| | |/
| |/| |
|
| | * | Merge dev with last changes of homeinstall script in master | Einer von Vielen | 2016-08-15 | 2 | -47/+7 |
| |/ |
|
* | | s/$rr/$rv/ | redmatrix | 2016-08-14 | 1 | -22/+22 |
* | | event_store_event hook | redmatrix | 2016-08-14 | 3 | -0/+21 |
|/ |
|
* | Merge pull request #484 from anaqreon/settings-context | hubzilla | 2016-08-15 | 2 | -1/+13 |
|\ |
|
| * | Context help for settings/features page | Andrew Manning | 2016-08-14 | 2 | -1/+13 |
|/ |
|
* | Merge pull request #482 from anaqreon/nocomment | hubzilla | 2016-08-14 | 5 | -0/+35 |
|\ |
|
| * | Change text for submenu on small screens to be static toggle statement | Andrew Manning | 2016-08-14 | 2 | -1/+2 |