| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | ||||
| | * | fix for empty recip array resulting from a mangled xchan | redmatrix | 2015-07-15 | 1 | -5/+8 |
| | | | |||||
| * | | more clone sync issues across projects | redmatrix | 2015-07-15 | 1 | -5/+5 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-15 | 1 | -2/+7 |
| |\| | |||||
| | * | clone sync fixes across red/hz | redmatrix | 2015-07-15 | 1 | -2/+7 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-14 | 1 | -1/+3 |
| |\| | | | | | | | | | Conflicts: mod/connedit.php | ||||
| | * | coverup and ignore the illegal string offset message that some sites have ↵ | redmatrix | 2015-07-14 | 1 | -1/+3 |
| | | | | | | | | | been reporting. This does not fix it. A fix would be to examine the data that has been received and find out why it is mangled and trace this back to where it was mangled. | ||||
| * | | incorrect value for hubloc_deleted in zot_get_hublocs() query | redmatrix | 2015-07-07 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-02 | 1 | -1/+0 |
| |\| | | | | | | | | | Conflicts: include/zot.php | ||||
| | * | a few clone sync fixes as well as some work on hubzilla clone sync back to ↵ | redmatrix | 2015-07-02 | 1 | -0/+22 |
| | | | | | | | | | redmatrix | ||||
| * | | sync abook entries from redmatrix | redmatrix | 2015-07-02 | 1 | -0/+21 |
| |\| | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php | ||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-28 | 1 | -14/+32 |
| |\| | | | | | | | | | | | | | Conflicts: include/zot.php mod/connedit.php util/messages.po | ||||
| | * | no this isn't it. well ok, it's part of it, but not the important part. it's ↵ | redmatrix | 2015-06-28 | 1 | -14/+31 |
| | | | | | | | | | still pretty cool. | ||||
| * | | more work on mail flags | redmatrix | 2015-06-23 | 1 | -1/+1 |
| | | | |||||
| * | | item flag fixes discovered after a few merges | redmatrix | 2015-06-23 | 1 | -2/+1 |
| | | | |||||
| * | | DB changes for some channel flags | redmatrix | 2015-06-15 | 1 | -16/+13 |
| | | | |||||
| * | | convert the abook fields | redmatrix | 2015-06-14 | 1 | -28/+22 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-27 | 1 | -3/+4 |
| |\| | | | | | | | | | Conflicts: mod/impel.php | ||||
| | * | some work on issue #329 | redmatrix | 2015-05-25 | 1 | -3/+4 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-20 | 1 | -16/+5 |
| |\| | | | | | | | | | | | | | | | Conflicts: include/items.php include/text.php mod/item.php view/nl/messages.po | ||||
| | * | cloning abook entries was broken in several ways if the target xchan wasn't ↵ | redmatrix | 2015-05-20 | 1 | -16/+5 |
| | | | | | | | | | available on the clone site. This should make it less broken. | ||||
| * | | re-arrange the html cache a bit | redmatrix | 2015-05-20 | 1 | -0/+3 |
| | | | |||||
| * | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php | ||||
| | * | | convert ITEM_WALL from bitfield to standalone | redmatrix | 2015-05-06 | 1 | -3/+3 |
| | | | | |||||
| | * | | first pass name change | redmatrix | 2015-05-05 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'master' into tres | friendica | 2015-04-23 | 1 | -567/+821 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |