| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-20 | 1 | -4/+13 | |
| |\| | | | | | | | | | Conflicts: include/zot.php | |||||
| | * | catch the timestamp also | redmatrix | 2015-09-20 | 1 | -1/+1 | |
| | | | ||||||
| | * | remove system flags from channel import packet | redmatrix | 2015-09-20 | 1 | -5/+9 | |
| | | | ||||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-20 | 1 | -1/+1 | |
| |\| | | | | | | | | | Conflicts: include/zot.php | |||||
| | * | we need the xchan record also | redmatrix | 2015-09-20 | 1 | -1/+1 | |
| | | | ||||||
| * | | 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 | 1 | -0/+2 | |
| | | | ||||||
| * | | more work on surviving hub re-installs | redmatrix | 2015-09-18 | 1 | -2/+6 | |
| | | | ||||||
| * | | consolidate zotfinger and webfinger | redmatrix | 2015-09-17 | 1 | -0/+288 | |
| | | | ||||||
| * | | 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 | 1 | -18/+34 | |
| |\| | | |/ |/| | | | | | Conflicts: util/messages.po | |||||
| | * | another tactic to deal with orphan hublocs from re-installs, or at least ↵ | redmatrix | 2015-09-11 | 1 | -18/+34 | |
| | | | | | | | | | allow the descendant channel to survive | |||||
| * | | sync likes | redmatrix | 2015-09-10 | 1 | -0/+3 | |
| | | | ||||||
| * | | 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 | |
| | | | ||||||
| | * | protect from sql injection | redmatrix | 2015-09-02 | 1 | -1/+1 | |
| | | | ||||||
| * | | menu import and sync | redmatrix | 2015-09-08 | 1 | -0/+3 | |
| | | | ||||||
| * | | work on event sync | redmatrix | 2015-09-07 | 1 | -1/+7 | |
| | | | ||||||
| * | | consolidate import_items/sync_items | redmatrix | 2015-09-07 | 1 | -0/+6 | |
| | | | ||||||
| * | | import and sync chatrooms | redmatrix | 2015-09-03 | 1 | -0/+3 | |
| | | | ||||||
| * | | app sync | redmatrix | 2015-09-02 | 1 | -0/+2 | |
| | | | ||||||
| * | | start to modularise the clone import and sync functions | redmatrix | 2015-09-02 | 1 | -0/+6 | |
| | | | ||||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-02 | 1 | -4/+3 | |
| |\| | | | | | | | | | Conflicts: include/zot.php | |||||
| | * | really fix post filtering | zottel | 2015-09-02 | 1 | -2/+2 | |
| | | | ||||||
| * | | initial work on obj import, rename import_profile_photo to ↵ | redmatrix | 2015-09-01 | 1 | -1/+1 | |
| | | | | | | | | | import_xchan_photo to more accurately state its purpose. | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-23 | 1 | -1/+1 | |
| |\| | | | | | | | | | | | | | Conflicts: include/zot.php install/update.php util/messages.po | |||||
| | * | issues with abook sync between hubzilla and red | redmatrix | 2015-08-23 | 1 | -2/+1 | |
| | | | ||||||
| * | | issues encountered with hubzilla DB changes, zot_refresh and item_drop and ↵ | redmatrix | 2015-08-23 | 1 | -3/+3 | |
| | | | | | | | | | hub sync | |||||
| * | | event integration improvements | redmatrix | 2015-08-19 | 1 | -2/+13 | |
| | | | ||||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-14 | 1 | -3/+0 | |
| |\| | | | | | | | | | | | Conflicts: include/zot.php util/messages.po | |||||
| | * | Properly fix which perms get checked for comments, Mike's solution | Alexandre Hannud Abdo | 2015-08-14 | 1 | -14/+3 | |
| | | | ||||||
| | * | revert 36b5f6ac | redmatrix | 2015-08-12 | 1 | -12/+14 | |
| | | | ||||||
| * | | add item validation function | redmatrix | 2015-08-13 | 1 | -19/+8 | |
| | | | ||||||
| * | | reverting 36b5f6ac | redmatrix | 2015-08-12 | 1 | -11/+18 | |
| | | | ||||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-11 | 1 | -1/+11 | |
| |\| | | | | | | | | | | | Conflicts: doc/history.md mod/import.php | |||||
| | * | Require comment perms only for own posts, allow senders to deliver comments ↵ | Alexandre Hannud Abdo | 2015-08-10 | 1 | -1/+11 | |
| | | | | | | | | | using stream perms. | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-23 | 1 | -1/+2 | |
| |\| | | | | | | | | | Conflicts: include/diaspora.php | |||||
| | * | patch to allow theme based widgets | redmatrix | 2015-07-23 | 1 | -1/+2 | |
| | | | ||||||
| * | | typo | redmatrix | 2015-07-19 | 1 | -1/+1 | |
| | | | ||||||
| * | | abook clone sync - change logic to also unset existing cross-project flags ↵ | redmatrix | 2015-07-16 | 1 | -16/+8 | |
| | | | | | | | | | besides just setting them | |||||
| * | | don't including rating stuff from cloned abooks | redmatrix | 2015-07-16 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-15 | 1 | -3/+9 | |
| |\| | | | | | | | | | Conflicts: include/zot.php | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |