Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-10 | 2 | -24/+7 | |
|\ | ||||||
| * | owa cleanup | zotlabs | 2017-09-09 | 2 | -24/+7 | |
| | | ||||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-09 | 1 | -9/+9 | |
|\| | ||||||
| * | owa: missed the set-observer stuff | zotlabs | 2017-09-08 | 1 | -9/+9 | |
| | | ||||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-08 | 8 | -8/+162 | |
|\| | ||||||
| * | provide root discovery for owa | zotlabs | 2017-09-07 | 1 | -4/+31 | |
| | | ||||||
| * | provide owa discovery | zotlabs | 2017-09-07 | 1 | -0/+7 | |
| | | ||||||
| * | initial testing success with owa | zotlabs | 2017-09-07 | 3 | -3/+3 | |
| | | ||||||
| * | there's the problem | zotlabs | 2017-09-07 | 1 | -1/+1 | |
| | | ||||||
| * | add logging | zotlabs | 2017-09-07 | 1 | -0/+3 | |
| | | ||||||
| * | owa - first commit | zotlabs | 2017-09-07 | 6 | -3/+120 | |
| | | ||||||
* | | use $target_item[mid] to make item highlighting work with shortened mids | Mario Vavti | 2017-09-07 | 1 | -1/+1 | |
| | | ||||||
* | | use thread parent hash only for like and dislike activity. in all other ↵ | Mario Vavti | 2017-09-07 | 1 | -1/+1 | |
| | | | | | | | | cases use item hash. this will catch more situations. | |||||
* | | typo | Mario Vavti | 2017-09-07 | 1 | -1/+1 | |
| | | ||||||
* | | fix an issue where some encoded mids were not found in /display allthough ↵ | Mario Vavti | 2017-09-07 | 1 | -3/+10 | |
|/ | | | | they existed | |||||
* | make cards likeable | Mario Vavti | 2017-09-06 | 1 | -1/+1 | |
| | ||||||
* | check code rights on cloud files | zotlabs | 2017-09-05 | 3 | -4/+4 | |
| | ||||||
* | typo | zotlabs | 2017-09-05 | 1 | -1/+1 | |
| | ||||||
* | provide sharing of cards | zotlabs | 2017-09-05 | 2 | -1/+43 | |
| | ||||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-09-05 | 2 | -3/+4 | |
|\ | ||||||
| * | 32 characters are often not enough to distinguish gnu-social mids - use the ↵ | Mario Vavti | 2017-09-05 | 2 | -3/+4 | |
| | | | | | | | | 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 | |||||
* | | avoid a security patch and resultant compatibility issues; instead restrict ↵ | zotlabs | 2017-09-05 | 1 | -1/+0 | |
| | | | | | | | | the input characters we accept in token verification strings to hex digits. This will all be changing in the coming weeks/months anyway. | |||||
* | | some more prep work for Zot VI - some of this will need to be undone or at ↵ | zotlabs | 2017-09-04 | 2 | -5/+13 | |
| | | | | | | | | least re-arranged later but we need to bootstrap a test environment. | |||||
* | | some preliminary work on Zot VI | zotlabs | 2017-09-04 | 2 | -6/+19 | |
| | | ||||||
* | | 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 | |
|/ | ||||||
* | also error if no security context | zotlabs | 2017-09-03 | 1 | -0/+8 | |
| | ||||||
* | validate the security context | zotlabs | 2017-09-03 | 2 | -3/+10 | |
| | ||||||
* | 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 branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-09-03 | 6 | -9/+15 | |
|\ | ||||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-03 | 2 | -4/+0 | |
| |\ | ||||||
| * | | 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 | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-09-02 | 2 | -0/+4 | |
| |\ \ | ||||||
| * | | | add combined index for item.uid and item.item_unseen. this speeds up ↵ | Mario Vavti | 2017-09-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | notifications by a magnitude. | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-09-01 | 1 | -0/+2 | |
| |\ \ \ | ||||||
| | * \ \ | Merge pull request #850 from anaqreon/doco | git-marijus | 2017-09-01 | 1 | -0/+2 | |
| | |\ \ \ | | | | | | | | | | | | | Fix the multiple table of content bug | |||||
| | | * \ \ | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2017-08-27 | 3 | -5/+20 | |
| | | |\ \ \ | ||||||
| | | * \ \ \ | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2017-08-25 | 1 | -18/+4 | |
| | | |\ \ \ \ | ||||||
| | | * | | | | | Removed duplicated table of contents (TOC) in Help pages by breaking ↵ | Andrew Manning | 2017-08-25 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hierarchical TOC loading. | |||||
* | | | | | | | | 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 | 2 | -4/+0 | |
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -0/+4 | |
|/ / / / / | ||||||
* | | | | | cut down on a few extraneous gprobe processes | zotlabs | 2017-08-31 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | some changes after testing server-to-server magic auth | zotlabs | 2017-08-31 | 3 | -14/+25 | |
| | | | | | ||||||
* | | | | | add server-to-server magic auth to dav and cdav controllers | zotlabs | 2017-08-31 | 2 | -28/+119 | |
| | | | | |