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
dd72f580dd
update readme
2015-05-17 16:40:42 -07: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
f0cb3cba12
Merge branch 'master' into tres
2015-05-14 22:12:56 -07:00
redmatrix
291f3beccf
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-14 22:12:37 -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
9de88c49c3
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-14 20:10:45 -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
redmatrix
a6cb90c81c
Merge branch 'master' into tres
...
Conflicts:
include/Import/refimport.php
include/activities.php
include/attach.php
include/event.php
include/externals.php
include/identity.php
include/items.php
include/notifier.php
include/photos.php
include/taxonomy.php
include/zot.php
mod/channel.php
mod/connedit.php
mod/events.php
mod/item.php
mod/like.php
mod/manage.php
mod/mood.php
mod/ping.php
mod/poke.php
mod/subthread.php
mod/tagger.php
mod/thing.php
2015-05-14 18:02:29 -07: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
51b89f0ed8
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
doc/DerivedTheme1.md
doc/Developers.md
doc/Features.md
doc/Plugins.md
doc/Privacy.md
doc/README.md
doc/Remove-Account.md
doc/Translations.md
doc/about.bb
doc/account_basics.bb
doc/accounts_profiles_channels_basics.bb
doc/addons.bb
doc/addons_gnusocial.bb
doc/bbcode.html
doc/campaign.bb
doc/classRedmatrix_1_1Import_1_1Import-members.html
doc/classRedmatrix_1_1Import_1_1Import.html
doc/cloud.bb
doc/connecting_to_channels.bb
doc/connecting_to_channels.md
doc/credits.bb
doc/de/channels.bb
doc/de/features.bb
doc/de/main.bb
doc/de/registration.bb
doc/developers.bb
doc/encryption.bb
doc/external-resource-links.bb
doc/extra_features.bb
doc/faq_admins.bb
doc/faq_developers.bb
doc/faq_members.bb
doc/features.bb
doc/hidden_configs.bb
doc/history.md
doc/html/index.php
doc/main.bb
doc/permissions.bb
doc/plugins.bb
doc/problems-following-an-update.bb
doc/profiles.bb
doc/red2pi.bb
doc/registration.bb
doc/roadmap.bb
doc/sv/main.bb
doc/what_is_zot.bb
doc/zot.md
2015-05-13 19:23:13 -07: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
475dc7b686
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
boot.php
include/api.php
include/enotify.php
2015-05-13 17:07:12 -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
4ca06ebd79
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-12 21:57:06 -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
018e702281
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/mitem.php
view/nl/strings.php
2015-05-12 19:00:54 -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
5386686a1e
missing merge conflict
2015-05-11 17:46:58 -07:00
redmatrix
aceb7ae8e9
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
view/pt-br/messages.po
view/pt-br/strings.php
2015-05-11 17:15:07 -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
1dc5b6a03a
Merge branch 'master' of https://github.com/redmatrix/hubzilla into merger
2015-05-10 13:33:16 -07:00
redmatrix
2c7a4c254d
correcting upstream
2015-05-10 13:30:30 -07:00
redmatrix
e0b5bce5a6
Merge pull request #1 from anaqreon/patch-1
...
Misspelling
2015-05-11 06:29:46 +10:00
redmatrix
0a644a2f41
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/mitem.php
view/de/messages.po
view/de/strings.php
2015-05-10 13:26:44 -07: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
redmatrix
Klaus
Razlo
Mario Vavti
jeroenpraat
Alexandre Hannud Abdo