aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)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 urlsTreer2016-06-261-1/+1
| * | Merge pull request #438 from anaqreon/wikihubzilla2016-06-263-27/+178
| |\ \
| | * | A page name wrapped in double brackets is converted into a link to another pa...Andrew Manning2016-06-253-5/+32
| | * | 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 bug...Andrew Manning2016-06-253-22/+146
| * | | | Merge pull request #440 from Treer/mischubzilla2016-06-261-1/+1
| |\ \ \ \
| | * | | | 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 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
* | | 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 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 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 t...redmatrix2016-06-232-1/+112
| * | db update for abconfig transitionredmatrix2016-06-234-4/+40
| * | change AbConfig to use channel_id instead of channel_hash; which was a mistak...redmatrix2016-06-237-32/+30
| * | 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 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 unquot...redmatrix2016-06-221-4/+4
| * | db statement debuggingredmatrix2016-06-223-6/+8
| * | use the normal html escape for '@' in addresses rather than the high-plane un...redmatrix2016-06-223-3/+3
| |/
* | erge branch 'dev' into sabre32Mario Vavti2016-06-2214-77/+842
|\|
| * provide a skeleton of the current CalDAVClient with lots of notes about how b...redmatrix2016-06-211-0/+739
| * 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 imported...redmatrix2016-06-219-53/+69
| * | 1. provide automatic relocation of important links in items that are imported...redmatrix2016-06-219-53/+69
| |/
* | 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
| | |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 00:41:51 +0000