aboutsummaryrefslogtreecommitdiffstats
path: root/include/import.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.2RC'3.2Mario2018-03-091-2/+3
|\
| * remove sendzid core code from core (put in plugin where it belongs)zotlabs2018-01-171-1/+2
| |
| * scrutinizer issues: none worthy of including in 3.0, there will likely be a ↵zotlabs2018-01-081-1/+1
| | | | | | | | few hundred more before all is said and done.
| * this should finish up hubzilla issue #113zotlabs2017-12-311-5/+9
| |
| * update file thumbnails when imported/syncedzotlabs2017-12-301-0/+3
| |
* | Merge branch '3.0RC'3.0Mario2018-01-091-9/+63
|\ \
| * | this should finish up hubzilla issue #113zotlabs2018-01-031-5/+9
| | |
| * | update file thumbnails when imported/syncedzotlabs2018-01-031-0/+3
| |/
| * improvements to file import/exportzotlabs2017-12-101-2/+35
| |
| * synchronise an attach_move operation to cloneszotlabs2017-12-061-1/+8
| |
| * use httpsig auth for getfilezotlabs2017-11-291-1/+8
| |
* | Merge branch '2.8RC'Mario2017-10-251-0/+14
|\|
| * re-implement single deliveryzotlabs2017-10-101-0/+9
| |
| * ignore diaspora_meta column on item import.zotlabs2017-09-061-0/+5
| |
* | Merge branch '2.6RC'2.6Mario Vavti2017-08-161-12/+12
|\|
| * prevent expiration of conversations you are involved with - allows you to ↵zotlabs2017-07-101-0/+8
| | | | | | | | find your own comments months from now
| * it appears to also work a bit better if you don't use imaginary function nameszotlabs2017-06-071-1/+1
| |
| * partial fix for failure to sync photos - appears to be memory exhaustion and ↵zotlabs2017-06-071-2/+3
| | | | | | | | | | | | dependent on filesize although an unrelated issue was found with directory creation during file sync (we didn't check ownership when looking for duplicates). This checkin provides the means for a sync process to fetch the contents for various photo scales from the original server just as is done for the attach data now. It is still missing the bit for the sync process to spawn a mob of children to fetch these suckers and update the photo table with the results.
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-051-7/+12
| |\
| | * :bulb: correct some Doxygen syntax mistakes.Klaus Weidenbach2017-05-051-7/+12
| | |
| * | do away with single delivery (delivery from clones to singleton networks ↵zotlabs2017-05-041-9/+0
| | | | | | | | | | | | attached to other clones)
| * | backend infrastructure for 'channel protection password'; which will be used ↵zotlabs2017-04-121-1/+1
| | | | | | | | | | | | to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes
| * | whitespacezotlabs2017-03-301-12/+14
| | |
* | | Merge branch '2.4RC'2.4Mario Vavti2017-05-311-271/+362
|\ \ \
| * | | :bulb: correct some Doxygen syntax mistakes.Klaus Weidenbach2017-05-051-7/+12
| | |/ | |/|
| * | backend infrastructure for 'channel protection password'; which will be used ↵zotlabs2017-04-121-1/+1
| | | | | | | | | | | | to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes
| * | whitespacezotlabs2017-04-031-12/+14
| |/
| * Add some documentation for import functions.Klaus Weidenbach2017-03-301-225/+337
| |
| * code_allowed is a real mess. Start the cleanup by remving the account level ↵zotlabs2017-03-291-31/+3
| | | | | | | | code allow and limiting to specific channels only. This reduces the possibility of cross channel security issues coming into play. Then provide a single function for checking the code permission. This is only partially done as we often need to check against the observer or logged in channel as well as the resource owner to ensure that this only returns true for local channels which also own the requested resource.
| * remove redundant and non-functional/broken check for successfully cloned ↵zotlabs2017-03-201-6/+0
| | | | | | | | channel record which was left over from an earlier method of creating the table; which was deprecated a few months back.
* | remove redundant and non-functional/broken check for successfully cloned ↵zotlabs2017-04-071-6/+0
| | | | | | | | channel record which was left over from an earlier method of creating the table; which was deprecated a few months back.
* | Merge branch 2.2RC2.2Mario Vavti2017-03-081-354/+378
|\|
| * remove logger linesAndrew Manning2017-02-111-1/+0
| |
| * Webpage import tool works again after setting iconfig properly and following ↵Andrew Manning2017-02-111-14/+19
| | | | | | | | the Impel class function example. More testing is needed.
| * superfluous whitespace cleanupzotlabs2017-01-311-350/+357
| |
| * channel move stuff (disabled currently because not yet complete)zotlabs2017-01-091-3/+16
| |
| * logger typoszotlabs2016-12-301-2/+2
| |
* | profile clone issue with devzotlabs2016-12-301-0/+1
| |
* | logger typoszotlabs2016-12-301-2/+2
|/
* sql: limit 1 for UPDATE and DELETE is not supported by the SQL standard and ↵Florian Steinel2016-10-271-7/+7
| | | | | | postgresql (see: https://www.postgresql.org/message-id/flat/1291109101.26137.35.camel%40pcd12478 )
* issue #564zotlabs2016-10-211-1/+1
|
* additional array checkingzotlabs2016-10-131-2/+4
|
* consolidate duplicated code for creating table entries from an arrayzotlabs2016-10-121-119/+24
|
* caught one typo from the last checkinzotlabs2016-10-121-1/+1
|
* remove the rest of the backticks from sql queries; replace with TQUOT const ↵zotlabs2016-10-121-56/+56
| | | | which is driver dependent
* issue #538 continuedredmatrix2016-09-291-1/+1
|
* issue #519 continuedredmatrix2016-09-281-1/+4
|
* Merge branch 'nulldate' into devredmatrix2016-09-261-4/+4
|\
| * null_date conversion; phase 1redmatrix2016-09-251-4/+4
| |
* | issue #526redmatrix2016-09-221-0/+3
|/