| Commit message (Expand) | Author | Age | Files | Lines |
* | initial sabre upgrade (needs lots of work - to wit: authentication, redo the ... | redmatrix | 2016-05-10 | 735 | -42343/+64674 |
* | Merge pull request #374 from anaqreon/plugin-repo | redmatrix | 2016-05-10 | 2 | -4/+17 |
|\ |
|
| * | Delete existing repo if the new one has a different URL. Fixed bug that could... | Andrew Manning | 2016-05-10 | 2 | -4/+17 |
|/ |
|
* | another public -> pubstream | Mario Vavti | 2016-05-10 | 1 | -1/+1 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-10 | 1 | -2/+2 |
|\ |
|
| * | allow delayed publishing of webpages | Mario Vavti | 2016-05-10 | 1 | -2/+2 |
* | | try again with shutdown handler, fix issue #373 (live-pubstream div wasn't pr... | redmatrix | 2016-05-10 | 4 | -5/+17 |
|/ |
|
* | revert shutdown function | redmatrix | 2016-05-09 | 2 | -2/+4 |
* | more work on diaspora relay | redmatrix | 2016-05-09 | 1 | -0/+5 |
* | register shutdown procedure | redmatrix | 2016-05-09 | 2 | -1/+8 |
* | Merge pull request #372 from anaqreon/plugin-repo | redmatrix | 2016-05-10 | 128 | -18/+18604 |
|\ |
|
| * | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-09 | 30 | -357/+425 |
| |\
| |/
|/| |
|
* | | Merge pull request #371 from Treer/permissions | redmatrix | 2016-05-10 | 3 | -11/+20 |
|\ \ |
|
| * | | minor cleanup. No functional changes | Treer | 2016-05-10 | 3 | -11/+20 |
|/ / |
|
* | | if we do not have a layout $layout should be empty not default | Mario Vavti | 2016-05-09 | 1 | -1/+1 |
* | | remove unused code and whitespace | Mario Vavti | 2016-05-09 | 2 | -11/+1 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-05-09 | 4 | -13/+26 |
|\ \ |
|
| * | | prevent recursion in the database driver when debugging is enabled and the sy... | redmatrix | 2016-05-09 | 4 | -13/+26 |
* | | | make editwebpage use status_editor() and fix storing of layout on webpage cre... | Mario Vavti | 2016-05-09 | 4 | -139/+91 |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-05-09 | 23 | -110/+260 |
|\| | |
|
| * | | remove the old IE html5 hack. | redmatrix | 2016-05-08 | 1 | -4/+0 |
| * | | clean up some cruft | redmatrix | 2016-05-08 | 3 | -52/+6 |
| * | | convert media embed functions that deal with rewriting specific corporate ser... | redmatrix | 2016-05-08 | 2 | -24/+13 |
| * | | Merge pull request #370 from Treer/permissions | redmatrix | 2016-05-09 | 14 | -25/+236 |
| |\ \ |
|
| | * | | Update some modules to use new ACL dialog feature | Treer | 2016-05-08 | 9 | -11/+24 |
| | * | | improve non-ACL option description in ACL dialog | Treer | 2016-05-08 | 5 | -14/+212 |
| |/ / |
|
* | | | make editblock use status_editor() | Mario Vavti | 2016-05-07 | 4 | -90/+44 |
| | * | Fixed some bugs with empty repo name and improved the interface a bit. | Andrew Manning | 2016-05-09 | 3 | -53/+52 |
| | * | copy-paste error | Andrew Manning | 2016-05-09 | 3 | -10/+47 |
| | * | Addon repo is copied to /extend/addon/ when admin presses install. Addon repo... | Andrew Manning | 2016-05-08 | 2 | -7/+110 |
| | * | Custom addon repo name option added. | Andrew Manning | 2016-05-08 | 4 | -21/+72 |
| | * | Existing addon repos are listed on plugin page with controls for updating, re... | Andrew Manning | 2016-05-07 | 2 | -4/+61 |
| | * | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-07 | 1 | -3/+3 |
| | |\
| | |/
| |/| |
|
| * | | SDAV is already absolute | redmatrix | 2016-05-07 | 1 | -3/+3 |
| | * | New plugin repo cloned using new GitRepo class. Readme and info displayed in ... | Andrew Manning | 2016-05-07 | 5 | -160/+170 |
| | * | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-07 | 2 | -2/+2 |
| | |\
| | |/
| |/| |
|
| * | | Merge pull request #369 from Treer/fontawesome | git-marijus | 2016-05-06 | 2 | -2/+2 |
|/| | |
|
| * | | update 2 fontawesome icons | Treer | 2016-05-06 | 2 | -2/+2 |
|/ / |
|
| * | Progress implementing GitRepo class in Zotlabs/Storage | Andrew Manning | 2016-05-07 | 1 | -9/+96 |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into plugin-repo | Andrew Manning | 2016-05-06 | 9 | -1994/+1999 |
| |\
| |/
|/| |
|
* | | use section-content-info-wrapper class for info text | Mario Vavti | 2016-05-06 | 2 | -11/+2 |
* | | use darker background colour only for searchbar | Mario Vavti | 2016-05-06 | 2 | -11/+24 |
* | | missed one other place where we called comanche outside the page build | redmatrix | 2016-05-06 | 2 | -1542/+1514 |
* | | objectify comanche | redmatrix | 2016-05-05 | 5 | -434/+459 |
* | | comments | redmatrix | 2016-05-05 | 1 | -0/+4 |
| * | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-05 | 7 | -26/+82 |
| |\
| |/
|/| |
|
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-05 | 5 | -25/+41 |
|\ \ |
|
| * \ | Merge pull request #368 from Treer/permissions | redmatrix | 2016-05-06 | 5 | -25/+41 |
| |\ \ |
|
| | * | | Unify permissions dialog for network posts, channel posts, and remote posts | Treer | 2016-05-06 | 5 | -25/+41 |
| |/ / |
|
* / / | - Setup: check php version (5.4 required) | redmatrix | 2016-05-05 | 2 | -1/+41 |
|/ / |
|