Commit Graph
13561 Commits
Author SHA1 Message Date
redmatrix 7f9e4d6add federation problem from diaspora comments relayed through red channels due to typo 2015-05-23 15:24:16 -07:00
redmatrix 11861949bb add channel_id to local_dir_update hook 2015-05-23 15:19:50 -07:00
redmatrix 45259fed14 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-23 15:10:18 -07:00
redmatrix ee14657863 add local_dir_update hook 2015-05-23 15:07:24 -07:00
Mario Vavti 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
redmatrix 81d94dae2c preserve lock on edited comments 2015-05-21 02:03:44 -07:00
redmatrix 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
redmatrix 0689816772 check for success before updating remote id 2015-05-20 19:27:05 -07:00
redmatrix 0826c5fd96 don't allow item_id to update without a valid post id 2015-05-20 19:18:32 -07:00
redmatrix c55d13a836 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-20 18:48:05 -07:00
redmatrix 6466774b6e PRIVACY: possible privacy leakage under a defined set of circumstances 2015-05-20 18:46:23 -07:00
jeroenpraat 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
Mario Vavti 578d21120a make design elements translateable 2015-05-20 08:34:40 +02:00
redmatrix fe00d29047 issue with deleting imported design elements and re-installing them 2015-05-19 18:25:27 -07:00
redmatrix e54198e5b8 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-19 17:17:04 -07:00
redmatrix d84c2835cd version update 2015-05-19 17:16:46 -07:00
redmatrix 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
Mario Vavti 3471e98989 remove dbg code 2015-05-19 21:09:35 +02:00
Mario Vavti 5641d81f03 be verbose about what type of element (block, layout, webpage) is beeing installed 2015-05-19 21:07:43 +02:00
Alexandre Hannud Abdo a2696bea19 Document widget creation. 2015-05-19 16:59:28 +00:00
Alexandre Hannud Abdo 2c7b786907 Document php-xml requirement for webdav. 2015-05-19 16:46:15 +00:00
jeroenpraat 5e87bd8843 New update Dutch 2015-05-19 12:12:16 +02:00
redmatrix c2ca2a09e7 this should fix undeletable blocks and layouts 2015-05-18 17:32:36 -07:00
redmatrix ad07d48d3c Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-18 16:30:55 -07:00
redmatrix 0340639cb1 fix po2php to handle projectname variables correctly 2015-05-18 16:30:00 -07:00
Mario Vavti d42d7d0532 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-18 22:29:34 +02:00
Mario Vavti 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
redmatrix 8962d0576b Merge pull request #326 from sierracircle/patch-1
Create Primary-Directory
2015-05-19 06:25:24 +10:00
Mario Vavti 9b64301e0c remove dbg code 2015-05-18 22:19:08 +02:00
Mario Vavti 4e3583ab45 allow block title to contain $content title 2015-05-18 22:18:01 +02:00
Adam Robertson 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
jeroenpraat 6ab7394565 Update Dutch (Projectname variable not translated yet, because of undefined variable) 2015-05-18 16:25:22 +02:00
redmatrix 048c745607 spelling 2015-05-17 22:08:53 -07:00
redmatrix ac3b886cc4 missing $ 2015-05-17 19:00:17 -07:00
redmatrix f985c08d12 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-17 18:19:49 -07:00
redmatrix 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
redmatrix 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 1cca24dfdc Merge pull request #323 from dawnbreak/docu
Add some more documentation to attach_store()
2015-05-18 09:41:32 +10:00
redmatrix a7071b17c0 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-17 16:35:17 -07:00
redmatrix 9a67ec8bd4 new string file - isolating the projectname from translated strings so that translation files will work across multiple projects. 2015-05-17 16:33:43 -07:00
redmatrix 91d7b0f7eb more work isolating the projectname from core. 2015-05-17 16:28:16 -07:00
Klaus f987f4a049 Merge pull request #324 from Razlo/master
updated the templates to the {{$new_format}}, compared to $old_format
2015-05-17 11:51:44 +02:00
Razlo fc1c188a7e updated the templates to the {{}}, compared to 2015-05-17 02:40:51 +02:00
Klaus Weidenbach 6757e86e85 Add some more documentation to attach_store() 2015-05-17 01:24:47 +02:00
Klaus Weidenbach e2980e871f Add functions to parse and get some values from php.ini.
Get upload limits from php.ini. These functions will be used for checking
against upload limits and to give information in the frontend.
Wasn't sure in which file to put these functions, so I created a new
one include/environment.php.
2015-05-16 11:25:32 +02:00
Mario Vavti 70fa00c014 allow a block to contain $content 2015-05-15 22:20:45 +02:00
Mario Vavti ed284fd4ea preserve htmlhead in case somebody needs it 2015-05-15 20:33:38 +02:00
redmatrix 51b6d70996 update to_do 2015-05-14 22:42:48 -07:00
redmatrix bceef58584 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-14 22:01:02 -07:00
redmatrix 47564d4310 provide default permissions ('all') for existing and newly created OAuth app clients, which will be extended in the future to allow specific permissions. 2015-05-14 21:57:20 -07:00