Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-20 | 1 | -0/+46 |
|\ | |||||
| * | initial checkin delivery report class | redmatrix | 2015-09-20 | 1 | -0/+46 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-19 | 1 | -0/+1 |
|\| | | | | | | | | | Conflicts: include/zot.php | ||||
| * | clone new connection requests | redmatrix | 2015-09-19 | 1 | -18/+19 |
| | | |||||
* | | clone new connections | redmatrix | 2015-09-19 | 1 | -17/+18 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-18 | 1 | -1/+1 |
|\| | |||||
| * | include site identitfier on redmatrix delivery reports also | redmatrix | 2015-09-18 | 1 | -0/+2 |
| | | |||||
* | | add reporting site to delivery report | redmatrix | 2015-09-18 | 2 | -0/+5 |
| | | |||||
* | | more work on surviving hub re-installs | redmatrix | 2015-09-18 | 1 | -2/+6 |
| | | |||||
* | | change photo permissions when attach permissions are changed through ↵ | redmatrix | 2015-09-18 | 1 | -1/+11 |
| | | | | | | | | mod/filestorage, and fix lockview for photos. | ||||
* | | start hooking in the new webfinger/zot merged discovery | redmatrix | 2015-09-17 | 1 | -6/+10 |
| | | |||||
* | | consolidate zotfinger and webfinger | redmatrix | 2015-09-17 | 2 | -2/+290 |
| | | |||||
* | | change matrix to grid, begin webfinger optimisation | redmatrix | 2015-09-16 | 2 | -4/+4 |
| | | |||||
* | | nit | redmatrix | 2015-09-14 | 1 | -1/+1 |
| | | |||||
* | | don't deliver to dead hubs | redmatrix | 2015-09-14 | 2 | -27/+18 |
| | | |||||
* | | site checking stuff | redmatrix | 2015-09-14 | 3 | -3/+74 |
| | | |||||
* | | remove xchan_instance_url - it needs to be an abook field, not an xchan field | redmatrix | 2015-09-14 | 1 | -14/+0 |
| | | |||||
* | | ping site function (taken from admin/hubloc) | redmatrix | 2015-09-13 | 1 | -1/+26 |
| | | |||||
* | | check for empty word after trim | redmatrix | 2015-09-12 | 1 | -0/+4 |
| | | |||||
* | | Merge pull request #38 from MicMee/master | redmatrix | 2015-09-12 | 1 | -3/+3 |
|\ \ | | | | | | | ensure that living sites are marked as alive | ||||
| * | | ensure that living sites are marked as alive | Michael Meer | 2015-09-11 | 1 | -3/+3 |
| | | | |||||
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-11 | 1 | -1/+4 |
|\ \ \ | | |/ | |/| | |||||
| * | | log the remote message if there was one | redmatrix | 2015-09-11 | 1 | -1/+4 |
| | | | |||||
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-11 | 2 | -20/+36 |
|\| | | |/ |/| | | | | | Conflicts: util/messages.po | ||||
| * | another tactic to deal with orphan hublocs from re-installs, or at least ↵ | redmatrix | 2015-09-11 | 2 | -20/+36 |
| | | | | | | | | allow the descendant channel to survive | ||||
* | | sync likes | redmatrix | 2015-09-10 | 2 | -0/+40 |
| | | |||||
* | | provide remote delivery report at logger_debug level | redmatrix | 2015-09-10 | 1 | -2/+2 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-10 | 1 | -3/+13 |
|\| | | | | | | | | | Conflicts: include/zot.php | ||||
| * | zot_refresh: always try the hubloc pointed to by xchan_addr first | redmatrix | 2015-09-10 | 1 | -3/+12 |
| | | |||||
| * | export TERM_FILE when mirroring | redmatrix | 2015-09-08 | 2 | -1/+7 |
| | | |||||
| * | add sync packets for menus | redmatrix | 2015-09-08 | 1 | -0/+11 |
| | | |||||
* | | ensure connections have a name | redmatrix | 2015-09-10 | 1 | -0/+2 |
| | | |||||
* | | don't auto-open the editor in forum mode. Save the forum selection text ↵ | redmatrix | 2015-09-09 | 1 | -0/+1 |
| | | | | | | | | until we open it. | ||||
* | | major changes to "forum mode" on the network/matrix page | redmatrix | 2015-09-09 | 1 | -1/+1 |
| | | |||||
* | | slight hack to improve public forum detection in the forum widget | redmatrix | 2015-09-09 | 2 | -1/+4 |
| | | |||||
* | | preserve code blocks on item import if channel has code rights. When ↵ | redmatrix | 2015-09-08 | 3 | -3/+81 |
| | | | | | | | | | | | | importing the channel itself, turn code access off unless this is the admin. | ||||
* | | move mod_admin to Comanche finally | redmatrix | 2015-09-08 | 1 | -0/+59 |
| | | |||||
* | | export TERM_FILE when mirroring | redmatrix | 2015-09-08 | 1 | -2/+7 |
| | | |||||
* | | debugging menu sync | redmatrix | 2015-09-08 | 2 | -2/+3 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-08 | 1 | -1/+10 |
|\| | | | | | | | | | Conflicts: include/identity.php | ||||
| * | menu export | redmatrix | 2015-09-08 | 1 | -1/+11 |
| | | |||||
* | | menu import and sync | redmatrix | 2015-09-08 | 5 | -2/+154 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-07 | 1 | -0/+19 |
|\| | |||||
| * | export events | redmatrix | 2015-09-07 | 1 | -0/+19 |
| | | |||||
* | | work on event sync | redmatrix | 2015-09-07 | 2 | -1/+82 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-07 | 1 | -1/+15 |
|\| | |||||
| * | create event sync packets | redmatrix | 2015-09-07 | 1 | -0/+14 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-07 | 1 | -4/+6 |
|\| | | | | | | | | | | | | | Conflicts: include/items.php view/it/messages.po view/it/strings.php | ||||
| * | fix postgres zotfeed | Habeas Codice | 2015-09-07 | 1 | -4/+6 |
| | | |||||
* | | consolidate import_items/sync_items | redmatrix | 2015-09-07 | 3 | -3/+83 |
| | |