redmatrix
be2b7c0b5f
abconfig
2016-02-29 19:31:52 -08:00
phellmes
3b97a9f766
Add string translation to auto approval option
...
Make the description for the auto-approval option translatable.
Put the switch array of that option (with another missing t-funtion)
into a $yes_no variable to be consistent with other settings pages.
2016-02-15 21:23:04 +01:00
Mario Vavti
f4e1b2123a
add an approve button to /connections and get rid of the modal popup in /connedit. for quick approval (default collection and perms etc.) we now can use the approve button in /connections else click the edit button and make changes and approval from /connedit. hope thats any better...
2016-01-15 11:28:05 +01:00
Mario Vavti
ef2890fe51
this might be controversal - if approving a connection from the popup go back to connections page. if the popup is dismissed and the connection is approved from the page stay on /connedit page to be able to adjust perms etc...
2016-01-15 00:03:15 +01:00
redmatrix
26139ee06f
make 'refresh permissions' do something useful for non-zot connections
2016-01-04 23:27:06 -08:00
redmatrix
11c8cabf28
suppress duplicate locations in connedit, issue #111
2015-11-08 20:41:11 -08:00
redmatrix
5c2692a8ea
no comment permission bug, also implement delete() in RedDirectory per Waitman
2015-11-08 16:36:36 -08:00
Mario Vavti
6ec021aafa
revert filtering by metwork
2015-11-02 08:36:43 +01:00
redmatrix
14e92f53f1
hubloc filtering to eliminate dead and deleted entries
2015-11-01 16:19:28 -08:00
Mario Vavti
5acfef8edb
since other networks do not support cloning we only need hublocs for zot contacts - fix #111
2015-11-01 21:32:28 +01:00
redmatrix
bb469deb85
add entry for 'none'
2015-10-29 01:35:49 -07:00
redmatrix
96402a2354
This may take a few iterations to discover the best way to present the information, but we need a way for members to know what alternate locations are available for a channel during times of server issues - and as recently discovered if there aren't any hublocs at all; without digging around the database and probing channels and other messy stuff.
2015-10-29 01:23:56 -07:00
redmatrix
4fec7aa991
add text hint how to set language in connection filter
2015-10-28 20:11:58 -07:00
redmatrix
4e5b813aa8
syntax error
2015-10-19 14:55:49 -07:00
redmatrix
f0a33c00bc
separate permission_update notification into permission_create and permission_update, since some networks send out a notification for duplicate share requests even if connected.
2015-10-18 20:13:12 -07:00
redmatrix
8cd583fd8c
sync abook flags in memory after altering them
2015-08-23 17:36:00 -07:00
redmatrix
70a5a7b717
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2015-07-26 16:51:01 -07:00
redmatrix
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
Mario Vavti
54336ba43b
comment out some popover infos - we provide enough visual feedback now
2015-07-26 21:24:33 +02:00
Mario Vavti
f6142d18c4
Provide connection status if status is "a-normal"
2015-07-26 20:54:09 +02:00
Mario Vavti
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
redmatrix
6046fe9c9e
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-07-15 17:50:24 -07:00
Mario Vavti
ca1f6f8c5b
provide info text for automatic permissions
2015-07-15 14:14:10 +02:00
Mario Vavti
5fcf1256bd
whitespace
2015-07-15 14:07:35 +02:00
Mario Vavti
0c77a127f2
show inherited state in Connection Default Permissions
2015-07-15 14:03:34 +02:00
redmatrix
e8f19c1e15
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/connedit.php
2015-07-14 17:10:13 -07:00
Mario Vavti
104cbcab72
make strings translateable
2015-07-14 21:32:18 +02:00
Mario Vavti
dd57864867
revert provide inherited perms for connection default permissions
2015-07-14 13:46:22 +02:00
Mario Vavti
d8edb66287
remove dbg
2015-07-14 13:21:39 +02:00
Mario Vavti
711dd1468d
provide inherited perms for connection default permissions
2015-07-14 13:16:08 +02:00
Mario Vavti
7f71297383
cleanup connedit
2015-07-14 12:46:40 +02:00
redmatrix
97e8275dc2
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-29 22:19:44 -07:00
redmatrix
0b347ccc14
turn the connection filter into a feature.
2015-06-29 20:35:56 -07:00
redmatrix
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
redmatrix
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
redmatrix
be0459a98b
convert the abook fields
2015-06-14 21:08:00 -07:00
redmatrix
851f2f64df
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
index.php
mod/setup.php
2015-05-24 15:50:05 -07:00
Alexandre Hannud Abdo
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
friendica
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
friendica
3a45206b99
default perms not being set in some cases
2015-04-14 16:22:33 -07:00
friendica
3fd2e4b716
program the affinity slider labels
2015-04-09 19:51:58 -07:00
friendica
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
friendica
0357180164
remove extra debugging
2015-02-03 23:33:06 -08:00
friendica
17ffe122b3
ratings - mopping up, most everything but directory sync implemented
2015-02-03 18:10:55 -08:00
friendica
1807db6cb0
send rating information to directories
2015-02-02 20:13:07 -08:00
friendica
fa710106e5
sign the ratings, fix the bugs
2015-02-02 17:58:51 -08:00
friendica
e6a5f78003
Merge branch 'master' into tres
...
Conflicts:
include/zot.php
2015-01-31 00:50:20 -08:00
friendica
3e22de0be0
how did that stuff merge? grrrr....
2015-01-29 18:17:24 -08:00
friendica
43f5fbddc6
enable ratings only in this branch until we're ready to push
2015-01-29 15:21:50 -08:00
friendica
df6d54c64e
Merge branch 'master' into pocorate
2015-01-29 15:21:19 -08:00
