aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into sabre32Mario Vavti2016-06-265-36/+199
|\
| * Merge pull request #441 from Treer/cdnhubzilla2016-06-261-1/+1
| |\ | | | | | | fix absolute .js urls
| | * fix absolute .js urlsTreer2016-06-261-1/+1
| | |
| * | Merge pull request #438 from anaqreon/wikihubzilla2016-06-263-27/+178
| |\ \ | | | | | | | | Wiki post generation option and image embed tool
| | * | A page name wrapped in double brackets is converted into a link to another ↵Andrew Manning2016-06-253-5/+32
| | | | | | | | | | | | | | | | page in the current wiki
| | * | Insert image links wherever cursor is in the editorAndrew Manning2016-06-251-2/+2
| | | |
| | * | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-2536-3770/+3959
| | |\ \
| | * | | Post generation about new wiki is optional, default is NOT to post. Fixed ↵Andrew Manning2016-06-253-22/+146
| | | | | | | | | | | | | | | | | | | | bug in wiki creation. Added embed image dialog and album browser.
| * | | | Merge pull request #440 from Treer/mischubzilla2016-06-261-1/+1
| |\ \ \ \ | | | | | | | | | | | | fix help link
| | * | | | fix help linkTreer2016-06-261-1/+1
| | | |/ / | | |/| |
| * | | | Merge pull request #439 from Treer/cdnhubzilla2016-06-261-8/+20
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| Allow absolute links to css and js files (for CDN links)
| | * | Allow absolute links to css and js filesTreer2016-06-251-8/+20
| |/ /
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-257-53/+59
|\| |
| * | Improvements to help pagesAlexandre Hannud Abdo2016-06-256-44/+51
| | |
| * | media (e.g. video) files weren't being detected correctly in oembed, causing ↵redmatrix2016-06-251-9/+8
| | | | | | | | | | | | the stream to try and load large videos (and failing)
* | | 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