| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| |\| | | | | | | | | | Conflicts: mod/connedit.php | ||||
| | * | 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 |
| |\| | | | | | | | | | | | | | 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 ↵ | redmatrix | 2015-06-28 | 1 | -2/+10 |
| | | | | | | | | | still pretty cool. | ||||
| * | | 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 |
| |\| | | | | | | | | | | | Conflicts: index.php mod/setup.php | ||||
| | * | Fix accepting contacts by using correct jquery calls. | Alexandre Hannud Abdo | 2015-05-22 | 1 | -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 tres | friendica | 2015-04-23 | 1 | -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 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 |
| |\| | | | | | | | | | | | Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css | ||||
| | * | 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 |
| |\| | | | | | | | | | Conflicts: include/zot.php | ||||
| | * | 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 ↵ | friendica | 2015-01-28 | 1 | -2/+38 |
| | | | | | | | | | | | | | directory servers | ||||
| * | | | Merge branch 'master' into tres | friendica | 2015-01-29 | 1 | -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_channel | friendica | 2015-01-28 | 1 | -23/+23 |
| | |/ | |||||
| * | | Merge branch 'master' into tres and add some work on the item_deleted flag ↵ | friendica | 2015-01-26 | 1 | -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 ↵ | friendica | 2015-01-25 | 1 | -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 ↵ | friendica | 2015-01-25 | 1 | -10/+3 |
| | | | | | | | | | changed but not saved" message. | ||||
| * | | 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 ↵ | friendica | 2015-01-12 | 1 | -0/+9 |
| | | | | | auto-permission setting. | ||||
| * | 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 |
| | | |||||
| * | connection clone issues | friendica | 2015-01-10 | 1 | -2/+2 |
| | | |||||
| * | syncing connections issue, incorrect return_url after deleting connection | friendica | 2015-01-07 | 1 | -5/+4 |
| | | |||||
| * | some work on the edit connection workflow explanation and connedit page. ↵ | friendica | 2015-01-02 | 1 | -9/+11 |
| | | | | | This needs a lot more attention, but it was screaming for any improvement in documenting why we tell you that the permissions have been changed but not saved. | ||||
| * | Put dir back - the fat lady didn't sing afterall. | Thomas Willingham | 2014-12-04 | 1 | -1/+1 |
| | | |||||
| * | Don't allow affinity of 0 in connedit. | Thomas Willingham | 2014-12-02 | 1 | -0/+1 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-13 | 1 | -10/+19 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: boot.php include/dba/dba_driver.php include/diaspora.php include/follow.php include/session.php include/zot.php mod/photos.php mod/ping.php | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |