d537fc854b
typo and update to rfc7033 (webfinger) as well as webfinger diagnostic page
2015-05-24 17:59:31 -07:00
d9061fd09e
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-24 15:59:03 -07:00
52e38d7c24
search result heading not translatable
2015-05-24 15:57:59 -07:00
1354616787
one more
2015-05-24 09:30:31 -07:00
b15a68f05d
avoid db compatibility issues
2015-05-24 09:26:12 -07:00
57d520e69f
logic has changed - this is not needed anymore
2015-05-24 15:09:30 +02:00
125cd5e32b
should not call prepare text here anymore
2015-05-24 14:57:01 +02:00
a332dfcf6b
Merge pull request #331 from solstag/jqueryprop
...
Fix accepting contacts by using correct jquery calls.
2015-05-24 12:50:43 +10:00
08b00f0f5e
Merge pull request #333 from dawnbreak/docu
...
Add PHP's xml module check and upload limits to setup.
2015-05-24 12:35:49 +10:00
1ce3d01bb8
Merge pull request #332 from solstag/zotfeedcleanup
...
Import security only when necessary, use correct variable in log
2015-05-24 03:12:25 +02:00
e90c331bf6
Add PHP's xml module check and upload limits to setup.
...
And some documentation.
2015-05-24 02:58:52 +02:00
7f9e4d6add
federation problem from diaspora comments relayed through red channels due to typo
2015-05-23 15:24:16 -07:00
11861949bb
add channel_id to local_dir_update hook
2015-05-23 15:19:50 -07:00
45259fed14
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-23 15:10:18 -07:00
ee14657863
add local_dir_update hook
2015-05-23 15:07:24 -07:00
f575ef551d
use $a->data instead of $a->page for $content and ad another library for use with webpages - foundation
2015-05-23 22:19:02 +02:00
760f17b173
Import security only when necessary, use correct variable in log
...
Just some cleanup, seemed like the intent of previous changes was so
2015-05-22 10:27:17 -03: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
81d94dae2c
preserve lock on edited comments
2015-05-21 02:03:44 -07:00
62df06b3d6
cloning abook entries was broken in several ways if the target xchan wasn't available on the clone site. This should make it less broken.
2015-05-20 20:20:35 -07:00
0689816772
check for success before updating remote id
2015-05-20 19:27:05 -07:00
0826c5fd96
don't allow item_id to update without a valid post id
2015-05-20 19:18:32 -07:00
c55d13a836
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-20 18:48:05 -07:00
6466774b6e
PRIVACY: possible privacy leakage under a defined set of circumstances
2015-05-20 18:46:23 -07:00
a7d39cf654
Another update for Dutch with complete $Projectname substitutions (and channel activity as suggested on previous discussion)
2015-05-20 15:24:23 +02:00
578d21120a
make design elements translateable
2015-05-20 08:34:40 +02:00
fe00d29047
issue with deleting imported design elements and re-installing them
2015-05-19 18:25:27 -07:00
e54198e5b8
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-19 17:17:04 -07:00
d84c2835cd
version update
2015-05-19 17:16:46 -07:00
9485e917c6
Merge pull request #327 from solstag/help
...
Document php-xml requirement for webdav and widget creation.
2015-05-20 10:14:35 +10:00
3471e98989
remove dbg code
2015-05-19 21:09:35 +02:00
5641d81f03
be verbose about what type of element (block, layout, webpage) is beeing installed
2015-05-19 21:07:43 +02:00
a2696bea19
Document widget creation.
2015-05-19 16:59:28 +00:00
2c7b786907
Document php-xml requirement for webdav.
2015-05-19 16:46:15 +00:00
5e87bd8843
New update Dutch
2015-05-19 12:12:16 +02:00
c2ca2a09e7
this should fix undeletable blocks and layouts
2015-05-18 17:32:36 -07:00
ad07d48d3c
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-18 16:30:55 -07:00
0340639cb1
fix po2php to handle projectname variables correctly
2015-05-18 16:30:00 -07:00
d42d7d0532
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-18 22:29:34 +02:00
9b1e540880
if block title contains $content but $content title is empty do not show an empty <h3> tag
2015-05-18 22:29:13 +02:00
8962d0576b
Merge pull request #326 from sierracircle/patch-1
...
Create Primary-Directory
2015-05-19 06:25:24 +10:00
9b64301e0c
remove dbg code
2015-05-18 22:19:08 +02:00
4e3583ab45
allow block title to contain $content title
2015-05-18 22:18:01 +02:00
d50ff49f2a
Create Primary-Directory
...
Description and Instruction on using a Primary Directory for a series of Private Hubs
2015-05-18 08:26:45 -07:00
6ab7394565
Update Dutch (Projectname variable not translated yet, because of undefined variable)
2015-05-18 16:25:22 +02:00
048c745607
spelling
2015-05-17 22:08:53 -07:00
ac3b886cc4
missing $
2015-05-17 19:00:17 -07:00
f985c08d12
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-17 18:19:49 -07:00
3b859aa9ef
Implement permission checking for OAuth clients using the xperm table. Currently 'all' permissions are applied to OAuth clients which gives them the same rights as the channel owner and full access to API functions as the channel owner. However, individual permissions can now be created. These mirror the permission names from the normal permission table (although it isn't required that they do so). Lack of an xp_perm entry for the specified permission and lack of an 'all' override indicates permission denied.
2015-05-17 18:14:50 -07:00
7233967ad5
Merge pull request #322 from dawnbreak/master
...
Add functions to parse and get some values from php.ini.
2015-05-18 09:41:53 +10:00
redmatrix
Habeas Codice
Mario Vavti
Klaus
Alexandre Hannud Abdo
jeroenpraat
Adam Robertson