aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-101-1/+1
|\ | | | | | | | | | | | | | | Conflicts: mod/editpost.php util/messages.po view/nl/messages.po view/nl/strings.php
| * increase width of the aside area and make default profile image size 300x300Mario Vavti2015-07-091-1/+1
| |
* | undo the disabling of browser_prefetch and for the time being revert the ↵redmatrix2015-06-251-10/+10
| | | | | | | | 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.
* | more work on mail flagsredmatrix2015-06-231-3/+2
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-181-4/+4
|\|
| * issues with markdownify and escaped HTMLredmatrix2015-06-181-4/+4
| |
* | convert the abook fieldsredmatrix2015-06-141-8/+7
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-271-0/+66
|\| | | | | | | | | Conflicts: mod/impel.php
| * define some custom attributes and html5 elements for htmlpurifierMario Vavti2015-05-271-0/+66
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-201-6/+1
|\| | | | | | | | | | | | | | | Conflicts: include/items.php include/text.php mod/item.php view/nl/messages.po
| * PRIVACY: possible privacy leakage under a defined set of circumstancesredmatrix2015-05-201-10/+0
| |
* | re-arrange the html cache a bitredmatrix2015-05-201-12/+14
| |
* | add rot47 to the mix. This shouldn't affect the speed to any measurable degree.redmatrix2015-05-191-2/+8
| |
* | mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution ↵redmatrix2015-05-191-3/+2
| | | | | | | | cipher would be adequate for our requirements.
* | Merge branch 'master' into tresredmatrix2015-05-141-15/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-121-1/+1
| |\| | | | | | | | | | | | | | | | Conflicts: mod/mitem.php view/nl/strings.php
| | * fix a couple of miscellaneous errors which showed up in the logsredmatrix2015-05-111-1/+1
| | |
| * | Hopefully this will make item_cache the defaultredmatrix2015-05-061-11/+11
| | |
| * | first pass name changeredmatrix2015-05-051-3/+3
| |/
* | Merge branch 'master' into tresfriendica2015-05-011-0/+18
|\|
| * more performance workfriendica2015-04-301-1/+9
| |
| * just a test, please do not try to implement this as there are severe ↵friendica2015-04-301-0/+10
| | | | | | | | security issues
* | Merge branch 'master' into tresfriendica2015-04-231-217/+305
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * api - unobscure mailfriendica2015-04-191-0/+11
| |
| * dont suggest anything here it explains itselfMario Vavti2015-04-141-1/+1
| |
| * some more on webpagesMario Vavti2015-04-141-12/+15
| |
| * move style to style.cssMario Vavti2015-04-101-3/+3
| |
| * make r# work better with different font sizesMario Vavti2015-04-101-3/+3
| |
| * that didn't work out well - let's do this insteadfriendica2015-04-081-27/+16
| |
| * fix selector when sys channel activefriendica2015-04-081-0/+13
| |
| * system channel always has allow_code privilegesfriendica2015-04-081-6/+19
| |
| * Fix Design Tool navigation for sys channel.Klaus Weidenbach2015-04-061-6/+16
| | | | | | | | Fix creating menu for sys channel.
| * Correcting reported Doxygen syntax warnings.Klaus Weidenbach2015-03-291-149/+182
| | | | | | | | | | | | | | 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.
| * comanche: move 'webpage' declaration to the first parser pass so it is set ↵friendica2015-03-251-2/+2
| | | | | | | | when content loads.
| * catche edge case of tag "@abcdef +1", which tags the first entry in your ↵friendica2015-03-241-6/+15
| | | | | | | | abook, regardless of abcdef. This holds true for other similar patterns as well.
| * improve performance of the zotfeed queriesfriendica2015-03-231-3/+7
| |
| * add loadtime search to channel and fix it for home. display and search need ↵friendica2015-03-211-2/+1
| | | | | | | | further investigation
| * make the channel item query match recent changes to network item query (and ↵friendica2015-03-181-1/+1
| | | | | | | | some slightly older changes in display item query), and allow '@' in linkified urls.
| * openid cleanupfriendica2015-03-161-7/+5
| |
| * Some cleanups.Klaus Weidenbach2015-03-131-13/+16
| | | | | | | | | | | | Fixed dbesc_identifier(), but it is not used yet. Corrected some other variable names and variable initialization before using them.
| * support rel=me on channel "homepage" urlfriendica2015-02-241-2/+2
| |
| * issue #896friendica2015-02-121-2/+4
| |
* | Merge branch 'master' into tresfriendica2015-02-081-1/+1
|\| | | | | | | | | | | Conflicts: mod/events.php view/css/mod_events.css
| * get_rel_link broken - also weekly doc updatesfriendica2015-02-061-1/+1
| |
* | Merge branch 'master' into tresfriendica2015-02-051-2/+5
|\| | | | | | | | | | | Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css
| * garbage in garbage outfriendica2015-02-031-2/+2
| |
| * issue #889 private tags for forums no longer recognised after tag refactor a ↵friendica2015-02-021-0/+3
| | | | | | | | few weeks back. This solution is not optimal as it also leaves you in the privacy ACL in some cases and not in others but it restores the previous functionality
* | Merge branch 'master' into tresfriendica2015-02-011-0/+1
|\|
| * add multipart/mixed to getIconFromType()marijus2015-02-011-0/+1
| |
* | Merge branch 'master' into tresfriendica2015-01-291-10/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php