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
1cca24dfdc
Merge pull request #323 from dawnbreak/docu
...
Add some more documentation to attach_store()
2015-05-18 09:41:32 +10:00
a7071b17c0
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-17 16:35:17 -07:00
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
91d7b0f7eb
more work isolating the projectname from core.
2015-05-17 16:28:16 -07:00
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
fc1c188a7e
updated the templates to the {{}}, compared to
2015-05-17 02:40:51 +02:00
6757e86e85
Add some more documentation to attach_store()
2015-05-17 01:24:47 +02:00
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
70fa00c014
allow a block to contain $content
2015-05-15 22:20:45 +02:00
ed284fd4ea
preserve htmlhead in case somebody needs it
2015-05-15 20:33:38 +02:00
51b6d70996
update to_do
2015-05-14 22:42:48 -07:00
bceef58584
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-14 22:01:02 -07:00
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
d5803cfd02
Merge pull request #320 from dawnbreak/master
...
Add sprintf.js v1.0.2.
2015-05-15 13:10:28 +10:00
c62e75d789
Add sprintf.js v1.0.2.
...
This script provides sprintf() for JavaScript. It can be used for
example for translating strings used in JavaScript with variables.
It is licensed under BSD-3-Clause and can be found on GitHub:
https://github.com/alexei/sprintf.js
2015-05-14 10:39:56 +02:00
f866a42a42
not sure how these files ended up here, but they belong with doxygen stuff
2015-05-13 18:10:15 -07:00
364025e550
remove project name dependency from most of the doc files to ease project merging, there are going to be some edge cases requiring manual tweaking as most of this was done by script.
2015-05-13 17:59:45 -07:00
c82082d2bb
restrict webpage list to undeleted items
2015-05-13 16:27:04 -07:00
d6f98e6511
product was a bad string to use because we may require it for e-commerce, and RED_PLATFORM is equally problematic for other reasons.
2015-05-13 16:01:00 -07:00
c3c202d650
issue #187
2015-05-12 22:57:55 -07:00
19a2bdeb91
cut/paste error
2015-05-12 21:40:49 -07:00
a67ada15f3
repo updaters
2015-05-12 21:35:30 -07:00
1e0e812440
provide a method for loading site/custom widgets
2015-05-12 18:11:54 -07:00
1970670596
replace project name with $product or $Product in strings to avoid merge issues across different project names. Currently a place-holder. The strings themselves have not yet been modified.
2015-05-12 17:06:47 -07:00
5dcdb676fd
version update
2015-05-12 16:45:44 -07:00
643d7db4a3
Dutch 100\% again
2015-05-12 23:03:13 +02:00
redmatrix
Mario Vavti
Alexandre Hannud Abdo
jeroenpraat
Adam Robertson
Klaus
Razlo