aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* daemon_addon hook - lets plugins create custom background processes.zotlabs2017-01-173-0/+32
|
* Merge pull request #645 from git-marijus/devzotlabs2017-01-162-1/+7
|\ | | | | do not choke if photo_factory() returns null
| * do not choke if photo_factory() returns nullMario Vavti2017-01-152-1/+7
| |
* | vcard export from profilezotlabs2017-01-153-1/+21
| |
* | array pointer in wrong placezotlabs2017-01-151-1/+1
| |
* | more integration of vcard and profileszotlabs2017-01-153-4/+41
| |
* | Still trying to make the documentation link just a wee bit more obvious.zotlabs2017-01-152-2/+3
| |
* | attach_delete() - remove photo resources even if the attach table row wasn't ↵zotlabs2017-01-152-14/+24
|/ | | | found.
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-01-134-15/+19
|\
| * another try on preventing double scrollbars when a modal is larger than the ↵Mario Vavti2017-01-132-2/+2
| | | | | | | | viewport
| * evert "prevent double scrollbar when we have a modal larger than the viewport"Mario Vavti2017-01-132-2/+1
| | | | | | | | This reverts commit 2ace4c57d0a1b5d0030139c28d7d72e071d8b4d8.
| * prevent double scrollbar when we have a modal larger than the viewportMario Vavti2017-01-132-1/+2
| |
| * possibly improve the album list query and save the result in App::$dataMario Vavti2017-01-132-13/+17
| |
* | several minor app nitszotlabs2017-01-137-13/+23
| |
* | string updatezotlabs2017-01-131-561/+586
|/
* default cover photo support.zotlabs2017-01-124-5/+18
|
* missing protect_sprintf which is the source of issue #642 - if a mention ↵zotlabs2017-01-121-2/+2
| | | | search contains % it will result in an SQL vsprintf error
* fullscreen in album-view is disfunctional atmMario Vavti2017-01-122-6/+0
|
* we should actually check for existance of a given album at this place. this ↵Mario Vavti2017-01-121-6/+1
| | | | query can probably be more simple though
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-01-112-3/+5
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-01-113-4/+7
| |\
| * | expires lost during editzotlabs2017-01-112-3/+5
| | |
* | | comment out redundant querysMario Vavti2017-01-112-4/+11
| |/ |/|
* | fix embedimage if an albumname contains quotesMario Vavti2017-01-113-4/+7
|/
* btlogger trace file logging not working as desired.zotlabs2017-01-101-4/+7
|
* normalise feed idzotlabs2017-01-101-9/+16
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-01-10546-2350/+113029
|\
| * font awesome 4.7.0Mario Vavti2017-01-10545-2093/+112780
| |
| * /connedit do not show vcard and section selector if not yet approved. ↵Mario Vavti2017-01-101-257/+249
| | | | | | | | whitespace cleanup
* | add gravizot.de to directory server fallbackszotlabs2017-01-101-1/+2
| |
* | obj_type on edit activity was wrongzotlabs2017-01-092-3/+3
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-01-094-4490/+4604
|\
| * implement a menu to select a section to be open by defaultMario Vavti2017-01-092-9/+37
| |
| * Merge pull request #640 from mjfriaza/devzotlabs2017-01-092-4481/+4567
| |\ | | | | | | Updated the Spanish translation
| | * Updated the Spanish translationManuel Jiménez Friaza2017-01-072-4481/+4567
| | |
* | | channel move stuff (disabled currently because not yet complete)zotlabs2017-01-095-8/+34
|/ /
* | Comanche: add greater/less than (plus greater/less than or equal) conditionalszotlabs2017-01-071-1/+31
| |
* | Comanche conditionals - provide a conditional "~=" form for testing ↵zotlabs2017-01-071-0/+12
| | | | | | | | 'contains' (case independent substring match). Also add $request the request uri) to the supported variables.
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-01-072-2/+2
|\ \
| * | fix main width if right aside is hiddenMario Vavti2017-01-072-2/+2
| | |
* | | add enclosures and categories to atom feedzotlabs2017-01-071-19/+50
| | |
* | | allow the atom_entry hook to change the resultszotlabs2017-01-071-7/+14
| | |
* | | typozotlabs2017-01-071-1/+1
| | |
* | | update the atom_entry hookzotlabs2017-01-071-6/+13
| | |
* | | more feedutils cleanupzotlabs2017-01-061-5/+2
| | |
* | | add the ostatus:conversation element which is now more or less required by ↵zotlabs2017-01-061-0/+3
| | | | | | | | | | | | GNU-Social to work around some short-comings of the OStatus delivery model when it comes to conversational message grouping. If this element isn't there, message replies will not get grouped with the parent specified in thr:in-reply-to, which exists to group conversations together. The reasoning being that due to the point-to-point delivery model, a reply could arrive on one site which does not have a copy of the parent specified by thr:in-reply-to. Hence further replies arriving on this site are grouped with the first arrived comment as the parent. Since this project doesn't allow comments which don't have top-level parents, we can just set it to the parent-mid and save being forced to create a new database structure for orphan children acting as parents.
* | | preserve the original message-id coming from feeds - we will have to escape ↵zotlabs2017-01-061-17/+10
| | | | | | | | | | | | them properly before calling mod_display.
* | | Merge branch 'dev' into gnusoczotlabs2017-01-0615-2809/+2996
|\| |
| * | stringszotlabs2017-01-061-2783/+2819
| | |
| * | setup: check disabled functions more precisely than using a string matchzotlabs2017-01-052-2/+13
| | |