0b347ccc14
turn the connection filter into a feature.
2015-06-29 20:35:56 -07:00
63f2e9b412
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/zot.php
mod/connedit.php
util/messages.po
2015-06-28 22:33:13 -07:00
de13497333
no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool.
2015-06-28 21:16:56 -07:00
1a0655f34e
more work on mail flags
2015-06-23 21:01:59 -07:00
cb76fb8b9b
item flag fixes discovered after a few merges
2015-06-23 19:45:39 -07:00
833098e346
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/items.php
mod/item.php
2015-06-23 17:30:35 -07:00
9879cf3c6c
ensure we always sign a trimmed item body.
2015-06-22 16:09:02 -07:00
ae6612025d
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/items.php
util/messages.po
2015-06-21 20:51:07 -07:00
ec23a94b6d
Make item_store_update only affect the data we requested
2015-06-20 02:21:25 -03:00
be0459a98b
convert the abook fields
2015-06-14 21:08:00 -07:00
5733491ac8
more work on items
...
and
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
view/it/messages.po
view/it/strings.php
2015-06-11 17:56:56 -07:00
8812f183a2
the hubzilla version of this function
2015-06-11 16:11:59 -07:00
dc7de12991
hubzilla compatibility function
2015-06-11 15:52:37 -07:00
ca870dbf31
more work on item table optimisation
2015-06-10 16:59:04 -07:00
7cbc504874
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-02 17:47:47 -07:00
b2fde73952
asjld work
2015-06-02 17:46:22 -07:00
84c085dcd7
bare bones ASLD
2015-05-31 22:16:14 -07:00
f3b95f591a
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-31 19:26:00 -07:00
5cc5e0fafd
some basic background work for activitystreams-json-ld-2.0 conversions
2015-05-31 18:35:35 -07:00
3a9139f76e
there was a reason we included that file
2015-05-28 22:06:22 -07:00
851f2f64df
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
index.php
mod/setup.php
2015-05-24 15:50:05 -07:00
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
7f9e4d6add
federation problem from diaspora comments relayed through red channels due to typo
2015-05-23 15:24:16 -07:00
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
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
c10a4ca9c7
re-arrange the html cache a bit
2015-05-20 20:28:16 -07:00
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
0826c5fd96
don't allow item_id to update without a valid post id
2015-05-20 19:18:32 -07:00
6466774b6e
PRIVACY: possible privacy leakage under a defined set of circumstances
2015-05-20 18:46:23 -07:00
507dfb9f85
add rot47 to the mix. This shouldn't affect the speed to any measurable degree.
2015-05-19 21:51:48 -07:00
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
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
25b599a4bd
convert ITEM_WALL from bitfield to standalone
2015-05-06 21:03:33 -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
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
c4221f3273
Merge branch 'master' into tres
...
Conflicts:
include/notifier.php
2015-04-29 21:49:43 -07:00
268307b534
zotfeed issues
2015-04-24 15:01:37 -07:00
41343b32c5
block unfederated posts from zot_feed
2015-04-23 21:45:42 -07:00
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
53339d19a3
issue #176 , sender copy of item not obscured if using private mention
2015-04-20 20:14:07 -07:00
9942dec09c
match parens
2015-04-14 20:52:07 -07:00
32acb7f6e1
post_activity_item incorrectly setting the obj_type when a valid type was specified
2015-04-14 20:50:38 -07:00
fdd6508019
Some documentation and whitespaces at line endings.
2015-04-10 00:28:23 +02:00
37afc81847
update features, allow sys account page deletion
2015-04-08 17:54:52 -07:00
d0361582b0
Correcting reported Doxygen syntax warnings.
...
Fixed wrong Doxygen syntax and add some of the available FIXME to
Doxygen documentation.
Updated Doxygen configuration to add also all capital letter tags.
Adding some more Doxygen documentation.
2015-03-29 22:23:00 +02:00
76a6739b93
remove bogus grouping from fix for #938
2015-03-28 18:47:28 -07:00
1e4490079b
issue #938
2015-03-28 18:45:58 -07:00
022305fe83
also allow service classes to set post expiration. These take priority over the site default.
2015-03-24 20:38:53 -07:00
redmatrix
Alexandre Hannud Abdo
Klaus
friendica