Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add the ostatus:conversation element which is now more or less required by ↵ | zotlabs | 2017-01-06 | 1 | -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 ↵ | zotlabs | 2017-01-06 | 1 | -17/+10 |
| | | | | them properly before calling mod_display. | ||||
* | Merge branch 'dev' into gnusoc | zotlabs | 2017-01-06 | 15 | -2809/+2996 |
|\ | |||||
| * | strings | zotlabs | 2017-01-06 | 1 | -2783/+2819 |
| | | |||||
| * | setup: check disabled functions more precisely than using a string match | zotlabs | 2017-01-05 | 2 | -2/+13 |
| | | |||||
| * | ical import/export - provide mechanism to preserve original source ↵ | zotlabs | 2017-01-05 | 1 | -13/+52 |
| | | | | | | | | formatting across zot based systems. | ||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-01-05 | 4 | -7/+13 |
| |\ | |||||
| | * | same fix for mobile view | Mario Vavti | 2017-01-05 | 1 | -1/+3 |
| | | | |||||
| | * | fix an issue with sticky_kit where input fields and textareas would blur on ↵ | Mario Vavti | 2017-01-05 | 4 | -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 ↵ | zotlabs | 2017-01-05 | 2 | -2/+3 |
| | | | | | | | | | | | | of comments) | ||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-01-04 | 6 | -3/+97 |
| |\| | |||||
| | * | css fix | Mario Vavti | 2017-01-04 | 1 | -2/+2 |
| | | | |||||
| | * | Fixing some schemas | jeroenpraat | 2017-01-03 | 4 | -0/+85 |
| | | | |||||
| | * | trigger sticky_kit:recalc if the size of left_aside_wrapper changes | Mario Vavti | 2017-01-03 | 1 | -1/+10 |
| | | | |||||
* | | | some gnusoc fixes | zotlabs | 2017-01-04 | 1 | -3/+29 |
|/ / | |||||
* / | zot protocol doco updates | zotlabs | 2017-01-03 | 1 | -4/+35 |
|/ | |||||
* | fix chat member list when one or members are connected via access tokens | zotlabs | 2017-01-02 | 1 | -3/+17 |
| | |||||
* | set 'adjust for viewer timezone' as the default for new events. | zotlabs | 2017-01-02 | 1 | -3/+6 |
| | |||||
* | Merge pull request #637 from anaqreon/dev | git-marijus | 2017-01-02 | 3 | -4/+17 |
|\ | | | | | Guest access tokens | ||||
| * | Merge remote-tracking branch 'upstream/dev' into dev | Andrew Manning | 2017-01-02 | 9 | -9/+344 |
| |\ | |/ |/| | |||||
* | | new roadmap | zotlabs | 2017-01-01 | 1 | -0/+23 |
| | | |||||
* | | feature: allow event creation in other timezones than your own. | zotlabs | 2017-01-01 | 3 | -2/+21 |
| | | |||||
* | | Merge branch 'pcard' into dev | zotlabs | 2017-01-01 | 4 | -1/+294 |
|\ \ | |||||
| * | | profile vcard - generate vcard on profile update | zotlabs | 2017-01-01 | 1 | -1/+13 |
| | | | |||||
| * | | profile vcard - preliminary work | zotlabs | 2017-01-01 | 3 | -0/+281 |
| | | | |||||
* | | | issue #636 - some localised (e.g. Italian) strings have single quotes which ↵ | zotlabs | 2017-01-01 | 1 | -6/+6 |
| | | | | | | | | | | | | throw JS errors when used in single quoted template constructs. | ||||
| | * | Merge remote-tracking branch 'upstream/dev' into dev | Andrew Manning | 2017-01-01 | 0 | -0/+0 |
| | |\ | |_|/ |/| | | |||||
* | | | Merge pull request #634 from anaqreon/dev | Andrew Manning | 2017-01-01 | 32 | -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 settings | Andrew Manning | 2017-01-01 | 3 | -4/+17 |
| |/ | |||||
| * | Deleted old versions that have been integrated. Integrated and slightly ↵ | Andrew Manning | 2017-01-01 | 22 | -1171/+279 |
| | | | | | | | | revised Comanche doco. | ||||
| * | Merge remote-tracking branch 'upstream/dev' into dev | Andrew Manning | 2017-01-01 | 5 | -6/+15 |
| |\ | |/ |/| | |||||
* | | better fix for #629 #635 based on ownership/authorship rather than message ↵ | zotlabs | 2016-12-31 | 1 | -11/+6 |
| | | | | | | | | flags which could be forged | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-12-31 | 1 | -1/+1 |
|\ \ | |||||
| * | | fix expand-aside button hiding if aside is empty | Mario Vavti | 2016-12-31 | 1 | -1/+1 |
| | | | |||||
* | | | issues #629, #635 - edited post arriving from downstream source was not ↵ | zotlabs | 2016-12-31 | 1 | -0/+14 |
|/ / | | | | | | | being rejected | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-12-30 | 4 | -13/+5 |
|\ \ | |||||
| * | | prevent eventual double scrollbar | Mario Vavti | 2016-12-30 | 1 | -2/+2 |
| | | | |||||
* | | | peoplefind widget should honour directory option settings (such as this site ↵ | zotlabs | 2016-12-30 | 2 | -1/+1 |
| | | | | | | | | | | | | only). | ||||
| | * | Reorganized and revised Zot Protocol content. Deleted some of the old pages ↵ | Andrew Manning | 2016-12-30 | 10 | -479/+368 |
| |/ | | | | | | | that have been refactored. | ||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-12-30 | 2 | -2/+20 |
| |\ | |/ |/| | |||||
* | | move api version call back to core | zotlabs | 2016-12-30 | 1 | -0/+18 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-12-30 | 16 | -805/+1801 |
|\ \ | |||||
* | | | logger typos | zotlabs | 2016-12-30 | 1 | -2/+2 |
| | | | |||||
| | * | css fixes and get rid of a javascript workaround | Mario Vavti | 2016-12-30 | 3 | -11/+3 |
| |/ | |||||
| * | update fullcalendar to version 3.1 | Mario Vavti | 2016-12-30 | 10 | -724/+1461 |
| | | |||||
| * | Merge pull request #633 from anaqreon/dev | zotlabs | 2016-12-29 | 3 | -109/+102 |
| |\ | | | | | | | Doco | ||||
| | * | Merge remote-tracking branch 'upstream/dev' into dev | Andrew Manning | 2016-12-28 | 0 | -0/+0 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #632 from anaqreon/dev | zotlabs | 2016-12-29 | 2 | -48/+113 |
| |\ \ | | | | | | | | | Zot structures doco integrated into the Zot page. | ||||
| | | * | Split Zot protocol and API into two pages. Revise text to add detail and ↵ | Andrew Manning | 2016-12-28 | 3 | -109/+102 |
| | |/ | | | | | | | | | | improve presentation. | ||||
| | * | Zot structures doco integrated into the Zot page. Added nowrap option to ↵ | Andrew Manning | 2016-12-28 | 2 | -48/+113 |
| |/ | | | | | | | [code] BBcode tag. |