aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add some doco on some of the issues and approaches to file/photo syncing and ↵redmatrix2016-04-051-0/+61
| | | | cloning
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-0514-78/+297
|\
| * fix contextual helpMario Vavti2016-04-052-4/+3
| |
| * use min version of justifiedGalleryMario Vavti2016-04-051-1/+1
| |
| * expand list of bbcode in autocompleteMario Vavti2016-04-051-3/+6
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-04-059-5/+190
| |\
| | * Merge pull request #338 from anaqreon/contextual-helpredmatrix2016-04-059-5/+190
| | |\ | | | | | | | | Contextual help
| | | * Merge branch 'master' of https://github.com/redmatrix/hubzilla into ↵Andrew Manning2016-04-03292-61382/+62954
| | | |\ | | | | | | | | | | | | | | | contextual-help
| | | * | More help content for channel pages. Channel, photos, files, about.Andrew Manning2016-03-264-1/+71
| | | | |
| | | * | Search docs/context/ hierarchically for help.html files to reduce redundancyAndrew Manning2016-03-266-42/+27
| | | | |
| | | * | Added help for post permissionsAndrew Manning2016-03-262-3/+4
| | | | |
| | | * | Merge branch 'master' of https://github.com/redmatrix/hubzilla into ↵Andrew Manning2016-03-2331-3052/+2924
| | | |\ \ | | | | | | | | | | | | | | | | | | contextual-help
| | | * | | Network page help with auto-scroll and element highlightingAndrew Manning2016-03-231-0/+26
| | | | | |
| | | * | | Override navbar help button to open contextual help panel. Contextual help ↵Andrew Manning2016-03-218-5/+108
| | | | | | | | | | | | | | | | | | | | | | | | for mail written.
| * | | | | update upstream lib jusutifiedGalleryMario Vavti2016-04-055-70/+102
| |/ / / /
* | | | | Merge branch 'master' into devredmatrix2016-04-051-1/+1
|\ \ \ \ \
| * | | | | revup issue #337redmatrix2016-04-051-1/+1
| | | | | |
* | | | | | explain the two aspects of federation which need to be handled in core to ↵redmatrix2016-04-041-2/+5
| |/ / / / |/| | | | | | | | | | | | | | pass comments successfully amongst sites which optionally provide federation. Let's hope this list doesn't grow.
* | | | | SECURITY: Do not link unknown and unverified code repositories to the ↵redmatrix2016-04-043-5/+36
| | | | | | | | | | | | | | | | | | | | project without some form of confirmation that one accepts the significant risks involved.
* | | | | Merge branch 'master' into devredmatrix2016-04-041-1/+1
|\| | | |
| * | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_mergeredmatrix2016-04-043-6/+10
| |\ \ \ \
| * | | | | revup - issue #337redmatrix2016-04-041-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into devMario Vavti2016-04-043-0/+43
|\ \ \ \ \
| * | | | | a simple autocomplete for bbcode or comanche - partly implementedMario Vavti2016-04-043-0/+43
| | |/ / / | |/| | |
* | | | | Merge branch 'master' into devMario Vavti2016-04-041-1/+1
|\| | | |
| * | | | do not use dropdown class if there is nothing to dropdownMario Vavti2016-04-041-1/+1
| | | | |
* | | | | Merge branch 'master' into devMario Vavti2016-04-042-5/+9
|\| | | |
| * | | | whitespaceMario Vavti2016-04-041-2/+0
| | | | |
| * | | | whitespaceMario Vavti2016-04-041-1/+0
| | | | |
| * | | | fullscreen mode for photo albums viewMario Vavti2016-04-042-3/+10
| |/ / /
* | | | For GNU-social discovery, use the URI in the feed (author.uri) rather than ↵redmatrix2016-04-032-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.
* | | | provide a backup copy of prior notes widget content if the contents were ↵redmatrix2016-04-031-1/+11
| | | | | | | | | | | | | | | | just nuked.
* | | | Bug: "remember me" doesn'tredmatrix2016-04-035-5/+11
| | | |
* | | | issue #138 ; make ajaxchat optional and configurable. For reasons we've ↵redmatrix2016-04-035-3/+18
| | | | | | | | | | | | | | | | 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 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-030-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'master' into devMario Vavti2016-04-033-17/+16
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into devMario Vavti2016-04-031-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into devMario Vavti2016-04-0313-1034/+2093
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into devMario Vavti2016-04-035-5/+65
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-04-033-10/+10
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into devMario Vavti2016-04-035-11/+20
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'master' into devredmatrix2016-04-0325-1070/+2197
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_mergeredmatrix2016-04-0324-1069/+2196
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | various fixesMario Vavti2016-04-033-17/+16
| | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | reduce chat-item-title fontsize to match wall-item-agoMario Vavti2016-04-031-2/+2
| | | |_|_|/ / / | | |/| | | | |
| | * | | | | | update upstream libs fullcalendar and moment to a recent versionMario Vavti2016-04-0313-1034/+2093
| | | |_|/ / / | | |/| | | |
| | * | | | | fullscreen mode for eventsMario Vavti2016-04-035-5/+65
| | | |/ / / | | |/| | |
| | * | | | show chat expiration time in overview and minor fixesMario Vavti2016-04-035-11/+20
| | | | | |
| * | | | | issue #337redmatrix2016-04-031-1/+1
| |/ / / /
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-020-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |