Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | /connedit do not show vcard and section selector if not yet approved. ↵ | Mario Vavti | 2017-01-10 | 1 | -257/+249 | |
| | | | | | | | | whitespace cleanup | |||||
* | | add gravizot.de to directory server fallbacks | zotlabs | 2017-01-10 | 1 | -1/+2 | |
| | | ||||||
* | | obj_type on edit activity was wrong | zotlabs | 2017-01-09 | 2 | -3/+3 | |
|/ | ||||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-01-09 | 4 | -4490/+4604 | |
|\ | ||||||
| * | implement a menu to select a section to be open by default | Mario Vavti | 2017-01-09 | 2 | -9/+37 | |
| | | ||||||
| * | Merge pull request #640 from mjfriaza/dev | zotlabs | 2017-01-09 | 2 | -4481/+4567 | |
| |\ | | | | | | | Updated the Spanish translation | |||||
| | * | Updated the Spanish translation | Manuel Jiménez Friaza | 2017-01-07 | 2 | -4481/+4567 | |
| | | | ||||||
* | | | channel move stuff (disabled currently because not yet complete) | zotlabs | 2017-01-09 | 5 | -8/+34 | |
|/ / | ||||||
* | | Comanche: add greater/less than (plus greater/less than or equal) conditionals | zotlabs | 2017-01-07 | 1 | -1/+31 | |
| | | ||||||
* | | Comanche conditionals - provide a conditional "~=" form for testing ↵ | zotlabs | 2017-01-07 | 1 | -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_merge | zotlabs | 2017-01-07 | 2 | -2/+2 | |
|\ \ | ||||||
| * | | fix main width if right aside is hidden | Mario Vavti | 2017-01-07 | 2 | -2/+2 | |
| | | | ||||||
* | | | add enclosures and categories to atom feed | zotlabs | 2017-01-07 | 1 | -19/+50 | |
| | | | ||||||
* | | | allow the atom_entry hook to change the results | zotlabs | 2017-01-07 | 1 | -7/+14 | |
| | | | ||||||
* | | | typo | zotlabs | 2017-01-07 | 1 | -1/+1 | |
| | | | ||||||
* | | | update the atom_entry hook | zotlabs | 2017-01-07 | 1 | -6/+13 | |
| | | | ||||||
* | | | more feedutils cleanup | zotlabs | 2017-01-06 | 1 | -5/+2 | |
| | | | ||||||
* | | | 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 | |
|\ \ \ |