aboutsummaryrefslogtreecommitdiffstats
path: root/mod/connedit.php
Commit message (Expand)AuthorAgeFilesLines
* revert filtering by metworkMario Vavti2015-11-021-1/+1
* hubloc filtering to eliminate dead and deleted entriesredmatrix2015-11-011-1/+2
* since other networks do not support cloning we only need hublocs for zot cont...Mario Vavti2015-11-011-1/+1
* add entry for 'none'redmatrix2015-10-291-10/+12
* This may take a few iterations to discover the best way to present the inform...redmatrix2015-10-291-1/+17
* add text hint how to set language in connection filterredmatrix2015-10-281-2/+2
* syntax errorredmatrix2015-10-191-1/+1
* separate permission_update notification into permission_create and permission...redmatrix2015-10-181-3/+2
* sync abook flags in memory after altering themredmatrix2015-08-231-0/+11
* Merge branch 'master' of https://github.com/redmatrix/hubzillaredmatrix2015-07-261-2/+2
|\
| * fix abook_pending reset to 1 loop if $new_friend is false and remove unused varMario Vavti2015-07-251-2/+2
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-261-15/+4
|\ \ | |/ |/|
| * comment out some popover infos - we provide enough visual feedback nowMario Vavti2015-07-261-15/+15
| * Provide connection status if status is "a-normal"Mario Vavti2015-07-261-0/+4
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-151-4/+5
|\|
| * provide info text for automatic permissionsMario Vavti2015-07-151-1/+1
| * whitespaceMario Vavti2015-07-151-4/+0
| * show inherited state in Connection Default PermissionsMario Vavti2015-07-151-2/+7
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-141-80/+44
|\|
| * make strings translateableMario Vavti2015-07-141-0/+6
| * revert provide inherited perms for connection default permissionsMario Vavti2015-07-141-1/+1
| * remove dbgMario Vavti2015-07-141-2/+0
| * provide inherited perms for connection default permissionsMario Vavti2015-07-141-1/+3
| * cleanup conneditMario Vavti2015-07-141-80/+38
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-291-0/+1
|\|
| * turn the connection filter into a feature.redmatrix2015-06-291-0/+1
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-281-2/+11
|\|
| * no this isn't it. well ok, it's part of it, but not the important part. it's ...redmatrix2015-06-281-2/+10
* | convert the abook fieldsredmatrix2015-06-141-27/+24
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-241-2/+2
|\|
| * Fix accepting contacts by using correct jquery calls.Alexandre Hannud Abdo2015-05-221-2/+2
* | Merge branch 'master' into tresfriendica2015-04-231-6/+32
|\|
| * default perms not being set in some casesfriendica2015-04-141-0/+10
| * program the affinity slider labelsfriendica2015-04-091-6/+22
* | Merge branch 'master' into tresfriendica2015-02-051-14/+36
|\|
| * remove extra debuggingfriendica2015-02-031-2/+1
| * ratings - mopping up, most everything but directory sync implementedfriendica2015-02-031-8/+22
| * send rating information to directoriesfriendica2015-02-021-3/+3
| * sign the ratings, fix the bugsfriendica2015-02-021-4/+13
* | Merge branch 'master' into tresfriendica2015-01-311-2/+39
|\|
| * how did that stuff merge? grrrr....friendica2015-01-291-1/+1
| * enable ratings only in this branch until we're ready to pushfriendica2015-01-291-1/+1
| * Merge branch 'master' into pocoratefriendica2015-01-291-0/+1
| |\
| | * disable ratings until we're a bit further along. It's all changing.friendica2015-01-291-0/+1
| * | Merge branch 'master' into pocoratefriendica2015-01-291-23/+23
| |\|
| * | updates to put rating info into the local xlink before sending it to known di...friendica2015-01-281-2/+38
* | | Merge branch 'master' into tresfriendica2015-01-291-23/+23
|\ \ \ | | |/ | |/|
| * | local_user => local_channelfriendica2015-01-281-23/+23
| |/
* | Merge branch 'master' into tres and add some work on the item_deleted flag re...friendica2015-01-261-10/+5
|\|
| * Hide all the scary decision making stuff that sends intellectually challenged...friendica2015-01-251-0/+2