aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * ical import/export - provide mechanism to preserve original source ↵zotlabs2017-01-051-13/+52
| | | | | | | | formatting across zot based systems.
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-01-054-7/+13
| |\
| | * same fix for mobile viewMario Vavti2017-01-051-1/+3
| | |
| | * fix an issue with sticky_kit where input fields and textareas would blur on ↵Mario Vavti2017-01-054-6/+10
| | | | | | | | | | | | recalc. auto resize the notes textarea since if it sticks to the bottom it can not be properly resized
| * | issue #639, voting setting is lost after post is edited (also the disabling ↵zotlabs2017-01-052-2/+3
| | | | | | | | | | | | of comments)
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-01-046-3/+97
| |\|
| | * css fixMario Vavti2017-01-041-2/+2
| | |
| | * Fixing some schemasjeroenpraat2017-01-034-0/+85
| | |
| | * trigger sticky_kit:recalc if the size of left_aside_wrapper changesMario Vavti2017-01-031-1/+10
| | |
* | | some gnusoc fixeszotlabs2017-01-041-3/+29
|/ /
* / zot protocol doco updateszotlabs2017-01-031-4/+35
|/
* fix chat member list when one or members are connected via access tokenszotlabs2017-01-021-3/+17
|
* set 'adjust for viewer timezone' as the default for new events.zotlabs2017-01-021-3/+6
|
* Merge pull request #637 from anaqreon/devgit-marijus2017-01-023-4/+17
|\ | | | | Guest access tokens
| * Merge remote-tracking branch 'upstream/dev' into devAndrew Manning2017-01-029-9/+344
| |\ | |/ |/|
* | new roadmapzotlabs2017-01-011-0/+23
| |
* | feature: allow event creation in other timezones than your own.zotlabs2017-01-013-2/+21
| |
* | Merge branch 'pcard' into devzotlabs2017-01-014-1/+294
|\ \
| * | profile vcard - generate vcard on profile updatezotlabs2017-01-011-1/+13
| | |
| * | profile vcard - preliminary workzotlabs2017-01-013-0/+281
| | |
* | | issue #636 - some localised (e.g. Italian) strings have single quotes which ↵zotlabs2017-01-011-6/+6
| | | | | | | | | | | | throw JS errors when used in single quoted template constructs.
| | * Merge remote-tracking branch 'upstream/dev' into devAndrew Manning2017-01-010-0/+0
| | |\ | |_|/ |/| |
* | | Merge pull request #634 from anaqreon/devAndrew Manning2017-01-0132-1650/+647
|\ \ \ | |/ / |/| | I'm going to go ahead and merge this. It should be easy to revert undesired changes.
| | * Add guest access token section to member guide with screenshot of settingsAndrew Manning2017-01-013-4/+17
| |/
| * Deleted old versions that have been integrated. Integrated and slightly ↵Andrew Manning2017-01-0122-1171/+279
| | | | | | | | revised Comanche doco.
| * Merge remote-tracking branch 'upstream/dev' into devAndrew Manning2017-01-015-6/+15
| |\ | |/ |/|
* | better fix for #629 #635 based on ownership/authorship rather than message ↵zotlabs2016-12-311-11/+6
| | | | | | | | flags which could be forged
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-311-1/+1
|\ \
| * | fix expand-aside button hiding if aside is emptyMario Vavti2016-12-311-1/+1
| | |
* | | issues #629, #635 - edited post arriving from downstream source was not ↵zotlabs2016-12-311-0/+14
|/ / | | | | | | being rejected
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-304-13/+5
|\ \
| * | prevent eventual double scrollbarMario Vavti2016-12-301-2/+2
| | |
* | | peoplefind widget should honour directory option settings (such as this site ↵zotlabs2016-12-302-1/+1
| | | | | | | | | | | | only).
| | * Reorganized and revised Zot Protocol content. Deleted some of the old pages ↵Andrew Manning2016-12-3010-479/+368
| |/ | | | | | | that have been refactored.
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-12-302-2/+20
| |\ | |/ |/|
* | move api version call back to corezotlabs2016-12-301-0/+18
| |