aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into sabre32Mario Vavti2016-06-2426-3696/+3867
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-241-1/+1
| |\
| | * Merge pull request #435 from dissolve/microformats2hubzilla2016-06-241-1/+1
| | |\ | | | | | | | | add url permalink mf2 markup
| | | * add url permalink mf2 markupBen Roberts2016-06-241-1/+1
| | | |
| * | | fix pdledit "list layouts"redmatrix2016-06-242-3515/+3522
| |/ /
| * | Merge pull request #434 from dissolve/microformats2hubzilla2016-06-241-1/+1
| |\| | | | | | | p-author missing from embedded h-card in items
| | * p-author missing from embedded h-card in itemsBen Roberts2016-06-231-1/+1
| |/
| * make dropdown-caret invoke the dropdownredmatrix2016-06-231-1/+1
| |
| * SuperCurl to provide a re-usable curl options stack and just change options ↵redmatrix2016-06-232-1/+112
| | | | | | | | that are different from one call to the next
| * db update for abconfig transitionredmatrix2016-06-234-4/+40
| |
| * change AbConfig to use channel_id instead of channel_hash; which was a ↵redmatrix2016-06-237-32/+30
| | | | | | | | mistake in retrospect
| * relocate the cache classredmatrix2016-06-235-73/+52
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-231-6/+6
| |\
| * | code cleanup for profile_photosredmatrix2016-06-236-68/+108
| | |
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-238-24/+36
|\ \ \ | | |/ | |/|
| * | Merge pull request #433 from dissolve/microformats2hubzilla2016-06-231-6/+6
| |\ \ | | |/ | |/| microformats 2 for posts
| | * microformats 2 for postsBen Roberts2016-06-221-6/+6
| | |
| * | set profile when "use existing photo"redmatrix2016-06-221-4/+14
| | |
| * | missing class selector when "use photo as profile photo"redmatrix2016-06-221-1/+1
| |/
| * the xchan_query wasn't fully optimised as we were comparing quoted and ↵redmatrix2016-06-221-4/+4
| | | | | | | | unquoted strings when looking for duplicates
| * db statement debuggingredmatrix2016-06-223-6/+8
| |
| * use the normal html escape for '@' in addresses rather than the high-plane ↵redmatrix2016-06-223-3/+3
| | | | | | | | unicode variant. This makes it copy-able, but not easily scrape-able.
* | erge branch 'dev' into sabre32Mario Vavti2016-06-2214-77/+842
|\|
| * provide a skeleton of the current CalDAVClient with lots of notes about how ↵redmatrix2016-06-211-0/+739
| | | | | | | | best to move forward just in case anybody is feeling ambitious or anxious.
| * channel homepage not providing content when javascript disabledredmatrix2016-06-211-0/+3
| |
| * vcard spec changesredmatrix2016-06-214-24/+31
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-210-0/+0
| |\
| | * 1. provide automatic relocation of important links in items that are ↵redmatrix2016-06-219-53/+69
| | | | | | | | | | | | | | | | | | 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.
| * | 1. provide automatic relocation of important links in items that are ↵redmatrix2016-06-219-53/+69
| |/ | | | | | | | | | | | | 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 sabre32Mario Vavti2016-06-2110-50/+565
|\|
| * make sure the optimisations are reliableredmatrix2016-06-201-1/+1
| |
| * code optimisationredmatrix2016-06-204-30/+13
| |
| * update attach on import if existsredmatrix2016-06-201-2/+2
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-2045-86804/+62098
| |\
| | * Merge pull request #429 from anaqreon/wikihubzilla2016-06-215-17/+550
| | |\ | | | | | | | | Wiki page revision comparison viewer
| | | * Merge branch 'dev' into wikiAndrew Manning2016-06-200-0/+0
| | | |\
| | | | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2016-06-2047-1150/+22931
| | | | |\
| | | | * \ Merge remote-tracking branch 'upstream/dev' into devAndrew Manning2016-06-1673-553/+25128
| | | | |\ \
| | | | * \ \ Merge remote-tracking branch 'upstream/dev' into devAndrew Manning2016-06-1535-167/+392
| | | | |\ \ \
| | | | * | | | Move Spanish context help translation from es to es-es and make es a symlink ↵Andrew Manning2016-06-1315-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to es-es
| | | * | | | | Add formatted heading for revision comparison viewerAndrew Manning2016-06-201-1/+2
| | | | | | | |
| | | * | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-2042-1139/+22890
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | Do not change active page commit until user reverts the pageAndrew Manning2016-06-201-1/+2
| | | | | | | |
| | | * | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-176-11/+41
| | | |\ \ \ \ \
| | | * | | | | | Wiki page revision comparison tool with diff displayed in modal dialog. ↵Andrew Manning2016-06-175-17/+548
| | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | fix siteinfo plugin listredmatrix2016-06-201-2/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-201-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | last merge from master did reset the std_version to 1.8 - set it back to 1.9 ↵Mario Vavti2016-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | for dev
* | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-2040-86788/+61549
|\| | | | | |
| * | | | | | Merge branch 'master' into devMario Vavti2016-06-2040-86788/+61549
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |