Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-24 | 7 | -104/+62 |
|\ | |||||
| * | change AbConfig to use channel_id instead of channel_hash; which was a ↵ | redmatrix | 2016-06-23 | 3 | -12/+11 |
| | | | | | | | | mistake in retrospect | ||||
| * | relocate the cache class | redmatrix | 2016-06-23 | 3 | -72/+6 |
| | | |||||
| * | code cleanup for profile_photos | redmatrix | 2016-06-23 | 1 | -20/+45 |
| | | |||||
* | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-23 | 4 | -7/+10 |
|\| | |||||
| * | the xchan_query wasn't fully optimised as we were comparing quoted and ↵ | redmatrix | 2016-06-22 | 1 | -4/+4 |
| | | | | | | | | unquoted strings when looking for duplicates | ||||
| * | db statement debugging | redmatrix | 2016-06-22 | 1 | -1/+4 |
| | | |||||
| * | use the normal html escape for '@' in addresses rather than the high-plane ↵ | redmatrix | 2016-06-22 | 2 | -2/+2 |
| | | | | | | | | unicode variant. This makes it copy-able, but not easily scrape-able. | ||||
* | | erge branch 'dev' into sabre32 | Mario Vavti | 2016-06-22 | 5 | -46/+61 |
|\| | |||||
| * | vcard spec changes | redmatrix | 2016-06-21 | 1 | -0/+1 |
| | | |||||
| * | 1. provide automatic relocation of important links in items that are ↵ | redmatrix | 2016-06-21 | 5 | -46/+60 |
| | | | | | | | | | | | | | | imported or synced to clones 2. provide framework for custom curl request bodies using custom/non-standard request methods. This was a real nightmare because curl doesn't actually let you specify a string to send as the request body (except when doing POST). You have to treat it as a file upload using a custom file handler function which provides the actual content in chunks as if it were buffered I/O. 3. item_store and item_store_update now return the item that was stored | ||||
* | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-21 | 5 | -12/+53 |
|\| | |||||
| * | make sure the optimisations are reliable | redmatrix | 2016-06-20 | 1 | -1/+1 |
| | | |||||
| * | code optimisation | redmatrix | 2016-06-20 | 3 | -9/+8 |
| | | |||||
| * | update attach on import if exists | redmatrix | 2016-06-20 | 1 | -2/+2 |
| | | |||||
| * | Merge pull request #429 from anaqreon/wiki | hubzilla | 2016-06-21 | 1 | -1/+43 |
| |\ | | | | | | | Wiki page revision comparison viewer | ||||
| | * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-20 | 6 | -13/+25 |
| | |\ | |||||
| | * \ | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-17 | 3 | -8/+33 |
| | |\ \ | |||||
| | * | | | Wiki page revision comparison tool with diff displayed in modal dialog. ↵ | Andrew Manning | 2016-06-17 | 1 | -1/+43 |
| | | | | | | | | | | | | | | | | | | | | Leverages Diff class from http://code.stephenmorley.org/php/diff-implementation with license CC0 1.0 universal http://creativecommons.org/publicdomain/zero/1.0/legalcode | ||||
* | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 1 | -1/+1 |
|\| | | | | |||||
| * | | | | Merge branch 'master' into dev | Mario Vavti | 2016-06-20 | 1 | -1/+1 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Merge branch '1.8RC' | redmatrix | 2016-06-19 | 75 | -8346/+2856 |
| | |\ \ \ | |||||
| | | * | | | add new connection to default group when auto-accepted | redmatrix | 2016-06-15 | 2 | -1/+11 |
| | | | | | | |||||
| | | * | | | DB schema issue with import | redmatrix | 2016-06-12 | 1 | -12/+26 |
| | | | | | | |||||
| | | * | | | Apply purify_html to page content before preview and save to prevent ↵ | Andrew Manning | 2016-06-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | JavaScript code injection. | ||||
| | * | | | | When picktime is false, close date selector on date select | Oda | 2016-06-18 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | issue #386 (master) | redmatrix | 2016-05-16 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | issue #383 | redmatrix | 2016-05-14 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | SECURITY: edited comment to private post loses privacy info. Not visible in ↵ | redmatrix | 2016-05-12 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | stream but may be visible in feeds | ||||
* | | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 2 | -11/+16 |
|\| | | | | | |||||
| * | | | | | Don't use count() to check DB results | redmatrix | 2016-06-19 | 2 | -11/+16 |
| | | | | | | |||||
* | | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-18 | 4 | -2/+9 |
|\| | | | | | |||||
| * | | | | | the text link to a thing will take you to the local thing page, both as a ↵ | redmatrix | 2016-06-17 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | link for editing and as a destination in case there is no thing photo. If there's a photo, the photo link will take you to the thing URL. | ||||
| * | | | | | 1. string update, 2. pretty print json blobs | redmatrix | 2016-06-17 | 2 | -1/+7 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-17 | 4 | -8/+38 |
|\| | | | | |||||
| * | | | | core changes to better support media migrations | redmatrix | 2016-06-16 | 3 | -8/+33 |
| | |_|/ | |/| | | |||||
| * | | | code comments | redmatrix | 2016-06-15 | 1 | -0/+5 |
| | | | | |||||
* | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-16 | 4 | -12/+114 |
|\| | | | |||||
| * | | | custom request methods for curl | redmatrix | 2016-06-15 | 1 | -3/+13 |
| | | | | |||||
| * | | | provide a default for undefined languages | redmatrix | 2016-06-15 | 1 | -0/+1 |
| | | | | |||||
| * | | | ignore case in language names and add 'js' as an alias for 'javascript' | redmatrix | 2016-06-15 | 2 | -4/+6 |
| | | | | |||||
| * | | | Merge pull request #422 from anaqreon/wiki | hubzilla | 2016-06-16 | 1 | -9/+46 |
| |\ \ \ | | | | | | | | | | | Wiki rename page feature added. Bug fixes related to git commits. | ||||
| | * \ \ | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-15 | 2 | -1/+11 |
| | |\ \ \ | |||||
| | * | | | | Rename page feature added. Fixed bug in git commit function and other minor ↵ | Andrew Manning | 2016-06-15 | 1 | -9/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | fixes. | ||||
| * | | | | | This was the reason for the large line widths - an extra linefeed after each ↵ | redmatrix | 2016-06-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | li element | ||||
| * | | | | | provide syntax based [colour] highlighting on code blocks for popular ↵ | redmatrix | 2016-06-15 | 2 | -0/+52 |
| | |/ / / | |/| | | | | | | | | | | | | | languages. I'm not happy with the line height on the list elements but couldn't see where this was defaulted. This uses the syntax [code=xxx]some code snippet[/code], where xxx represents a code/language style - with about 18 builtins. | ||||
* | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-15 | 2 | -1/+11 |
|\| | | | | |||||
| * | | | | add new connection to default group when auto-accepted | redmatrix | 2016-06-15 | 2 | -1/+11 |
| |/ / / | |||||
* | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-14 | 11 | -75/+101 |
|\| | | | |||||
| * | | | some work to provide propagation and honouring of the item_notshown flag. | redmatrix | 2016-06-13 | 2 | -8/+23 |
| | | | |