| Commit message (Expand) | Author | Age | Files | Lines |
* | sync abook flags in memory after altering them | redmatrix | 2015-08-23 | 1 | -0/+11 |
* | Merge branch 'master' of https://github.com/redmatrix/hubzilla | redmatrix | 2015-07-26 | 1 | -2/+2 |
|\ |
|
| * | fix abook_pending reset to 1 loop if $new_friend is false and remove unused var | Mario Vavti | 2015-07-25 | 1 | -2/+2 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-26 | 1 | -15/+4 |
|\ \
| |/
|/| |
|
| * | comment out some popover infos - we provide enough visual feedback now | Mario Vavti | 2015-07-26 | 1 | -15/+15 |
| * | Provide connection status if status is "a-normal" | Mario Vavti | 2015-07-26 | 1 | -0/+4 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-15 | 1 | -4/+5 |
|\| |
|
| * | provide info text for automatic permissions | Mario Vavti | 2015-07-15 | 1 | -1/+1 |
| * | whitespace | Mario Vavti | 2015-07-15 | 1 | -4/+0 |
| * | show inherited state in Connection Default Permissions | Mario Vavti | 2015-07-15 | 1 | -2/+7 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-14 | 1 | -80/+44 |
|\| |
|
| * | make strings translateable | Mario Vavti | 2015-07-14 | 1 | -0/+6 |
| * | revert provide inherited perms for connection default permissions | Mario Vavti | 2015-07-14 | 1 | -1/+1 |
| * | remove dbg | Mario Vavti | 2015-07-14 | 1 | -2/+0 |
| * | provide inherited perms for connection default permissions | Mario Vavti | 2015-07-14 | 1 | -1/+3 |
| * | cleanup connedit | Mario Vavti | 2015-07-14 | 1 | -80/+38 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-29 | 1 | -0/+1 |
|\| |
|
| * | turn the connection filter into a feature. | redmatrix | 2015-06-29 | 1 | -0/+1 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-28 | 1 | -2/+11 |
|\| |
|
| * | no this isn't it. well ok, it's part of it, but not the important part. it's ... | redmatrix | 2015-06-28 | 1 | -2/+10 |
* | | convert the abook fields | redmatrix | 2015-06-14 | 1 | -27/+24 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-24 | 1 | -2/+2 |
|\| |
|
| * | Fix accepting contacts by using correct jquery calls. | Alexandre Hannud Abdo | 2015-05-22 | 1 | -2/+2 |
* | | Merge branch 'master' into tres | friendica | 2015-04-23 | 1 | -6/+32 |
|\| |
|
| * | default perms not being set in some cases | friendica | 2015-04-14 | 1 | -0/+10 |
| * | program the affinity slider labels | friendica | 2015-04-09 | 1 | -6/+22 |
* | | Merge branch 'master' into tres | friendica | 2015-02-05 | 1 | -14/+36 |
|\| |
|
| * | remove extra debugging | friendica | 2015-02-03 | 1 | -2/+1 |
| * | ratings - mopping up, most everything but directory sync implemented | friendica | 2015-02-03 | 1 | -8/+22 |
| * | send rating information to directories | friendica | 2015-02-02 | 1 | -3/+3 |
| * | sign the ratings, fix the bugs | friendica | 2015-02-02 | 1 | -4/+13 |
* | | Merge branch 'master' into tres | friendica | 2015-01-31 | 1 | -2/+39 |
|\| |
|
| * | how did that stuff merge? grrrr.... | friendica | 2015-01-29 | 1 | -1/+1 |
| * | enable ratings only in this branch until we're ready to push | friendica | 2015-01-29 | 1 | -1/+1 |
| * | Merge branch 'master' into pocorate | friendica | 2015-01-29 | 1 | -0/+1 |
| |\ |
|
| | * | disable ratings until we're a bit further along. It's all changing. | friendica | 2015-01-29 | 1 | -0/+1 |
| * | | Merge branch 'master' into pocorate | friendica | 2015-01-29 | 1 | -23/+23 |
| |\| |
|
| * | | updates to put rating info into the local xlink before sending it to known di... | friendica | 2015-01-28 | 1 | -2/+38 |
* | | | Merge branch 'master' into tres | friendica | 2015-01-29 | 1 | -23/+23 |
|\ \ \
| | |/
| |/| |
|
| * | | local_user => local_channel | friendica | 2015-01-28 | 1 | -23/+23 |
| |/ |
|
* | | Merge branch 'master' into tres and add some work on the item_deleted flag re... | friendica | 2015-01-26 | 1 | -10/+5 |
|\| |
|
| * | Hide all the scary decision making stuff that sends intellectually challenged... | friendica | 2015-01-25 | 1 | -0/+2 |
| * | rework the new connection stuff so we don't need a "permissions have been cha... | friendica | 2015-01-25 | 1 | -10/+3 |
* | | slow progress removing bitfields on item table | friendica | 2015-01-21 | 1 | -1/+3 |
|/ |
|
* | poco rating - add a test module for pulling out ratings | friendica | 2015-01-15 | 1 | -4/+14 |
* | editing stuff for poco reputation | friendica | 2015-01-15 | 1 | -2/+15 |
* | more backend work on poco rating | friendica | 2015-01-15 | 1 | -0/+8 |
* | document the pros and cons of the not-yet written hassle-free connection auto... | friendica | 2015-01-12 | 1 | -0/+9 |
* | double perms msg | friendica | 2015-01-12 | 1 | -1/+1 |
* | another attempt to explain default permissions on connedit page | friendica | 2015-01-11 | 1 | -4/+4 |