Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-07 | 1 | -2/+2 |
|\| | | | | | | | | | Conflicts: util/messages.po | ||||
| * | PRIVACY: item_private seems to have been removed from permissions_sql ↵ | redmatrix | 2015-09-07 | 1 | -2/+2 |
| | | | | | | | | checking with an observer. | ||||
| * | export chatrooms | redmatrix | 2015-09-03 | 1 | -0/+6 |
| | | |||||
* | | make js_upload work with hubzilla. It still needs a rewrite. | redmatrix | 2015-09-05 | 2 | -12/+36 |
| | | |||||
* | | Fix for PHP Fatal error: Function name must be a string in ↵ | jeroenpraat | 2015-09-04 | 1 | -1/+1 |
| | | | | | | | | | | /var/www/hubzilla/include/items.php on line 3325 Please review if this is correct? | ||||
* | | import and sync chatrooms | redmatrix | 2015-09-03 | 4 | -3/+108 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-03 | 1 | -5/+7 |
|\| | | | | | | | | | Conflicts: include/identity.php | ||||
| * | channel export - don't include linked resource items (photos, events). These ↵ | redmatrix | 2015-09-03 | 1 | -2/+4 |
| | | | | | | | | items will need to be provided with those objects so that they can be re-linked. | ||||
* | | app sync | redmatrix | 2015-09-02 | 3 | -2/+91 |
| | | |||||
* | | add timestamps for syncing apps | redmatrix | 2015-09-02 | 1 | -3/+10 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-02 | 1 | -4/+0 |
|\| | | | | | | | | | | | Conflicts: doc/credits.bb mod/thing.php | ||||
| * | Update the credits | redmatrix | 2015-09-02 | 1 | -4/+0 |
| | | |||||
| * | protect from sql injection | redmatrix | 2015-09-02 | 1 | -1/+1 |
| | | |||||
* | | start to modularise the clone import and sync functions | redmatrix | 2015-09-02 | 3 | -0/+335 |
| | | |||||
* | | 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 |
| | | |||||
* | | obscure mail subject in conversation structure | redmatrix | 2015-09-01 | 1 | -1/+10 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-01 | 1 | -0/+7 |
|\| | |||||
| * | export apps | redmatrix | 2015-09-01 | 1 | -0/+7 |
| | | |||||
* | | initial work on obj import, rename import_profile_photo to ↵ | redmatrix | 2015-09-01 | 7 | -12/+12 |
| | | | | | | | | import_xchan_photo to more accurately state its purpose. | ||||
* | | match the redmatrix output format for objects (which is the hubzilla table ↵ | redmatrix | 2015-09-01 | 1 | -6/+2 |
| | | | | | | | | format) |