aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev'1.6redmatrix2016-05-111-0/+76
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-111-0/+76
| |\
| | * Merge pull request #377 from anaqreon/chat-notifyredmatrix2016-05-121-0/+76
| | |\ | | | | | | | | Chat browser notifications
| | | * Merge remote-tracking branch 'upstream/dev' into chat-notifyAndrew Manning2016-05-113-86/+111
| | | |\
| | | * | Browser notification issued when member enters chat roomAndrew Manning2016-05-111-0/+76
| | | | |
| * | | | move dev pointer past current releaseredmatrix2016-05-111-1/+1
| |/ / /
* / / / push point releaseredmatrix2016-05-112-1/+50
|/ / /
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-113-86/+111
|\ \ \ | | |/ | |/|
| * | Merge pull request #376 from anaqreon/plugin-reporedmatrix2016-05-122-66/+91
| |\ \ | | | | | | | | Check if target directories are writable when adding, updating, or removing plugin repos
| | * | Merge remote-tracking branch 'upstream/dev' into plugin-repoAndrew Manning2016-05-11741-42404/+64756
| | |\|
| | * | Check if target directories are writable when adding, updating, or removing ↵Andrew Manning2016-05-112-66/+91
| | | | | | | | | | | | | | | | plugin repos
| * | | more whitespaceMario Vavti2016-05-111-1/+1
| | | |
| * | | whitespaceMario Vavti2016-05-111-19/+19
| | |/ | |/|
* / | Ensure that channels can't be created with DAV reserved paths as a redress. ↵redmatrix2016-05-112-4/+22
|/ / | | | | | | Sabre mentions in several places that trying to change these paths to other strings; while possible - is unsupported and likely to cause problems. So for now, we're stuck with 'principals', 'addressbooks', and 'calendars'. If you already have these redresses on your site, you're basically buggered.
* | provide repository versions on admin summary page and an upgrade message if ↵redmatrix2016-05-104-7/+42
| | | | | | | | you're behind master
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-101-0/+15
|\ \
| * | Merge pull request #375 from anaqreon/plugin-reporedmatrix2016-05-111-0/+15
| |\| | | | | | | Plugin repo
| | * Remove debugging linesAndrew Manning2016-05-101-4/+0
| | |
| | * Link plugins in the newly installed addon repo to /addon so they are accessibleAndrew Manning2016-05-101-0/+19
| | |
* | | sabre upgraderedmatrix2016-05-104-71/+57
| | |
* | | initial sabre upgrade (needs lots of work - to wit: authentication, redo the ↵redmatrix2016-05-10735-42343/+64674
|/ / | | | | | | browser interface, and rework event export/import)
* | Merge pull request #374 from anaqreon/plugin-reporedmatrix2016-05-102-4/+17
|\| | | | | Delete existing repo if the new one has a different URL. Fixed bug th…
| * Delete existing repo if the new one has a different URL. Fixed bug that ↵Andrew Manning2016-05-102-4/+17
|/ | | | could cause repeated installation.
* another public -> pubstreamMario Vavti2016-05-101-1/+1
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-101-2/+2
|\
| * allow delayed publishing of webpagesMario Vavti2016-05-101-2/+2
| |
* | try again with shutdown handler, fix issue #373 (live-pubstream div wasn't ↵redmatrix2016-05-104-5/+17
|/ | | | present
* revert shutdown functionredmatrix2016-05-092-2/+4
|
* more work on diaspora relayredmatrix2016-05-091-0/+5
|
* register shutdown procedureredmatrix2016-05-092-1/+8
|
* Merge pull request #372 from anaqreon/plugin-reporedmatrix2016-05-10128-18/+18604
|\ | | | | Manage addon git repositories via the admin plugins page
| * Merge remote-tracking branch 'upstream/dev' into plugin-repoAndrew Manning2016-05-0930-357/+425
| |\ | |/ |/|
* | Merge pull request #371 from Treer/permissionsredmatrix2016-05-103-11/+20
|\ \ | | | | | | minor cleanup. No functional changes
| * | minor cleanup. No functional changesTreer2016-05-103-11/+20
|/ /
* | if we do not have a layout $layout should be empty not defaultMario Vavti2016-05-091-1/+1
| |
* | remove unused code and whitespaceMario Vavti2016-05-092-11/+1
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-05-094-13/+26
|\ \
| * | prevent recursion in the database driver when debugging is enabled and the ↵redmatrix2016-05-094-13/+26
| | | | | | | | | | | | system config is not yet loaded - caused by calling get_config and making db calls within the logger function; which we then attempt to log...
* | | make editwebpage use status_editor() and fix storing of layout on webpage ↵Mario Vavti2016-05-094-139/+91
| | | | | | | | | | | | creation
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-05-0923-110/+260
|\| |
| * | remove the old IE html5 hack.redmatrix2016-05-081-4/+0
| | |
| * | clean up some cruftredmatrix2016-05-083-52/+6
| | |
| * | convert media embed functions that deal with rewriting specific corporate ↵redmatrix2016-05-082-24/+13
| | | | | | | | | | | | services to addon hooks
| * | Merge pull request #370 from Treer/permissionsredmatrix2016-05-0914-25/+236
| |\ \ | | | | | | | | ACL dialogs: Make the non-ACL-option description more accurate
| | * | Update some modules to use new ACL dialog featureTreer2016-05-089-11/+24
| | | |
| | * | improve non-ACL option description in ACL dialogTreer2016-05-085-14/+212
| |/ /
* | | make editblock use status_editor()Mario Vavti2016-05-074-90/+44
| | |
| | * Fixed some bugs with empty repo name and improved the interface a bit.Andrew Manning2016-05-093-53/+52
| | |
| | * copy-paste errorAndrew Manning2016-05-093-10/+47
| | |
| | * Addon repo is copied to /extend/addon/ when admin presses install. Addon ↵Andrew Manning2016-05-082-7/+110
| | | | | | | | | | | | repos can be removed via GUI.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 19:18:03 +0000