Mario Vavti
24f912e0b2
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2016-01-30 00:31:09 +01:00
Mario Vavti
d7abacb7b2
it is not perfect but it still may ease the collapsing of items above the viewport a little...
2016-01-30 00:30:49 +01:00
redmatrix
08aeeadd71
move permission check before global block check
2016-01-29 14:07:10 -08:00
redmatrix
c214692f66
add peer filtering to all .well-known services
2016-01-28 17:06:13 -08:00
redmatrix
35a9a468ce
widget_item - provide ability to use the page title instead of the message_id to locate the desired item. You can use either, but the page title is often easier to use and discover.
2016-01-28 15:23:42 -08:00
mrjive
28943af494
Merge pull request #19 from redmatrix/master
...
updating from original codebase
2016-01-28 23:19:13 +01:00
Haakon Meland Eriksen
9abff11f86
Merge remote-tracking branch 'upstream/master'
2016-01-28 18:28:04 +01:00
redmatrix
5f1eb18da4
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-01-27 23:03:05 -08:00
redmatrix
ae3ca2b7df
block_public_blackout setting
2016-01-27 23:02:36 -08:00
Haakon Meland Eriksen
d49c5b3d8e
Merge remote-tracking branch 'upstream/master'
2016-01-28 06:24:47 +01:00
Jeroen van Riet Paap
9ea904c12d
remark in the private notes encrypted
...
Notes are not encrypted and are readable in the database by the admin. Made a remark about that. Probably this needs to be fixed, but till than, it's better to warn people.
2016-01-28 00:21:43 +01:00
Jeroen van Riet Paap
9a4cbc05a6
no trailing slash
2016-01-27 23:48:14 +01:00
Jeroen van Riet Paap
08fbe17627
no trailing slash
...
it will break your system
2016-01-27 23:40:33 +01:00
Haakon Meland Eriksen
c766cf9565
Merge remote-tracking branch 'upstream/master'
2016-01-27 17:24:05 +01:00
Mario Vavti
722d7ff38d
lower caution level from danger to warning for ignore button
2016-01-27 09:46:18 +01:00
redmatrix
5d6657f77a
provide an icon to make 'add privacy group' stand out from the list of groups. Please revert if you think it's too messy.
2016-01-27 00:11:15 -08:00
redmatrix
d83b907cdc
rename collections to privacy groups
2016-01-26 23:44:15 -08:00
redmatrix
202817740a
control the generation or acceptance of directory keywords
2016-01-26 19:04:32 -08:00
redmatrix
9b08051703
bring back the ability to ignore a pending connection request without deleting it and without always having it in your face and without jumping through hoops.
2016-01-26 16:57:36 -08:00
redmatrix
9c71b74d37
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-01-26 15:39:25 -08:00
redmatrix
535a54040f
add abook_account to cloned abook records, was missing
2016-01-26 15:38:56 -08:00
jeroenpraat
68030d12cf
Linking new connection notification to pending connections (see Channel 1) and improved email notifications about new connections. Could not find a way to do this also for the generic notifications. Added hub domain of channel address on the new channel page. A few people on my hub didn't understood. This example will make it more clear. Some minor bits.
2016-01-27 00:24:05 +01:00
redmatrix
3494fddd7c
change help text on other channel expiration setting to inform that there is a system limit. Ignore imported feed content that is older than expiration interval.
2016-01-26 15:12:34 -08:00
redmatrix
424af13891
fix undefined variable reference in widget_item
2016-01-26 14:14:18 -08:00
Haakon Meland Eriksen
e4674142c6
Merge remote-tracking branch 'upstream/master'
2016-01-25 07:33:18 +01:00
redmatrix
9081ddb455
don't provide notification icons on manage page for delegated channels
2016-01-24 18:36:38 -08:00
redmatrix
1ccf836ebb
regression: channel name missing on delegate section of manage page
2016-01-24 18:33:02 -08:00
redmatrix
5e9e1b2c91
cleanup and add comments about what we're trying to do here
2016-01-24 15:44:16 -08:00
redmatrix
baed7d339e
make exec the default for proc_run - use system.use_proc_open to use proc_open. Also prohibit delegated channels from manually invoking new_channel under the delegated account.
2016-01-24 15:20:25 -08:00
redmatrix
6759a28579
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-01-24 13:54:07 -08:00
redmatrix
0db2fe6e39
remote delegation issue when already logged in with different account on same site.
2016-01-24 13:53:18 -08:00
jeroenpraat
845945e70a
es-es+nl string update
2016-01-24 15:31:08 +01:00
Haakon Meland Eriksen
089509ab87
Merge remote-tracking branch 'upstream/master'
2016-01-24 10:35:20 +01:00
redmatrix
ae6ae88151
update hidden_configs with proc_run_use_exec
2016-01-23 16:29:39 -08:00
redmatrix
7b73a689e1
provide option to use exec in proc_run
2016-01-23 16:25:38 -08:00
Haakon Meland Eriksen
0d119d83b0
Merge remote-tracking branch 'upstream/master'
2016-01-22 19:15:46 +01:00
Jeroen van Riet Paap
945689d01c
doc
2016-01-22 16:25:00 +01:00
redmatrix
d70f69566f
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-01-22 02:25:05 -08:00
redmatrix
48495f41e8
provide mechanism for custom .well-known handlers and static files (e.g. for letsencypt ownership verification). Document that if you create a .well-known directory to validate a letsencrypt cert you need to remove it before installing hubzilla. We probably need a check for this in the install checklist.
2016-01-22 02:22:27 -08:00
redmatrix
47f7750f26
Merge pull request #266 from anaqreon/activitystreams
...
Activitystreams
2016-01-22 20:35:30 +11:00
redmatrix
81e3aa4fc8
Merge pull request #267 from bashrc/bashrc/node
...
Change node script types
2016-01-22 20:35:07 +11:00
Bob Mottram
8f6e01a70b
Change node script types
2016-01-22 09:18:02 +00:00
Haakon Meland Eriksen
b0d5b9fd2c
Merge remote-tracking branch 'upstream/master'
2016-01-22 06:37:30 +01:00
redmatrix
75468c255a
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-01-21 19:26:22 -08:00
redmatrix
e52f64e3d2
fix visitor photo uploads
2016-01-21 19:26:04 -08:00
redmatrix
7d7ef5ac4e
add a fixme
2016-01-21 18:42:44 -08:00
Andrew Manning
b368e0a1f9
Merge branch 'master' of https://github.com/redmatrix/hubzilla into activitystreams
2016-01-21 21:40:29 -05:00
Andrew Manning
dff2cdc650
Added more ActivityStreams schema support to boot.php for games
2016-01-21 21:39:43 -05:00
redmatrix
dcaef756e7
Merge pull request #265 from bashrc/bashrc/tidying
...
General tidying
2016-01-22 09:57:16 +11:00
redmatrix
2be515e7bb
set the actual value of the password input field to a single space on remove channel and remove account because firefox does not honour 'autocomplete="off"' and insists on filling in the password, which completely defeats the purpose of password protecting this function. We want to ensure it can only be executed by somebody who knows the password and not somebody who happens upon an unattended browser session. This space is annoying and must be removed to enter the password correctly but this appears to be the only way to provide the necessary safety for that page. Setting autocomplete to a random string as suggested by the firefox doco doesn't appear to do anything useful, as autocomplete is still performed.
2016-01-21 14:32:41 -08:00