aboutsummaryrefslogtreecommitdiffstats
path: root/mod/connedit.php
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ | |/ |/| | | | | | | | | Conflicts: mod/connedit.php view/pt-br/messages.po view/pt-br/strings.php
| * 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
|\| | | | | | | | | Conflicts: mod/connedit.php
| * 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
|\| | | | | | | | | | | | | Conflicts: include/zot.php mod/connedit.php util/messages.po
| * no this isn't it. well ok, it's part of it, but not the important part. it's ↵redmatrix2015-06-281-2/+10
| | | | | | | | still pretty cool.
* | convert the abook fieldsredmatrix2015-06-141-27/+24
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-241-2/+2
|\| | | | | | | | | | | Conflicts: index.php mod/setup.php
| * Fix accepting contacts by using correct jquery calls.Alexandre Hannud Abdo2015-05-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Not sure what the operation on disabled is supposed to do, but it also seemed to requier prop instead of attr. See for reference: http://api.jquery.com/prop/ """ The checked attribute value does not change with the state of the checkbox, while the checked property does. """
* | Merge branch 'master' into tresfriendica2015-04-231-6/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css
| * 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
|\| | | | | | | | | | | Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css
| * 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
|\| | | | | | | | | Conflicts: include/zot.php
| * 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 ↵friendica2015-01-281-2/+38
| | | | | | | | | | | | directory servers
* | | Merge branch 'master' into tresfriendica2015-01-291-23/+23
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php
| * | local_user => local_channelfriendica2015-01-281-23/+23
| |/
* | Merge branch 'master' into tres and add some work on the item_deleted flag ↵friendica2015-01-261-10/+5
|\| | | | | | | | | | | | | | | | | | | refactor Conflicts: include/attach.php include/onedirsync.php include/zot.php mod/locs.php
| * Hide all the scary decision making stuff that sends intellectually ↵friendica2015-01-251-0/+2
| | | | | | | | challenged beings into siezures and brain melt-downs and online freak-outs.
| * rework the new connection stuff so we don't need a "permissions have been ↵friendica2015-01-251-10/+3
| | | | | | | | changed but not saved" message.
* | 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 ↵friendica2015-01-121-0/+9
| | | | auto-permission setting.
* 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
|