cd2b811555
move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts.
2015-09-26 23:44:30 -07:00
837b9224cc
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
doc/credits.bb
mod/thing.php
2015-09-02 20:33:58 -07:00
d9a67d64b1
Update the credits
2015-09-02 18:04:22 -07:00
ca0bc2bb7b
more work on AccessList integration
2015-08-27 22:20:30 -07:00
5786fd2221
extra encoding on mail titles
2015-08-20 01:12:35 -07:00
2bd05971ab
fix observer tags for now (issue #17 )
2015-07-16 08:28:37 +02:00
a497d8ee66
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/editpost.php
util/messages.po
view/nl/messages.po
view/nl/strings.php
2015-07-10 14:27:41 -07:00
efa55437d4
increase width of the aside area and make default profile image size 300x300
2015-07-09 13:59:16 +02:00
a3d7e8456a
undo the disabling of browser_prefetch and for the time being revert the HTML cache until we can isolate all the zid and observer calls. Also get rid of youtube and vimeo bbcode tags which we should not be using any more.
2015-06-25 20:07:10 -07:00
1a0655f34e
more work on mail flags
2015-06-23 21:01:59 -07:00
6aa159e2ac
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-18 19:15:01 -07:00
1a9c059062
issues with markdownify and escaped HTML
2015-06-18 16:35:40 -07:00
be0459a98b
convert the abook fields
2015-06-14 21:08:00 -07:00
b381ec5734
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/impel.php
2015-05-27 19:27:38 -07:00
3d79d4f577
define some custom attributes and html5 elements for htmlpurifier
2015-05-27 15:25:45 +02: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
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
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
f2a0dac653
fix a couple of miscellaneous errors which showed up in the logs
2015-05-11 22:57:12 -07:00
e85593e970
Hopefully this will make item_cache the default
2015-05-06 21:43:15 -07:00
a3c37f1458
first pass name change
2015-05-05 03:56:10 -07: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
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
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
01efda6850
api - unobscure mail
2015-04-19 13:41:12 -07:00
2001ad94bd
dont suggest anything here it explains itself
2015-04-14 11:59:49 +02:00
bf2a97147e
some more on webpages
2015-04-14 11:50:21 +02:00
8138373973
move style to style.css
2015-04-10 14:14:19 +02:00
5457b417f8
make r# work better with different font sizes
2015-04-10 14:01:40 +02:00
4fd80304a5
that didn't work out well - let's do this instead
2015-04-08 23:20:28 -07:00
4289c8adb2
fix selector when sys channel active
2015-04-08 23:12:39 -07:00
7bec4b313a
system channel always has allow_code privileges
2015-04-08 23:05:36 -07:00
754ac2cff7
Fix Design Tool navigation for sys channel.
...
Fix creating menu for sys channel.
2015-04-06 23:52:13 +02: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
e33da588bd
comanche: move 'webpage' declaration to the first parser pass so it is set when content loads.
2015-03-25 15:32:49 -07:00
c024668cf2
catche edge case of tag "@abcdef +1", which tags the first entry in your abook, regardless of abcdef. This holds true for other similar patterns as well.
2015-03-24 02:36:45 -07:00
c2acab21d4
improve performance of the zotfeed queries
2015-03-23 19:56:10 -07:00
a2e3ca6fd8
add loadtime search to channel and fix it for home. display and search need further investigation
2015-03-21 16:46:28 -07:00
63683734a2
make the channel item query match recent changes to network item query (and some slightly older changes in display item query), and allow '@' in linkified urls.
2015-03-18 19:06:05 -07:00
178b768e3c
openid cleanup
2015-03-16 17:08:50 -07:00
124b17dcf4
Some cleanups.
...
Fixed dbesc_identifier(), but it is not used yet.
Corrected some other variable names and variable initialization before
using them.
2015-03-13 00:36:32 +01:00
11df605c2e
support rel=me on channel "homepage" url
2015-02-24 00:45:03 -08:00
4b513d3322
issue #896
2015-02-12 19:22:07 -08:00
08b757a22c
Merge branch 'master' into tres
...
Conflicts:
mod/events.php
view/css/mod_events.css
2015-02-08 20:57:37 -08:00
7edab47658
get_rel_link broken - also weekly doc updates
2015-02-06 02:07:10 -08:00
redmatrix
zottel
Mario Vavti
friendica
Klaus Weidenbach