aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-071-2/+2
|\ | | | | | | | | Conflicts: util/messages.po
| * PRIVACY: item_private seems to have been removed from permissions_sql ↵redmatrix2015-09-071-2/+2
| | | | | | | | checking with an observer.
| * export chatroomsredmatrix2015-09-031-0/+6
| |
* | make js_upload work with hubzilla. It still needs a rewrite.redmatrix2015-09-052-12/+36
| |
* | Fix for PHP Fatal error: Function name must be a string in ↵jeroenpraat2015-09-041-1/+1
| | | | | | | | | | /var/www/hubzilla/include/items.php on line 3325 Please review if this is correct?
* | import and sync chatroomsredmatrix2015-09-034-3/+108
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-031-5/+7
|\| | | | | | | | | Conflicts: include/identity.php
| * channel export - don't include linked resource items (photos, events). These ↵redmatrix2015-09-031-2/+4
| | | | | | | | items will need to be provided with those objects so that they can be re-linked.
* | app syncredmatrix2015-09-023-2/+91
| |
* | add timestamps for syncing appsredmatrix2015-09-021-3/+10
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-021-4/+0
|\| | | | | | | | | | | Conflicts: doc/credits.bb mod/thing.php
| * Update the creditsredmatrix2015-09-021-4/+0
| |
| * protect from sql injectionredmatrix2015-09-021-1/+1
| |
* | start to modularise the clone import and sync functionsredmatrix2015-09-023-0/+335
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-021-4/+3
|\| | | | | | | | | Conflicts: include/zot.php
| * really fix post filteringzottel2015-09-021-2/+2
| |
* | obscure mail subject in conversation structureredmatrix2015-09-011-1/+10
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-011-0/+7
|\|
| * export appsredmatrix2015-09-011-0/+7
| |
* | initial work on obj import, rename import_profile_photo to ↵redmatrix2015-09-017-12/+12
| | | | | | | | import_xchan_photo to more accurately state its purpose.
* | match the redmatrix output format for objects (which is the hubzilla table ↵redmatrix2015-09-011-6/+2
| | | | | | | | format)
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-011-1/+9
|\|
| * add the baseurl so we can easily relocate objectsredmatrix2015-09-011-1/+2
| |
| * use different obj export output format for hubzilla compatibilityredmatrix2015-09-011-1/+8
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-011-1/+0
|\| | | | | | | | | | | Conflicts: include/identity.php install/update.php
| * typo in sqlredmatrix2015-08-311-1/+1
| |
* | separate objs/things from taxonomyredmatrix2015-09-012-11/+21
| |
* | don't log the mundane - especially at normal levels.redmatrix2015-08-311-2/+3
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-311-0/+1
|\| | | | | | | | | | | | | | | Conflicts: include/identity.php install/update.php util/messages.po view/nl/messages.po
| * change the likes db structure to make it more easily importable/exportableredmatrix2015-08-311-1/+1
| |
* | mostly doc tweaks, some import/export workredmatrix2015-08-311-1/+1
| |
* | rename 'register_account' hook to 'create_identity'.redmatrix2015-08-311-1/+1
| |
* | unclosed link tagsredmatrix2015-08-301-4/+4
| |
* | schedule a doco update once weeklyredmatrix2015-08-302-0/+34
| |
* | more work on doco searchredmatrix2015-08-301-0/+12
| |
* | more AccessList stuff - this time it's mod-item, which is a biggieredmatrix2015-08-281-1/+1
| |
* | now we get to the heavy lifting with AccessList stuffredmatrix2015-08-271-57/+29
| |
* | more work on AccessList integrationredmatrix2015-08-273-58/+62
| |
* | start conversion to AccessList objectredmatrix2015-08-272-18/+17
| |
* | First attempt to turn access control into an object class. The access ↵redmatrix2015-08-271-0/+72
| | | | | | | | control manipulation is getting too complex and this will help keep it manageable and reduce a lot of code duplication.
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-261-1/+1
|\|
| * use extended export format for items in api photo_detailredmatrix2015-08-261-1/+1
| |
* | redphotos updatesredmatrix2015-08-261-1/+8
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-261-1/+21
|\|
| * add item info to photo detail in apiredmatrix2015-08-261-1/+21
| |
* | change attach_store to allow a predefined item to accompany a photoredmatrix2015-08-262-44/+82
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-261-1/+12
|\| | | | | | | | | Conflicts: include/diaspora.php
| * support likes on comments with diaspora owner by sending as activityredmatrix2015-08-261-14/+19
| |
| * required for future workredmatrix2015-08-261-1/+12
| |
| * remove orphan mod_connections editing code (now done in mod/connedit)redmatrix2015-08-241-3/+0
| |