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
Alexandre Hannud Abdo
760f17b173
Import security only when necessary, use correct variable in log
...
Just some cleanup, seemed like the intent of previous changes was so
2015-05-22 10:27:17 -03:00
redmatrix
5795e2a58b
more migration of page types
2015-05-21 22:17:17 -07:00
redmatrix
3763f74a10
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/items.php
include/text.php
mod/item.php
view/nl/messages.po
2015-05-20 20:49:06 -07:00
redmatrix
c10a4ca9c7
re-arrange the html cache a bit
2015-05-20 20:28:16 -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
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
Mario Vavti
578d21120a
make design elements translateable
2015-05-20 08:34:40 +02:00
redmatrix
e68a00d381
more db structure
2015-05-19 22:43:24 -07:00
redmatrix
507dfb9f85
add rot47 to the mix. This shouldn't affect the speed to any measurable degree.
2015-05-19 21:51:48 -07:00
redmatrix
c78869e437
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
view/nl/messages.po
view/nl/strings.php
2015-05-19 17:36:11 -07: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
redmatrix
77e2ef45f0
mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution cipher would be adequate for our requirements.
2015-05-19 02:16:12 -07:00
redmatrix
c11b1f8b0d
vsprintf error
2015-05-18 22:07:38 -07:00
redmatrix
e521da05da
consensus items not working correctly and make the collections widget abide by the corresponding feature setting. This needs to be backported as it is borken in redmatrix. Also provide the ability to change the number of most recent expanded comments to conversations on a site-wide basis, increase it to 3 by default. We may also want this as a personal setting.
2015-05-18 21:32:55 -07:00
redmatrix
da7abbb089
bring the new photo schema into play
2015-05-18 19:43:53 -07:00
redmatrix
4c319a98a8
fix some merge errors
2015-05-18 17:20:59 -07:00
redmatrix
2dd0e7f6bd
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
view/nl/messages.po
view/nl/strings.php
2015-05-18 15:58:13 -07: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
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
redmatrix
7c7a5cba8f
Merge branch 'master' into tres
2015-05-17 19:49:36 -07:00
redmatrix
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
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
91d7b0f7eb
more work isolating the projectname from core.
2015-05-17 16:28:16 -07: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
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
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
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
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
f2a0dac653
fix a couple of miscellaneous errors which showed up in the logs
2015-05-11 22:57:12 -07: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
Mario Vavti
616338c17e
provide ability to create submenus
2015-05-10 15:00:18 +02:00
redmatrix
37a63365f1
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-07 16:44:28 -07:00
Mario Vavti
cd8ecb8649
provide wrap variable for comanche menus
2015-05-07 23:02:14 +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
redmatrix
90591bcbc9
missed one...
2015-05-06 22:56:08 -07:00
redmatrix
d01206af5a
forgot to save
2015-05-06 21:43:52 -07:00
redmatrix
e85593e970
Hopefully this will make item_cache the default
2015-05-06 21:43:15 -07:00
redmatrix
25b599a4bd
convert ITEM_WALL from bitfield to standalone
2015-05-06 21:03:33 -07:00
redmatrix
75b8bfc07a
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-06 18:39:12 -07:00
redmatrix
f17c1f9694
no need to obscure the diaspora signature if we're not obscuring the posts
2015-05-06 18:38:30 -07: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
redmatrix
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
redmatrix
5b5f0666f9
second pass name change
2015-05-05 03:59:51 -07:00
redmatrix
a3c37f1458
first pass name change
2015-05-05 03:56:10 -07:00
Mario Vavti
ad7a629b96
remove obsolete linebreak
2015-05-04 15:04:21 +02:00
friendica
b467dc4f00
Merge branch 'master' into tres
2015-05-01 13:19:19 -07:00
friendica
e4fe068ed5
more performance work
2015-04-30 18:16:54 -07:00
friendica
9fc87d43c9
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-04-30 17:53:47 -07:00
friendica
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
friendica
c4221f3273
Merge branch 'master' into tres
...
Conflicts:
include/notifier.php
2015-04-29 21:49:43 -07:00
Mario Vavti
310d122901
disable voting in blocks, layouts and webpages
2015-04-29 21:36:53 +02:00
Mario Vavti
31b5b06e42
Provide webpage layout description
2015-04-25 22:35:24 +02:00
friendica
e01873b4cf
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-04-24 15:01:59 -07:00
friendica
268307b534
zotfeed issues
2015-04-24 15:01:37 -07:00
Mario Vavti
cc3c1107bd
add widget class to blocks again by default. we have the wrap variable now to remove the div wrapper if necessary.
2015-04-24 22:41:56 +02:00
Mario Vavti
b7f6cceaea
provide block titles in blocklist
2015-04-24 22:37:22 +02:00
friendica
b3ac1cd993
mod/branchtopic - move an off-topic comment to its own thread as a fresh wall-to-wall post and the same delivery permissions as its parent. No adjustments are made for complex delivery chains.
2015-04-24 00:56:06 -07:00
friendica
41343b32c5
block unfederated posts from zot_feed
2015-04-23 21:45:42 -07:00
friendica
5ac177391b
disconnect
2015-04-23 21:13:59 -07:00
friendica
6679734135
Merge branch 'master' into tres
...
Conflicts:
include/Contact.php
include/ItemObject.php
include/api.php
include/attach.php
include/diaspora.php
include/dir_fns.php
include/enotify.php
include/event.php
include/expire.php
include/items.php
include/notifier.php
include/notify.php
include/photos.php
include/taxonomy.php
include/text.php
include/widgets.php
include/zot.php
mod/admin.php
mod/channel.php
mod/dirsearch.php
mod/display.php
mod/editwebpage.php
mod/events.php
mod/home.php
mod/item.php
mod/manage.php
mod/mood.php
mod/network.php
mod/page.php
mod/photos.php
mod/ping.php
mod/post.php
mod/thing.php
mod/viewsrc.php
view/css/mod_events.css
2015-04-23 19:49:41 -07:00
Mario Vavti
9e490d022b
fix webpage perms
2015-04-22 12:00:15 +02:00
friendica
2cef6c3ac5
use PERMS_SPECIFIC for anything that hasn't been specified. This way there's nothing that's "only yourself", and let's you add additional permissions at will rather than be forced to accept the defaults or turn on custom permissions just to give a friend delegation rights or the ability to post photos.
2015-04-21 21:41:39 -07:00
friendica
6bc2766d79
issue #162
2015-04-20 20:49:55 -07:00
friendica
53339d19a3
issue #176 , sender copy of item not obscured if using private mention
2015-04-20 20:14:07 -07:00
friendica
3eeea9d8f0
force event obj_type on update
2015-04-20 17:02:45 -07:00
friendica
9cc8b44579
issue #157 , provide default directory sort order
2015-04-19 23:04:14 -07:00
friendica
4383564777
doco updates
2015-04-19 21:39:45 -07:00
friendica
d5f4a19a77
add favorites/create and destroy to api
2015-04-19 20:37:24 -07:00
friendica
f315c55d32
api performance enhancer
2015-04-19 18:57:12 -07:00
friendica
185ce2da69
assorted fixes to api direct messages
2015-04-19 18:14:17 -07:00
friendica
6511d5ee2c
some api cleanup
2015-04-19 17:39:17 -07:00
friendica
82f2765f7b
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-04-19 13:41:38 -07:00
friendica
01efda6850
api - unobscure mail
2015-04-19 13:41:12 -07:00
Mario Vavti
71117628bc
attach an id to menues, allow $menu_title to be empty, if no custom menu class is provided use default redbasic classes
2015-04-19 15:22:50 +02:00
Mario Vavti
dd5b97639e
Introduce wrap variable in comanche blocks (if set to none the block will not be wrapped in a div), fix menu item permissions (it was not possible to set them visible for everybody) and a typo
2015-04-19 13:25:05 +02:00
friendica
0883512e30
log this since we may need it to track down failures
2015-04-18 17:40:44 -07:00
friendica
0ce8572fef
remove failed experiment
2015-04-17 23:04:58 -07:00
friendica
e1b9053563
add last post to api/account/verify_credentials
2015-04-17 20:22:10 -07:00