Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into dev | redmatrix | 2016-04-05 | 1 | -1/+1 |
|\ | |||||
| * | undeclared static property App::$stringsave (push_lang() and pop_lang()) | redmatrix | 2016-04-05 | 1 | -1/+1 |
| | | |||||
* | | provide stream resource pointer option to z_fetch_url() and z_post_url() per ↵ | redmatrix | 2016-04-05 | 1 | -1/+13 |
| | | | | | | | | earlier doco commit on syncing files/photos across clones. | ||||
* | | fix contextual help | Mario Vavti | 2016-04-05 | 1 | -3/+2 |
| | | |||||
* | | Merge pull request #338 from anaqreon/contextual-help | redmatrix | 2016-04-05 | 1 | -3/+13 |
|\ \ | | | | | | | Contextual help | ||||
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into ↵ | Andrew Manning | 2016-04-03 | 47 | -742/+771 |
| |\| | | | | | | | | | | contextual-help | ||||
| * | | Search docs/context/ hierarchically for help.html files to reduce redundancy | Andrew Manning | 2016-03-26 | 1 | -2/+7 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into ↵ | Andrew Manning | 2016-03-23 | 9 | -484/+321 |
| |\ \ | | | | | | | | | | | | | contextual-help | ||||
| * | | | Override navbar help button to open contextual help panel. Contextual help ↵ | Andrew Manning | 2016-03-21 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | for mail written. | ||||
* | | | | For GNU-social discovery, use the URI in the feed (author.uri) rather than ↵ | redmatrix | 2016-04-03 | 2 | -11/+21 |
| | | | | | | | | | | | | | | | | try to pick out which of the aliases in webfinger are likely to be the right one. If we get it wrong, our communications with them will be discarded and there is no rhyme or reason to the logic about which representation is likely to be the one true account URI. It appears to vary with the clean_url setting of the site and this info isn't available to us except with a sequence of expensive probes and testing various ways of re-writing URLs to see if we get a response. | ||||
* | | | | Bug: "remember me" doesn't | redmatrix | 2016-04-03 | 2 | -3/+4 |
| | | | | |||||
* | | | | issue #138 ; make ajaxchat optional and configurable. For reasons we've ↵ | redmatrix | 2016-04-03 | 4 | -3/+12 |
| | | | | | | | | | | | | | | | | discussed repeatedly the ajax chat will not be removed from core as XMPP chat does not provide decentralised access control compatible with nomadic identity. | ||||
* | | | | Merge branch 'master' into dev | redmatrix | 2016-04-03 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | show chat expiration time in overview and minor fixes | Mario Vavti | 2016-04-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | use constant | redmatrix | 2016-04-02 | 1 | -1/+1 |
|/ / / | |||||
* | | | Chat Rooms -> Chatrooms | Mario Vavti | 2016-04-01 | 1 | -1/+1 |
| | | | |||||
* | | | change the App constructor | redmatrix | 2016-03-31 | 1 | -4/+1 |
| | | | |||||
* | | | create miniApp to convert existing settings files to the static App class | redmatrix | 2016-03-31 | 5 | -51/+23 |
| | | | |||||
* | | | issue #336 | redmatrix | 2016-03-31 | 2 | -3/+6 |
| | | | |||||
* | | | Merge branch 'static' | redmatrix | 2016-03-31 | 42 | -528/+528 |
|\ \ \ | |||||
| * | | | static App | redmatrix | 2016-03-31 | 42 | -528/+528 |
| | | | | |||||
* | | | | various fixes regarding mod chat | Mario Vavti | 2016-03-31 | 1 | -1/+1 |
| | | | | |||||
* | | | | mod chat rework continued | Mario Vavti | 2016-03-31 | 1 | -0/+8 |
|/ / / | |||||
* | | | deprecate $a->get_baseurl() | redmatrix | 2016-03-30 | 19 | -133/+133 |
| | | | |||||
* | | | issue #319 - NOTE: this does not fix the issue, it only reports it and ↵ | redmatrix | 2016-03-30 | 3 | -10/+31 |
| | | | | | | | | | | | | continues. We need to examine any logger statements that contain 'stack:' as a result of reporting this issue and find and fix the original problem - which is that set_pconfig is being called without a valid $uid. I'm worried that since we will now continue on without throwing a PHP error that nobody will ever notice or find the problem that is causing this. | ||||
* | | | more on mod chat | Mario Vavti | 2016-03-30 | 1 | -0/+1 |
| | | | |||||
* | | | some work on mod chat | Mario Vavti | 2016-03-30 | 3 | -10/+11 |
| | | | |||||
* | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-26 | 1 | -6/+20 |
|\ \ \ | |||||
| * | | | removed link to connected apps by accident | Mario Vavti | 2016-03-26 | 1 | -0/+6 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-26 | 3 | -252/+252 |
| |\ \ \ | |||||
| * | | | | move link to /locs to settings menu if we have more than one location and ↵ | Mario Vavti | 2016-03-26 | 1 | -6/+14 |
| | | | | | | | | | | | | | | | | | | | | some template work on locs | ||||
* | | | | | issue #319 part 2 | redmatrix | 2016-03-26 | 1 | -9/+11 |
| |/ / / |/| | | | |||||
* | | | | add hook to allow plugins to perform a follow activity from an activityfeed | redmatrix | 2016-03-23 | 1 | -4/+14 |
| |_|/ |/| | | |||||
* | | | atom specifies a uri or iri for the id. message_id isn't suitable here. | redmatrix | 2016-03-23 | 2 | -4/+5 |
| | | | |||||
* | | | rewrite the webfinger discovery logic | redmatrix | 2016-03-22 | 2 | -244/+233 |
|/ / | |||||
* | | update network_to_name (reserve DFRN for future use) | redmatrix | 2016-03-21 | 1 | -10/+12 |
| | | |||||
* | | attempting to work with braindead lighttpd gnusocial servers | redmatrix | 2016-03-21 | 1 | -2/+20 |
| | | |||||
* | | more federation work | redmatrix | 2016-03-20 | 2 | -32/+28 |
| | | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-20 | 1 | -0/+16 |
|\ \ | |||||
| * | | fix #328 by using a seperate query instead of group_concat | Mario Vavti | 2016-03-20 | 1 | -0/+16 |
| | | | |||||
* | | | rework salmon - important, update addons also if you have enabled gnusoc addon | redmatrix | 2016-03-20 | 1 | -196/+0 |
|/ / | |||||
* / | make the admin side menu extensible and provide a hook for a channel "move" ↵ | redmatrix | 2016-03-19 | 2 | -5/+16 |
|/ | | | | operation that federation plugins might use to re-establish connections after a channel move. | ||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-17 | 1 | -1/+9 |
|\ | |||||
| * | See issue https://github.com/redmatrix/hubzilla-addons/issues/17 (UNO: ↵ | jeroenpraat | 2016-03-17 | 1 | -1/+9 |
| | | | | | | | | enable the Diaspora protocol for all channels (if addon is enabled) - I had to do this during channel creation and not in the addon itself, or else the member can't change this after the channel is created. Tested it on UNO and normal Hubzilla. If this is not the right place for this, please move it. If not wanted at all, please discuss. | ||||
* | | no xchan here if using zot protocol | redmatrix | 2016-03-17 | 2 | -2/+4 |
|/ | |||||
* | typo | redmatrix | 2016-03-16 | 1 | -1/+1 |
| | |||||
* | more federation backend | redmatrix | 2016-03-16 | 2 | -7/+4 |
| | |||||
* | lots of work on federated channel discovery | redmatrix | 2016-03-16 | 3 | -65/+283 |
| | |||||
* | more federation backend work | redmatrix | 2016-03-15 | 1 | -4/+39 |
| | |||||
* | some heavy lifting porting the old salmon code | redmatrix | 2016-03-15 | 1 | -0/+201 |
| |