aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2017-09-033-6/+1
|\
| * Reviewed. This is OK.zotlabs2017-09-033-6/+1
| | | | | | | | | | | | Revert "may be exploitable in current form - awaiting review" This reverts commit 7bff60edacd68ef3dccf6f956e9c57092919950a.
* | this fixes an issue where in /channel/membername?mid=some_mid updates did ↵Mario Vavti2017-09-031-1/+1
| | | | | | | | not work when static updates were enabled. since in the current situation we always get a top-level-post mid, item_thread_top = 0 in the query will never return a result. change it to item_thread_top = 1
* | introduce item_normal_update(). the differnce to item_normal() is that we do ↵Mario Vavti2017-09-035-7/+17
| | | | | | | | not query for item_deleted = 0 and therefor can find deleted likes which allows us to update our unlikes on the fly if static page update is enabled
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-09-023-1/+6
|\|
| * may be exploitable in current form - awaiting reviewzotlabs2017-09-023-1/+6
| |
* | add combined index for item.uid and item.item_unseen. this speeds up ↵Mario Vavti2017-09-017-11/+27
| | | | | | | | notifications by a magnitude.
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-09-012-1/+9
|\ \
| * \ Merge pull request #850 from anaqreon/docogit-marijus2017-09-012-1/+9
| |\ \ | | | | | | | | Fix the multiple table of content bug
| | * \ Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2017-08-2712-118/+7142
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2017-08-254-39/+8
| | |\ \ \
| | * | | | Removed duplicated table of contents (TOC) in Help pages by breaking ↵Andrew Manning2017-08-252-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | hierarchical TOC loading.
* | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-09-017-49/+210
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | cut down on a few extraneous gprobe processeszotlabs2017-08-312-2/+4
| | | | |
| * | | | some changes after testing server-to-server magic authzotlabs2017-08-314-22/+36
| | | | |
| * | | | add server-to-server magic auth to dav and cdav controllerszotlabs2017-08-313-29/+120
| | | | |
| * | | | server to server magic authzotlabs2017-08-311-2/+50
| | | | |
| * | | | simplify api_authzotlabs2017-08-311-15/+9
| | | | |
| * | | | now letsencrypt is creating a .htaccess file with re-write rules which kills ↵zotlabs2017-08-311-0/+12
| | | | | | | | | | | | | | | | | | | | most of our .well-known routes
* | | | | changeloggit-marijus2017-08-311-0/+4
|/ / / /
* | | | whitespacezotlabs2017-08-301-22/+19
| | | |
* | | | missing includezotlabs2017-08-301-0/+2
| | | |
* | | | check input is hex before sending it to hex2binzotlabs2017-08-301-1/+1
| | | |
* | | | some issues with mod_display on very first anonymous page visit (prior to ↵zotlabs2017-08-305-13/+15
| | | | | | | | | | | | | | | | any browser cookies being set)
* | | | issue with mentions and xchans with @ or /zotlabs2017-08-302-4/+2
| | | |
* | | | hubzilla issue #851zotlabs2017-08-291-1/+1
| | | |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-296-36/+71
|\ \ \ \
| * | | | remove obsolete classMario Vavti2017-08-281-1/+1
| | | | |
| * | | | versiongit-marijus2017-08-281-1/+1
| | | | |
| * | | | Merge remote-tracking branch 'mike/master' into devgit-marijus2017-08-283-3/+46
| |\ \ \ \
| * | | | | rewrite comment form handlinggit-marijus2017-08-285-35/+70
| | |_|_|/ | |/| | |
* | | | | bring back nomadic locationszotlabs2017-08-291-0/+2
| | | | |
* | | | | add a noncezotlabs2017-08-291-0/+1
| | | | |
* | | | | use iso 8601 "Zulu" for log timestamps so it can be easily processed with ↵zotlabs2017-08-292-4/+7
| | | | | | | | | | | | | | | | | | | | fail2ban
* | | | | escape 'http' inside code blocks so it doesn't trigger an oembedzotlabs2017-08-292-0/+5
| | | | |
* | | | | fix category links in card bodieszotlabs2017-08-291-1/+10
| | | | |
* | | | | add reliable signatureszotlabs2017-08-291-1/+34
| | | | |
* | | | | add editor autocompleters on cards pagezotlabs2017-08-281-0/+6
| | | | |
* | | | | use top level for verificationzotlabs2017-08-281-1/+1
| | | | |
* | | | | provide support for json-ld signatures ↵zotlabs2017-08-281-0/+81
| |/ / / |/| | | | | | | | | | | (https://w3c-dvcg.github.io/ld-signatures/)
* | | | AS2: recipient collectionzotlabs2017-08-271-1/+42
| | | |
* | | | fix issue with comment box re-opening after submit; however I should note ↵zotlabs2017-08-271-1/+3
| | | | | | | | | | | | | | | | that bind and unbind are deprecated in jquery > 1.3 and these calls probably need to be upgraded.
* | | | fix card category widget links when a specific card is openedzotlabs2017-08-271-1/+1
|/ / /
* | | fix titles on ajaxupdate issue, add jsonld-php libraryzotlabs2017-08-266-2/+7058
| | |
* | | radically reduce code duplication in updateConvItems(); it's a bit easier to ↵zotlabs2017-08-251-109/+55
| | | | | | | | | | | | understand now although the different modes aren't as cleanly separated as they were.
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-248-128/+209
|\ \ \ | | |/ | |/|
| * | minor adjustmen to the help language selectorgit-marijus2017-08-242-3/+3
| | |
| * | Merge pull request #849 from anaqreon/docogit-marijus2017-08-244-2/+93
| |\| | | | | | | Added language selector menu for Help pages
| | * Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2017-08-2433-64/+904
| | |\
| | * | Added language selector menu for Help pagesAndrew Manning2017-08-244-2/+93
| | | |