redmatrix
|
b2fde73952
|
asjld work
|
2015-06-02 17:46:22 -07:00 |
|
redmatrix
|
c1e139a550
|
error in directory bbcode image filter
|
2015-05-31 22:22:37 -07:00 |
|
redmatrix
|
84c085dcd7
|
bare bones ASLD
|
2015-05-31 22:16:14 -07:00 |
|
redmatrix
|
5cc5e0fafd
|
some basic background work for activitystreams-json-ld-2.0 conversions
|
2015-05-31 18:35:35 -07:00 |
|
redmatrix
|
cd3284d081
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-05-30 15:04:11 -07:00 |
|
redmatrix
|
edd228decb
|
strip images from directory text entries
|
2015-05-30 15:03:44 -07:00 |
|
Mario Vavti
|
5040506184
|
should not redefine $var in the function call
|
2015-05-29 17:59:31 +02:00 |
|
Mario Vavti
|
2514af6524
|
fix menu render for menu item edit - menu preview
|
2015-05-29 17:51:50 +02:00 |
|
Mario Vavti
|
b8d3280763
|
some fixes to make menu sharing work and expose it in the ui.
|
2015-05-29 13:08:01 +02:00 |
|
redmatrix
|
3a9139f76e
|
there was a reason we included that file
|
2015-05-28 22:06:22 -07:00 |
|
redmatrix
|
9ff988e3d7
|
parse error
|
2015-05-28 21:27:48 -07:00 |
|
redmatrix
|
07203c1de3
|
another case of committing with unsaved changes in a second window
|
2015-05-28 20:54:57 -07:00 |
|
redmatrix
|
0f09a4499b
|
add menu_created, menu_edited fields to DB
|
2015-05-28 16:59:56 -07:00 |
|
redmatrix
|
12c17f1265
|
menu encoding for sharing/exchange
|
2015-05-27 21:09:21 -07:00 |
|
redmatrix
|
11301d51a5
|
some high-level stuff we may need for shareable menus. Also make the client register function do the right thing even though I refuse to make it work. If **you** want service federation with things like pumpio and openid connect, it's time for **you** to put your own skin in the game and quit treating project volunteers like excrement just because you can't get up off your lazy buttocks.
|
2015-05-27 17:30:36 -07:00 |
|
redmatrix
|
5a889558aa
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-05-27 16:02:16 -07:00 |
|
redmatrix
|
3ecc9efd8d
|
fix for forked thread on diaspora
|
2015-05-27 16:01:51 -07:00 |
|
Mario Vavti
|
33a7f76ebc
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-05-27 15:26:12 +02:00 |
|
Mario Vavti
|
3d79d4f577
|
define some custom attributes and html5 elements for htmlpurifier
|
2015-05-27 15:25:45 +02:00 |
|
Mario Vavti
|
5ccc9e1b8d
|
make it possible to include menus in blocks - this will only work in html blocks of course
|
2015-05-27 15:21:30 +02:00 |
|
redmatrix
|
3fdf1ac458
|
revert for now
|
2015-05-27 01:49:47 -07:00 |
|
redmatrix
|
07e8fe1b1c
|
Comments need to have some kind of routing instructions.
|
2015-05-26 21:00:27 -07:00 |
|
jeroenpraat
|
ae69bf54a6
|
Update api.php
one comma to much
|
2015-05-26 22:20:45 +02:00 |
|
redmatrix
|
06eae98e53
|
placeholder for dynamic rego
|
2015-05-25 22:50:36 -07:00 |
|
redmatrix
|
9e6e41c6cb
|
slow but forward progress on dynamic client registration
|
2015-05-25 21:31:23 -07:00 |
|
redmatrix
|
9a0264f5d2
|
some work on issue #329
|
2015-05-25 19:17:35 -07:00 |
|
Habeas Codice
|
1354616787
|
one more
|
2015-05-24 09:30:31 -07:00 |
|
Habeas Codice
|
b15a68f05d
|
avoid db compatibility issues
|
2015-05-24 09:26:12 -07:00 |
|
Mario Vavti
|
57d520e69f
|
logic has changed - this is not needed anymore
|
2015-05-24 15:09:30 +02:00 |
|
Mario Vavti
|
125cd5e32b
|
should not call prepare text here anymore
|
2015-05-24 14:57:01 +02:00 |
|
Klaus
|
1ce3d01bb8
|
Merge pull request #332 from solstag/zotfeedcleanup
Import security only when necessary, use correct variable in log
|
2015-05-24 03:12:25 +02:00 |
|
redmatrix
|
7f9e4d6add
|
federation problem from diaspora comments relayed through red channels due to typo
|
2015-05-23 15:24:16 -07:00 |
|
redmatrix
|
11861949bb
|
add channel_id to local_dir_update hook
|
2015-05-23 15:19:50 -07:00 |
|
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
|
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 |
|
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 |
|
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
|
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 |
|