Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | create photo object if feature large photos is enabled and display those ↵ | Mario Vavti | 2015-10-20 | 1 | -2/+0 |
| | | | | slightly different | ||||
* | mail sync/migrate continued; also abstract delivery loop to make it ↵ | redmatrix | 2015-10-15 | 1 | -0/+4 |
| | | | | re-usable, change refresh_all to use delivery loop. | ||||
* | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-10-14 | 1 | -1/+25 |
|\ | |||||
| * | port of mail encoding | redmatrix | 2015-10-14 | 1 | -8/+8 |
| | | |||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-14 | 1 | -1/+25 |
| |\ | |||||
| | * | support for mail sync | redmatrix | 2015-10-14 | 1 | -1/+25 |
| | | | |||||
| | * | problems with extended item import and signatures | redmatrix | 2015-09-22 | 1 | -3/+62 |
| | | | |||||
* | | | allow photo-items to appear full width if large photos feature is enabled. ↵ | Mario Vavti | 2015-10-14 | 1 | -0/+2 |
|/ / | | | | | | | in prepare_body() split off mentions, tags, categories folders and attachments from body for easier theming. some other little fixes. | ||||
* | | fix typo in 0b1cd826b05b6ec9637e373735967a2555eeb1d4 | Mario Vavti | 2015-09-29 | 1 | -1/+1 |
| | | |||||
* | | do not store a recalled mail if we can not find the original mid | Mario Vavti | 2015-09-29 | 1 | -0/+6 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-22 | 1 | -0/+1 |
|\| | | | | | | | | | | | Conflicts: include/items.php include/zot.php | ||||
| * | backport item sync | redmatrix | 2015-09-22 | 1 | -2/+6 |
| | | |||||
| * | export TERM_FILE when mirroring | redmatrix | 2015-09-08 | 1 | -1/+6 |
| | | |||||
* | | issue #51 | redmatrix | 2015-09-21 | 1 | -0/+12 |
| | | |||||
* | | check for empty word after trim | redmatrix | 2015-09-12 | 1 | -0/+4 |
| | | |||||
* | | preserve code blocks on item import if channel has code rights. When ↵ | redmatrix | 2015-09-08 | 1 | -2/+15 |
| | | | | | | | | | | | | importing the channel itself, turn code access off unless this is the admin. | ||||
* | | export TERM_FILE when mirroring | redmatrix | 2015-09-08 | 1 | -2/+7 |
| | | |||||
* | | 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 |
| | | |||||
* | | 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? | ||||
* | | initial work on obj import, rename import_profile_photo to ↵ | redmatrix | 2015-09-01 | 1 | -2/+2 |
| | | | | | | | | import_xchan_photo to more accurately state its purpose. | ||||
* | | provide a comment_policy of "network: diaspora" to handle their special case ↵ | redmatrix | 2015-08-23 | 1 | -0/+2 |
| | | | | | | | | public-posts-are-commentable-by-anybody permission without breaking any other permissions. | ||||
* | | issues encountered with hubzilla DB changes, zot_refresh and item_drop and ↵ | redmatrix | 2015-08-23 | 1 | -1/+1 |
| | | | | | | | | hub sync | ||||
* | | extra encoding on mail titles | redmatrix | 2015-08-20 | 1 | -1/+1 |
| | | |||||
* | | add item validation function | redmatrix | 2015-08-13 | 1 | -0/+26 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-11 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | Conflicts: include/items.php util/messages.po view/nl/messages.po view/nl/strings.php | ||||
| * | ensure diaspora_signature is converted to json before we store it. | redmatrix | 2015-08-08 | 1 | -0/+3 |
| | | |||||
* | | private mail isues | redmatrix | 2015-08-09 | 1 | -4/+4 |
| | | |||||
* | | convert diaspora_signature to json for storage | redmatrix | 2015-08-08 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-08-05 | 1 | -6/+9 |
|\| | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | ||||
| * | connection filter fixes | redmatrix | 2015-08-05 | 1 | -6/+9 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-08-04 | 1 | -0/+3 |
|\| | |||||
| * | unobscure item before applying connection filter | redmatrix | 2015-08-04 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-08-03 | 1 | -1/+1 |
|\| | | | | | | | | | | | Conflicts: view/it/messages.po view/it/strings.php | ||||
| * | these were some really difficult bugs to find | redmatrix | 2015-08-03 | 1 | -1/+1 |
| | | |||||
* | | diaspora_meta getting double json encoded | redmatrix | 2015-08-02 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-30 | 1 | -1/+0 |
|\| | | | | | | | | | | | several dav fixes Conflicts: include/items.php | ||||
| * | add connection filter to non-zot posts | redmatrix | 2015-07-29 | 1 | -0/+3 |
| | | |||||
* | | incorrect function name | redmatrix | 2015-07-29 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-27 | 1 | -4/+3 |
|\| | | | | | | | | | Conflicts: util/messages.po | ||||
| * | logic issue in connection filter | redmatrix | 2015-07-27 | 1 | -4/+3 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-23 | 1 | -1/+1 |
|\| | | | | | | | | | Conflicts: include/diaspora.php | ||||
| * | make content filter by language work for excludes | zottel | 2015-07-22 | 1 | -1/+1 |
| | | |||||
* | | refresh diaspora xchan every month or so since receiving profile update ↵ | redmatrix | 2015-07-22 | 1 | -0/+4 |
| | | | | | | | | messages from that network reliably are just as unlikely as receiving any other kind of message from that network reliably. The problem is that if somebody changes their profile name or photo once every few years and you miss it because of their shitty unreliable communications, your data could be stale for a long time. | ||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-21 | 1 | -0/+9 |
|\| | | | | | | | | | Conflicts: doc/to_do_code.bb | ||||
| * | there is no stricmp() in php, use strcasecmp() - also only detect language ↵ | redmatrix | 2015-07-20 | 1 | -3/+6 |
| | | | | | | | | if we plan to use it. | ||||
| * | allow per-connection content filter to specify a detected language to ↵ | redmatrix | 2015-07-20 | 1 | -0/+6 |
| | | | | | | | | include/exclude (in addition to text, tags, and regexes) | ||||
* | | silence warning about non array diaspora_meta but report it in the logs so ↵ | redmatrix | 2015-07-19 | 1 | -1/+3 |
| | | | | | | | | we can find out what it actually is and why. | ||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-19 | 1 | -5/+5 |
|\| | | | | | | | | | | | | | | | | | Conflicts: include/identity.php include/widgets.php util/messages.po view/it/messages.po view/it/strings.php | ||||
| * | fix missing div and a regression introduced in ↵ | Mario Vavti | 2015-07-16 | 1 | -5/+5 |
| | | | | | | | | ec23a94b6d7f6db1e1d34275b8143cbc947db802 which broke tag removal for photos |