| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Updated contextual help in Spanish | Manuel Jiménez Friaza | 2016-05-12 | 13 | -92/+25 |
| * | Merge branch 'dev'1.6 | redmatrix | 2016-05-11 | 1 | -0/+76 |
| |\ |
|
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-11 | 1 | -0/+76 |
| | |\ |
|
| | | * | Merge pull request #377 from anaqreon/chat-notify | redmatrix | 2016-05-12 | 1 | -0/+76 |
| | | |\ |
|
| | | | * | Merge remote-tracking branch 'upstream/dev' into chat-notify | Andrew Manning | 2016-05-11 | 3 | -86/+111 |
| | | | |\ |
|
| | | | * | | Browser notification issued when member enters chat room | Andrew Manning | 2016-05-11 | 1 | -0/+76 |
| | * | | | | move dev pointer past current release | redmatrix | 2016-05-11 | 1 | -1/+1 |
| | |/ / / |
|
| * / / / | push point release | redmatrix | 2016-05-11 | 2 | -1/+50 |
| |/ / / |
|
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-11 | 3 | -86/+111 |
| |\ \ \
| | |/
| |/| |
|
| | * | | Merge pull request #376 from anaqreon/plugin-repo | redmatrix | 2016-05-12 | 2 | -66/+91 |
| | |\ \ |
|
| | | * | | Merge remote-tracking branch 'upstream/dev' into plugin-repo | Andrew Manning | 2016-05-11 | 741 | -42404/+64756 |
| | | |\| |
|
| | | * | | Check if target directories are writable when adding, updating, or removing p... | Andrew Manning | 2016-05-11 | 2 | -66/+91 |
| | * | | | more whitespace | Mario Vavti | 2016-05-11 | 1 | -1/+1 |
| | * | | | whitespace | Mario Vavti | 2016-05-11 | 1 | -19/+19 |
| | | |/
| |/| |
|
| * / | | Ensure that channels can't be created with DAV reserved paths as a redress. S... | redmatrix | 2016-05-11 | 2 | -4/+22 |
| |/ / |
|
| * | | provide repository versions on admin summary page and an upgrade message if y... | redmatrix | 2016-05-10 | 4 | -7/+42 |
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-10 | 1 | -0/+15 |
| |\ \ |
|
| | * | | Merge pull request #375 from anaqreon/plugin-repo | redmatrix | 2016-05-11 | 1 | -0/+15 |
| | |\| |
|
| | | * | Remove debugging lines | Andrew Manning | 2016-05-10 | 1 | -4/+0 |
| | | * | Link plugins in the newly installed addon repo to /addon so they are accessible | Andrew Manning | 2016-05-10 | 1 | -0/+19 |
| * | | | sabre upgrade | redmatrix | 2016-05-10 | 4 | -71/+57 |
| * | | | 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 |
