Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-09-03 | 15 | -20/+58 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-03 | 3 | -6/+1 |
| |\ | |||||
| * | | this fixes an issue where in /channel/membername?mid=some_mid updates did ↵ | Mario Vavti | 2017-09-03 | 1 | -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 Vavti | 2017-09-03 | 5 | -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 dev | Mario Vavti | 2017-09-02 | 3 | -1/+6 |
| |\ \ | |||||
| * | | | add combined index for item.uid and item.item_unseen. this speeds up ↵ | Mario Vavti | 2017-09-01 | 7 | -11/+27 |
| | | | | | | | | | | | | | | | | notifications by a magnitude. | ||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-09-01 | 2 | -1/+9 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #850 from anaqreon/doco | git-marijus | 2017-09-01 | 2 | -1/+9 |
| | |\ \ \ | | | | | | | | | | | | | Fix the multiple table of content bug | ||||
| | | * \ \ | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2017-08-27 | 12 | -118/+7142 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2017-08-25 | 4 | -39/+8 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Removed duplicated table of contents (TOC) in Help pages by breaking ↵ | Andrew Manning | 2017-08-25 | 2 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hierarchical TOC loading. | ||||
| * | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-01 | 7 | -49/+210 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | changelog | git-marijus | 2017-08-31 | 1 | -0/+4 |
| | | | | | | | | |||||
* | | | | | | | | only validate headers that aren't "spoofable", which will be somewhat ↵ | zotlabs | 2017-09-03 | 1 | -3/+8 |
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | implementation dependent. | ||||
* | | | | | | | Reviewed. This is OK. | zotlabs | 2017-09-03 | 3 | -6/+1 |
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "may be exploitable in current form - awaiting review" This reverts commit 7bff60edacd68ef3dccf6f956e9c57092919950a. | ||||
* | | | | | | may be exploitable in current form - awaiting review | zotlabs | 2017-09-02 | 3 | -1/+6 |
| |/ / / / |/| | | | | |||||
* | | | | | cut down on a few extraneous gprobe processes | zotlabs | 2017-08-31 | 2 | -2/+4 |
| | | | | | |||||
* | | | | | some changes after testing server-to-server magic auth | zotlabs | 2017-08-31 | 4 | -22/+36 |
| | | | | | |||||
* | | | | | add server-to-server magic auth to dav and cdav controllers | zotlabs | 2017-08-31 | 3 | -29/+120 |
| | | | | | |||||
* | | | | | server to server magic auth | zotlabs | 2017-08-31 | 1 | -2/+50 |
| | | | | | |||||
* | | | | | simplify api_auth | zotlabs | 2017-08-31 | 1 | -15/+9 |
| | | | | | |||||
* | | | | | now letsencrypt is creating a .htaccess file with re-write rules which kills ↵ | zotlabs | 2017-08-31 | 1 | -0/+12 |
|/ / / / | | | | | | | | | | | | | most of our .well-known routes | ||||
* | | | | whitespace | zotlabs | 2017-08-30 | 1 | -22/+19 |
| | | | | |||||
* | | | | missing include | zotlabs | 2017-08-30 | 1 | -0/+2 |
| | | | | |||||
* | | | | check input is hex before sending it to hex2bin | zotlabs | 2017-08-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | some issues with mod_display on very first anonymous page visit (prior to ↵ | zotlabs | 2017-08-30 | 5 | -13/+15 |
| | | | | | | | | | | | | | | | | any browser cookies being set) | ||||
* | | | | issue with mentions and xchans with @ or / | zotlabs | 2017-08-30 | 2 | -4/+2 |
| | | | | |||||
* | | | | hubzilla issue #851 | zotlabs | 2017-08-29 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-08-29 | 6 | -36/+71 |
|\ \ \ \ | |||||
| * | | | | remove obsolete class | Mario Vavti | 2017-08-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | version | git-marijus | 2017-08-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'mike/master' into dev | git-marijus | 2017-08-28 | 3 | -3/+46 |
| |\ \ \ \ | |||||
| * | | | | | rewrite comment form handling | git-marijus | 2017-08-28 | 5 | -35/+70 |
| | |_|_|/ | |/| | | | |||||
* | | | | | bring back nomadic locations | zotlabs | 2017-08-29 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | add a nonce | zotlabs | 2017-08-29 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | use iso 8601 "Zulu" for log timestamps so it can be easily processed with ↵ | zotlabs | 2017-08-29 | 2 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | fail2ban | ||||
* | | | | | escape 'http' inside code blocks so it doesn't trigger an oembed | zotlabs | 2017-08-29 | 2 | -0/+5 |
| | | | | | |||||
* | | | | | fix category links in card bodies | zotlabs | 2017-08-29 | 1 | -1/+10 |
| | | | | | |||||
* | | | | | add reliable signatures | zotlabs | 2017-08-29 | 1 | -1/+34 |
| | | | | | |||||
* | | | | | add editor autocompleters on cards page | zotlabs | 2017-08-28 | 1 | -0/+6 |
| | | | | | |||||
* | | | | | use top level for verification | zotlabs | 2017-08-28 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | provide support for json-ld signatures ↵ | zotlabs | 2017-08-28 | 1 | -0/+81 |
| |/ / / |/| | | | | | | | | | | | (https://w3c-dvcg.github.io/ld-signatures/) | ||||
* | | | | AS2: recipient collection | zotlabs | 2017-08-27 | 1 | -1/+42 |
| | | | | |||||
* | | | | fix issue with comment box re-opening after submit; however I should note ↵ | zotlabs | 2017-08-27 | 1 | -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 opened | zotlabs | 2017-08-27 | 1 | -1/+1 |
|/ / / | |||||
* | | | fix titles on ajaxupdate issue, add jsonld-php library | zotlabs | 2017-08-26 | 6 | -2/+7058 |
| | | | |||||
* | | | radically reduce code duplication in updateConvItems(); it's a bit easier to ↵ | zotlabs | 2017-08-25 | 1 | -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_merge | zotlabs | 2017-08-24 | 8 | -128/+209 |
|\ \ \ | | |/ | |/| | |||||
| * | | minor adjustmen to the help language selector | git-marijus | 2017-08-24 | 2 | -3/+3 |
| | | | |||||
| * | | Merge pull request #849 from anaqreon/doco | git-marijus | 2017-08-24 | 4 | -2/+93 |
| |\| | | | | | | | Added language selector menu for Help pages |