Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-09-05 | 1 | -2/+3 |
|\ | |||||
| * | 32 characters are often not enough to distinguish gnu-social mids - use the ↵ | Mario Vavti | 2017-09-05 | 1 | -2/+3 |
| | | | | | | | | entire mid. in /display if we are not dealing with posts (eg likes) provide the thr_parent mid as bParam_mid so we can still adress the right post in javascript | ||||
* | | some preliminary work on Zot VI | zotlabs | 2017-09-04 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-09-04 | 2 | -28/+15 |
|\| | |||||
| * | Default Access Control List (ACL) -> Default Privacy Group and minor ↵ | Mario Vavti | 2017-09-04 | 1 | -1/+1 |
| | | | | | | | | template fix | ||||
| * | whitespace | Mario Vavti | 2017-09-04 | 1 | -25/+13 |
| | | |||||
| * | fix the error reporting query in /display. we need item_deleted instead of ↵ | Mario Vavti | 2017-09-04 | 1 | -2/+1 |
| | | | | | | | | item_flags and remove id = $item_hash from the query since we always provide the mid and never the id iirc | ||||
* | | card embed improved | zotlabs | 2017-09-04 | 1 | -2/+2 |
|/ | |||||
* | validate the security context | zotlabs | 2017-09-03 | 1 | -3/+3 |
| | |||||
* | paths in xchan_addr no longer means RSS specifically but could be activitypub | zotlabs | 2017-09-03 | 1 | -1/+1 |
| | |||||
* | sign zot-info packets with httpsignatures | zotlabs | 2017-09-03 | 1 | -1/+28 |
| | |||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-03 | 2 | -4/+0 |
|\ | |||||
| * | Reviewed. This is OK. | zotlabs | 2017-09-03 | 2 | -4/+0 |
| | | | | | | | | | | | | 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 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 | 4 | -7/+11 |
|/ | | | | 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 | ||||
* | may be exploitable in current form - awaiting review | zotlabs | 2017-09-02 | 2 | -0/+4 |
| | |||||
* | some changes after testing server-to-server magic auth | zotlabs | 2017-08-31 | 2 | -12/+17 |
| | |||||
* | add server-to-server magic auth to dav and cdav controllers | zotlabs | 2017-08-31 | 2 | -28/+119 |
| | |||||
* | whitespace | zotlabs | 2017-08-30 | 1 | -22/+19 |
| | |||||
* | missing include | zotlabs | 2017-08-30 | 1 | -0/+2 |
| | |||||
* | some issues with mod_display on very first anonymous page visit (prior to ↵ | zotlabs | 2017-08-30 | 2 | -9/+9 |
| | | | | any browser cookies being set) | ||||
* | issue with mentions and xchans with @ or / | zotlabs | 2017-08-30 | 1 | -3/+1 |
| | |||||
* | hubzilla issue #851 | zotlabs | 2017-08-29 | 1 | -1/+1 |
| | |||||
* | fix category links in card bodies | zotlabs | 2017-08-29 | 1 | -1/+10 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-08-24 | 2 | -19/+8 |
|\ | |||||
| * | Merge pull request #849 from anaqreon/doco | git-marijus | 2017-08-24 | 1 | -1/+4 |
| |\ | | | | | | | Added language selector menu for Help pages | ||||
| | * | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2017-08-24 | 11 | -24/+508 |
| | |\ | |||||
| | * | | Added language selector menu for Help pages | Andrew Manning | 2017-08-24 | 1 | -1/+4 |
| | | | | |||||
| * | | | ditch discover tab in favour of the public stream app | git-marijus | 2017-08-24 | 1 | -18/+4 |
| | |/ | |/| | |||||
* | | | fix title of edit card which showed up as 'edit block' due to copy/paste | zotlabs | 2017-08-24 | 1 | -1/+1 |
| | | | |||||
* | | | cards - change placeholdertext, separate from button text | zotlabs | 2017-08-24 | 1 | -0/+2 |
| | | | |||||
* | | | make cards searchable | zotlabs | 2017-08-24 | 1 | -11/+13 |
| | | | |||||
* | | | fix permalinks for card comments (send to parent url) | zotlabs | 2017-08-24 | 1 | -0/+11 |
|/ / | |||||
* | | last remaining task in tasklist was not removed from view when 'completed' | zotlabs | 2017-08-23 | 1 | -1/+2 |
| | | |||||
* | | cards: make page load after comment post | zotlabs | 2017-08-23 | 1 | -37/+33 |
| | | |||||
* | | partial support (unfinished) for ajax loading cards with liveupdate; page ↵ | zotlabs | 2017-08-23 | 2 | -3/+41 |
| | | | | | | | | still functions even though this isn't finished | ||||
* | | oembed provider cleanup, add oembed to cards | zotlabs | 2017-08-23 | 6 | -14/+139 |
| | | |||||
* | | add new conv_sort option | zotlabs | 2017-08-23 | 1 | -1/+1 |
| | | |||||
* | | fix permalink for cards | zotlabs | 2017-08-23 | 1 | -0/+4 |
| | | |||||
* | | cards: acl support | zotlabs | 2017-08-23 | 1 | -0/+1 |
| | | |||||
* | | add category support to main page | zotlabs | 2017-08-23 | 1 | -0/+3 |
| | | |||||
* | | several card enhancements | zotlabs | 2017-08-23 | 2 | -32/+157 |
| | | |||||
* | | cards feature | zotlabs | 2017-08-23 | 1 | -0/+189 |
| | | |||||
* | | remove debugging | zotlabs | 2017-08-21 | 1 | -4/+4 |
| | | |||||
* | | more work on oembed from /display | zotlabs | 2017-08-21 | 3 | -8/+10 |
|/ | |||||
* | stream_perms_xchans wasn't working which has effects in mod_display and ↵ | zotlabs | 2017-08-21 | 1 | -21/+43 |
| | | | | there are also issues with the oembed provider for mod_display. This is a first cut for the second but hasn't yet been tested | ||||
* | some issues with message-ids and urlencoding (again) | zotlabs | 2017-08-20 | 1 | -2/+1 |
| | |||||
* | a few file activities were not getting synced | zotlabs | 2017-08-20 | 2 | -1/+21 |
| | |||||
* | issue with oembed of a shared item, which wraps in another share. | zotlabs | 2017-08-20 | 1 | -10/+20 |
| | |||||
* | more work on mod_display | zotlabs | 2017-08-19 | 1 | -1/+2 |
| |