aboutsummaryrefslogtreecommitdiffstats
path: root/mod/connedit.php
Commit message (Expand)AuthorAgeFilesLines
* 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
| * rework the new connection stuff so we don't need a "permissions have been cha...friendica2015-01-251-10/+3
* | slow progress removing bitfields on item tablefriendica2015-01-211-1/+3
|/
* poco rating - add a test module for pulling out ratingsfriendica2015-01-151-4/+14
* editing stuff for poco reputationfriendica2015-01-151-2/+15
* more backend work on poco ratingfriendica2015-01-151-0/+8
* document the pros and cons of the not-yet written hassle-free connection auto...friendica2015-01-121-0/+9
* double perms msgfriendica2015-01-121-1/+1
* another attempt to explain default permissions on connedit pagefriendica2015-01-111-4/+4
* connection clone issuesfriendica2015-01-101-2/+2
* syncing connections issue, incorrect return_url after deleting connectionfriendica2015-01-071-5/+4
* some work on the edit connection workflow explanation and connedit page. This...friendica2015-01-021-9/+11
* Put dir back - the fat lady didn't sing afterall.Thomas Willingham2014-12-041-1/+1
* Don't allow affinity of 0 in connedit.Thomas Willingham2014-12-021-0/+1
* Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-131-10/+19
|\
| * minor adjustments to make the form work as designedfriendica2014-11-041-2/+3
| * ok heads up - potentially destabilising change. I've tried to sort out all th...friendica2014-11-041-10/+18
* | PostgreSQL support initial commitHabeas Codice2014-11-131-2/+2
|/
* add "repository" permissions role and make sure we have a sane "accept" defau...friendica2014-10-271-0/+6
* implement permission roles - the backend should be done except for maybe a co...friendica2014-09-171-0/+22
* Friendica photo import tool. This will bring in all your photos from the chos...friendica2014-08-121-1/+1
* fix ignore of unapproved connectionfriendica2014-08-071-5/+4
* clone sync of "unfriend" actionsfriendica2014-08-051-2/+12
* we didn't need the extra query - everything we require is already in memoryfriendica2014-07-291-37/+26
* implement the new friend activity post which has been missing for some time nowfriendica2014-07-291-8/+52