4e3583ab45
allow block title to contain $content title
2015-05-18 22:18:01 +02:00
7c7a5cba8f
Merge branch 'master' into tres
2015-05-17 19:49:36 -07:00
76558df966
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/bb2diaspora.php
include/diaspora.php
include/enotify.php
mod/admin.php
mod/cloud.php
mod/dav.php
mod/home.php
mod/invite.php
mod/like.php
mod/mitem.php
mod/p.php
mod/pubsites.php
mod/setup.php
mod/siteinfo.php
util/messages.po
2015-05-17 19:48:57 -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
91d7b0f7eb
more work isolating the projectname from core.
2015-05-17 16:28:16 -07: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
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
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
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
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
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
f2a0dac653
fix a couple of miscellaneous errors which showed up in the logs
2015-05-11 22:57:12 -07:00
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
2cb8b19972
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-10 13:18:04 -07:00
3140650b8f
rev update
2015-05-10 13:17:41 -07:00
70e5bf04e1
uid > channel id to make submenus visible for observers
2015-05-10 21:52:48 +02:00
616338c17e
provide ability to create submenus
2015-05-10 15:00:18 +02:00
37a63365f1
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-07 16:44:28 -07:00
cd8ecb8649
provide wrap variable for comanche menus
2015-05-07 23:02:14 +02:00
4f235de3c5
provide a possibility to include js/css libs
2015-05-07 13:26:14 +02:00
8ca10dcbab
adjust icon size
2015-05-07 10:35:22 +02:00
90591bcbc9
missed one...
2015-05-06 22:56:08 -07:00
d01206af5a
forgot to save
2015-05-06 21:43:52 -07:00
e85593e970
Hopefully this will make item_cache the default
2015-05-06 21:43:15 -07:00
25b599a4bd
convert ITEM_WALL from bitfield to standalone
2015-05-06 21:03:33 -07:00
75b8bfc07a
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-06 18:39:12 -07:00
f17c1f9694
no need to obscure the diaspora signature if we're not obscuring the posts
2015-05-06 18:38:30 -07:00
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
245080a6d7
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-05 19:24:35 -07:00
f559c91b7a
turn consensus items into diaspora polls for that network
2015-05-05 19:23:21 -07:00
c9ec4f46b6
for hubzilla we won't be obscuring items, only private mail, this will allow us to search and cache private posts
2015-05-05 18:36:05 -07:00
5b5f0666f9
second pass name change
2015-05-05 03:59:51 -07:00
a3c37f1458
first pass name change
2015-05-05 03:56:10 -07:00
ad7a629b96
remove obsolete linebreak
2015-05-04 15:04:21 +02:00
b467dc4f00
Merge branch 'master' into tres
2015-05-01 13:19:19 -07:00
e4fe068ed5
more performance work
2015-04-30 18:16:54 -07:00
9fc87d43c9
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-04-30 17:53:47 -07:00
097002910e
just a test, please do not try to implement this as there are severe security issues
2015-04-30 17:52:34 -07:00
c4221f3273
Merge branch 'master' into tres
...
Conflicts:
include/notifier.php
2015-04-29 21:49:43 -07:00
310d122901
disable voting in blocks, layouts and webpages
2015-04-29 21:36:53 +02:00
31b5b06e42
Provide webpage layout description
2015-04-25 22:35:24 +02:00
e01873b4cf
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-04-24 15:01:59 -07:00
Mario Vavti
redmatrix
Klaus Weidenbach
friendica