70a5a7b717
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2015-07-26 16:51:01 -07:00
3880b485cb
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/connedit.php
view/pt-br/messages.po
view/pt-br/strings.php
2015-07-26 16:50:33 -07:00
54336ba43b
comment out some popover infos - we provide enough visual feedback now
2015-07-26 21:24:33 +02:00
f6142d18c4
Provide connection status if status is "a-normal"
2015-07-26 20:54:09 +02:00
6e557aa153
fix abook_pending reset to 1 loop if $new_friend is false and remove unused var
2015-07-25 17:41:19 +02:00
6046fe9c9e
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-07-15 17:50:24 -07:00
ca1f6f8c5b
provide info text for automatic permissions
2015-07-15 14:14:10 +02:00
5fcf1256bd
whitespace
2015-07-15 14:07:35 +02:00
0c77a127f2
show inherited state in Connection Default Permissions
2015-07-15 14:03:34 +02:00
e8f19c1e15
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/connedit.php
2015-07-14 17:10:13 -07:00
104cbcab72
make strings translateable
2015-07-14 21:32:18 +02:00
dd57864867
revert provide inherited perms for connection default permissions
2015-07-14 13:46:22 +02:00
d8edb66287
remove dbg
2015-07-14 13:21:39 +02:00
711dd1468d
provide inherited perms for connection default permissions
2015-07-14 13:16:08 +02:00
7f71297383
cleanup connedit
2015-07-14 12:46:40 +02:00
97e8275dc2
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-29 22:19:44 -07:00
0b347ccc14
turn the connection filter into a feature.
2015-06-29 20:35:56 -07:00
63f2e9b412
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/zot.php
mod/connedit.php
util/messages.po
2015-06-28 22:33:13 -07:00
de13497333
no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool.
2015-06-28 21:16:56 -07:00
be0459a98b
convert the abook fields
2015-06-14 21:08:00 -07:00
851f2f64df
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
index.php
mod/setup.php
2015-05-24 15:50:05 -07:00
d37c51ef2e
Fix accepting contacts by using correct jquery calls.
...
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.
"""
2015-05-22 10:15:29 -03:00
6679734135
Merge branch 'master' into tres
...
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
2015-04-23 19:49:41 -07:00
3a45206b99
default perms not being set in some cases
2015-04-14 16:22:33 -07:00
3fd2e4b716
program the affinity slider labels
2015-04-09 19:51:58 -07:00
4b348d2489
Merge branch 'master' into tres
...
Conflicts:
view/css/mod_events.css
view/theme/redbasic/css/style.css
2015-02-05 19:38:43 -08:00
0357180164
remove extra debugging
2015-02-03 23:33:06 -08:00
17ffe122b3
ratings - mopping up, most everything but directory sync implemented
2015-02-03 18:10:55 -08:00
1807db6cb0
send rating information to directories
2015-02-02 20:13:07 -08:00
fa710106e5
sign the ratings, fix the bugs
2015-02-02 17:58:51 -08:00
e6a5f78003
Merge branch 'master' into tres
...
Conflicts:
include/zot.php
2015-01-31 00:50:20 -08:00
3e22de0be0
how did that stuff merge? grrrr....
2015-01-29 18:17:24 -08:00
43f5fbddc6
enable ratings only in this branch until we're ready to push
2015-01-29 15:21:50 -08:00
df6d54c64e
Merge branch 'master' into pocorate
2015-01-29 15:21:19 -08:00
e2edc2c968
disable ratings until we're a bit further along. It's all changing.
2015-01-29 15:17:50 -08:00
912be23e16
Merge branch 'master' into tres
...
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
2015-01-29 15:09:35 -08:00
fd0b6c967f
Merge branch 'master' into pocorate
2015-01-29 00:28:23 -08:00
a496036066
local_user => local_channel
2015-01-28 20:56:04 -08:00
1ef2d1c5c4
updates to put rating info into the local xlink before sending it to known directory servers
2015-01-28 16:52:17 -08:00
ac594183c6
Merge branch 'master' into tres and add some work on the item_deleted flag refactor
...
Conflicts:
include/attach.php
include/onedirsync.php
include/zot.php
mod/locs.php
2015-01-26 18:27:03 -08:00
0125e9d288
Hide all the scary decision making stuff that sends intellectually challenged beings into siezures and brain melt-downs and online freak-outs.
2015-01-25 14:06:57 -08:00
4ca2ec7638
rework the new connection stuff so we don't need a "permissions have been changed but not saved" message.
2015-01-25 13:30:40 -08:00
29436081a8
slow progress removing bitfields on item table
2015-01-21 16:06:25 -08:00
597b07e8cc
poco rating - add a test module for pulling out ratings
2015-01-15 17:32:41 -08:00
e7932d97a2
editing stuff for poco reputation
2015-01-15 16:37:47 -08:00
1c9299ed42
more backend work on poco rating
2015-01-15 14:05:18 -08:00
2f9fe0280e
document the pros and cons of the not-yet written hassle-free connection auto-permission setting.
2015-01-12 17:20:28 -08:00
962c6207ae
double perms msg
2015-01-12 11:25:48 -08:00
580c30f516
another attempt to explain default permissions on connedit page
2015-01-11 21:18:29 -08:00
10102ac2ac
connection clone issues
2015-01-10 14:59:10 -08:00
redmatrix
Mario Vavti
Alexandre Hannud Abdo
friendica