Commit graph

13624 commits

Author SHA1 Message Date
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
redmatrix
d5803cfd02 Merge pull request #320 from dawnbreak/master
Add sprintf.js v1.0.2.
2015-05-15 13:10:28 +10:00
Klaus Weidenbach
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
redmatrix
f866a42a42 not sure how these files ended up here, but they belong with doxygen stuff 2015-05-13 18:10:15 -07:00
redmatrix
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
redmatrix
c82082d2bb restrict webpage list to undeleted items 2015-05-13 16:27:04 -07:00
redmatrix
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
redmatrix
c3c202d650 issue #187 2015-05-12 22:57:55 -07:00
redmatrix
19a2bdeb91 cut/paste error 2015-05-12 21:40:49 -07:00
redmatrix
a67ada15f3 repo updaters 2015-05-12 21:35:30 -07:00
redmatrix
1e0e812440 provide a method for loading site/custom widgets 2015-05-12 18:11:54 -07:00
redmatrix
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
redmatrix
5dcdb676fd version update 2015-05-12 16:45:44 -07:00
jeroenpraat
643d7db4a3 Dutch 100\% again 2015-05-12 23:03:13 +02:00
redmatrix
f2a0dac653 fix a couple of miscellaneous errors which showed up in the logs 2015-05-11 22:57:12 -07:00
redmatrix
aeb69dcbbe let the site admin import a record directly from the probe diagnostic 2015-05-11 19:36:07 -07:00
redmatrix
61e205f593 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-11 17:50:38 -07:00
redmatrix
cddcf9d3ab missing translation 2015-05-11 17:50:17 -07:00
redmatrix
f4fc6b7782 Merge pull request #319 from solstag/ptbrupdate
update pt-br transation
2015-05-12 10:13:42 +10:00
Alexandre Hannud Abdo
e9bdd46cc6 update pt-br transation 2015-05-11 09:09:29 -03:00
redmatrix
2cb8b19972 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-10 13:18:04 -07:00
redmatrix
3140650b8f rev update 2015-05-10 13:17:41 -07:00
Mario Vavti
70e5bf04e1 uid > channel id to make submenus visible for observers 2015-05-10 21:52:48 +02:00
Mario Vavti
ca36fce9a7 provide drop down submenu suggestions in edit mode 2015-05-10 21:17:37 +02:00
Mario Vavti
fad37eb6d0 copy/paste typo 2015-05-10 15:08:18 +02:00
Mario Vavti
616338c17e provide ability to create submenus 2015-05-10 15:00:18 +02:00
zzottel
2114bfafca Merge pull request #318 from zzottel/master
update to German strings
2015-05-08 14:57:01 +02:00
zottel
9ef31e0402 update to German strings 2015-05-08 14:55:52 +02:00
Mario Vavti
cd8ecb8649 provide wrap variable for comanche menus 2015-05-07 23:02:14 +02:00
jeroenpraat
ef384be35f Update Dutch 2015-05-07 14:32:24 +02:00
Mario Vavti
4f235de3c5 provide a possibility to include js/css libs 2015-05-07 13:26:14 +02:00
Mario Vavti
8ca10dcbab adjust icon size 2015-05-07 10:35:22 +02:00
Mario Vavti
a1ed2bf2ac comanche doco 2015-05-06 14:17:52 +02:00
Mario Vavti
257c670d5c avoid double slash after editing layout 2015-05-06 12:16:53 +02:00
Mario Vavti
9391f6f905 allow blocks to have custom classes and add a new template called zen which gives you an empty page to work with 2015-05-06 10:53:26 +02:00
redmatrix
245080a6d7 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-05 19:24:35 -07:00
redmatrix
f559c91b7a turn consensus items into diaspora polls for that network 2015-05-05 19:23:21 -07:00
Paolo T
15fc4d05ec Merge pull request #317 from tuscanhobbit/dev
Italian translation
2015-05-04 16:36:00 +02:00