Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-03 | 1 | -4/+4 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-03 | 2 | -0/+28 |
| |\ | |||||
| * | | update item_normal() to not include ACTIVITY_OBJ_FILE obj_type | Mario Vavti | 2017-11-03 | 1 | -4/+4 |
| | | | |||||
* | | | provide short localised summary for likes that will end up in displayed ↵ | zotlabs | 2017-11-03 | 1 | -0/+12 |
| |/ |/| | | | | | notifications | ||||
* | | imagedata not set correctly if large photo AND imagick is not installed | zotlabs | 2017-11-03 | 1 | -0/+3 |
| | | |||||
* | | fix cloud redirects with owt tokens | zotlabs | 2017-11-03 | 1 | -0/+25 |
|/ | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-02 | 2 | -4/+4 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-02 | 3 | -8/+28 |
| |\ | |||||
| * \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-02 | 1 | -1/+11 |
| |\ \ | |||||
| * | | | fix issues with diaspora xchans | Mario Vavti | 2017-11-02 | 2 | -4/+4 |
| | | | | |||||
* | | | | more queue work | zotlabs | 2017-11-02 | 2 | -5/+11 |
| |_|/ |/| | | |||||
* | | | put deferred queue logic every place we create a delivery process (except ↵ | zotlabs | 2017-11-02 | 3 | -8/+28 |
| |/ |/| | | | | | for protocol 'friend requests' which aren't likely to swamp the delivery system). Remove it from the queue_delivery function which was too late to do anything. | ||||
* | | don't perform zot_refresh on dead sites unless $force is set | zotlabs | 2017-11-01 | 1 | -0/+10 |
| | | |||||
* | | do not send message_list responses to dead sites (this delivery method ↵ | zotlabs | 2017-11-01 | 1 | -1/+1 |
|/ | | | | bypassed the notifier) | ||||
* | Maria's profile photo issue, please push to master. | zotlabs | 2017-11-01 | 1 | -0/+4 |
| | |||||
* | add another delivery control parameter (force queue threshold) | zotlabs | 2017-10-31 | 1 | -1/+11 |
| | |||||
* | use 1) personal setting, 2) site setting, 3) default false - for ↵ | zotlabs | 2017-10-30 | 1 | -1/+1 |
| | | | | system.channel_menu | ||||
* | memory overflow trying to delete a connection with a very high noise to ↵ | zotlabs | 2017-10-29 | 1 | -1/+1 |
| | | | | signal ratio | ||||
* | acl encoding issues | zotlabs | 2017-10-23 | 1 | -1/+1 |
| | |||||
* | hubzilla issue #885 | zotlabs | 2017-10-23 | 1 | -0/+8 |
| | |||||
* | bring back the markdown post feature (after investing some effort to make it ↵ | zotlabs | 2017-10-22 | 3 | -4/+20 |
| | | | | work) | ||||
* | wrong key | zotlabs | 2017-10-22 | 1 | -4/+2 |
| | |||||
* | table structure for pseudo or proxy channels (pchan) | zotlabs | 2017-10-19 | 1 | -0/+9 |
| | |||||
* | redirect to be moderated items to /moderate and change the conv link to ↵ | Mario Vavti | 2017-10-19 | 1 | -1/+3 |
| | | | | partent mid in /modrate | ||||
* | fix issue #837 - w2w posts not removed in contact_remove() | Mario Vavti | 2017-10-19 | 1 | -1/+2 |
| | |||||
* | don't translate 'guest:' since it is part of a url | zotlabs | 2017-10-16 | 1 | -1/+1 |
| | |||||
* | ensure guests hve a unique (non-existent) url so that network discovery on ↵ | zotlabs | 2017-10-16 | 1 | -1/+1 |
| | | | | remote servers doesn't come up mis-attributing the token. Future work should probably provide an actual page at this location describing it as a guest account of 'xyz'. | ||||
* | regression in zot site info after zot6 work | zotlabs | 2017-10-16 | 1 | -4/+6 |
| | |||||
* | was unable to make the modal login dialog work on the channel page with a ↵ | zotlabs | 2017-10-14 | 1 | -9/+14 |
| | | | | cover photo. So for mod_channel, send login to the login page instead of the modal popup. | ||||
* | create an actual logout module instead of relying on internal variables | zotlabs | 2017-10-12 | 1 | -5/+4 |
| | |||||
* | typo | zotlabs | 2017-10-11 | 1 | -1/+2 |
| | |||||
* | bring back some nav stuff (notifications) for alternate navbars; still some ↵ | zotlabs | 2017-10-11 | 1 | -0/+40 |
| | | | | things missing as the notification dropdowns aren't fully functional. | ||||
* | for federated forums we need to keep track of what protocols are available ↵ | zotlabs | 2017-10-10 | 1 | -0/+16 |
| | | | | to red/hubzilla channels to determine which posts need to be mangled for transport to individual networks - based on what networks the author can communicate with. We probably need this for all xchans and hublocs but at some point it becomes increasingly difficult to scrape this information and map out a compatibility matrix. It's also doubtful anybody will use this system because we basically have to forge comments between network sites involving different protocols and this is going to look like crap to anybody that isn't on red/Hubzilla. Eventually they have to fix their protocols for this to work correctly, but nobody seems to believe me that their networks are basically anti-federation, so we need something like this to highlight their walled garden specifications and the resulting federation problems in a form they can't really argue with. | ||||
* | on failed auth due to unverified email, tell the person why and remind them ↵ | zotlabs | 2017-10-10 | 1 | -2/+5 |
| | | | | to check their email. | ||||
* | rename view/tpl/nav.tpl to navbar_default.tpl so that all navbar selection ↵ | zotlabs | 2017-10-10 | 1 | -2/+2 |
| | | | | code is consistent | ||||
* | re-implement single delivery | zotlabs | 2017-10-10 | 1 | -0/+9 |
| | |||||
* | remove notifications code from nav and go live with new notifications | Mario Vavti | 2017-10-10 | 1 | -58/+13 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-09 | 1 | -7/+19 |
|\ | |||||
| * | feed untranslated appnames to nav_set_selected() and query for the active ↵ | Mario Vavti | 2017-10-09 | 1 | -10/+15 |
| | | | | | | | | app directly to get app details | ||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-10-09 | 1 | -5/+22 |
| |\ | |||||
| * | | new notification changes - use sticky_kit instead of position fixed | Mario Vavti | 2017-10-09 | 1 | -6/+13 |
| | | | |||||
* | | | purify user-supplied filenames in some cases. Probably not needed but it's ↵ | zotlabs | 2017-10-09 | 2 | -2/+8 |
| |/ |/| | | | | | the right thing to do. | ||||
* | | ability to pin apps to the navbar when using named navbars | zotlabs | 2017-10-08 | 1 | -2/+11 |
| | | |||||
* | | alternate navbar layouts | zotlabs | 2017-10-08 | 1 | -3/+11 |
|/ | |||||
* | experimental new notifications - needs pconfig experimental_notif set to 1 ↵ | Mario Vavti | 2017-10-08 | 1 | -5/+9 |
| | | | | for your channel to work. | ||||
* | it is not your public stream -> just public stream | Mario Vavti | 2017-10-06 | 1 | -1/+1 |
| | |||||
* | introduce public stream notifications | Mario Vavti | 2017-10-06 | 1 | -1/+3 |
| | |||||
* | changes to encryption encapsulation for zot6 (backward compatible) | zotlabs | 2017-10-05 | 1 | -0/+4 |
| | |||||
* | Experimental alternate channel_menu navigation. To use, "util/config ↵ | zotlabs | 2017-10-05 | 2 | -2/+4 |
| | | | | system.channel_menu 1" | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-04 | 2 | -4/+6 |
|\ |