Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | move photo object stuff from itemObject to prepare_body() so we can do more ↵ | Mario Vavti | 2015-10-22 | 1 | -10/+27 | |
| | | | | stuff with it | |||||
* | extened the earlier fix | redmatrix | 2015-10-19 | 1 | -2/+2 | |
| | ||||||
* | issues with "the Register" feed | redmatrix | 2015-10-18 | 1 | -1/+1 | |
| | ||||||
* | really fix label name | Mario Vavti | 2015-10-15 | 1 | -1/+6 | |
| | ||||||
* | wrong logic | Mario Vavti | 2015-10-15 | 1 | -1/+1 | |
| | ||||||
* | fix label name | Mario Vavti | 2015-10-15 | 1 | -5/+2 | |
| | ||||||
* | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-10-15 | 1 | -1/+1 | |
|\ | ||||||
| * | issue #86 - like/dislike in photos not working | redmatrix | 2015-10-14 | 1 | -1/+1 | |
| | | ||||||
* | | remove $item from $prep_arr - we probably do not need it | Mario Vavti | 2015-10-14 | 1 | -1/+1 | |
| | | ||||||
* | | allow photo-items to appear full width if large photos feature is enabled. ↵ | Mario Vavti | 2015-10-14 | 1 | -48/+40 | |
|/ | | | | in prepare_body() split off mentions, tags, categories folders and attachments from body for easier theming. some other little fixes. | |||||
* | functions to update urls in items when doing migrations | redmatrix | 2015-10-06 | 1 | -0/+44 | |
| | ||||||
* | move string files to hmessages.po and hstrings.php for hubzilla to avoid ↵ | redmatrix | 2015-09-26 | 1 | -2/+2 | |
| | | | | endless merge conflicts. | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-02 | 1 | -4/+0 | |
|\ | | | | | | | | | | | Conflicts: doc/credits.bb mod/thing.php | |||||
| * | Update the credits | redmatrix | 2015-09-02 | 1 | -4/+0 | |
| | | ||||||
* | | more work on AccessList integration | redmatrix | 2015-08-27 | 1 | -56/+0 | |
| | | ||||||
* | | extra encoding on mail titles | redmatrix | 2015-08-20 | 1 | -1/+1 | |
| | | ||||||
* | | fix observer tags for now (issue #17) | zottel | 2015-07-16 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-10 | 1 | -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 300x300 | Mario Vavti | 2015-07-09 | 1 | -1/+1 | |
| | | ||||||
* | | undo the disabling of browser_prefetch and for the time being revert the ↵ | redmatrix | 2015-06-25 | 1 | -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 flags | redmatrix | 2015-06-23 | 1 | -3/+2 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-18 | 1 | -4/+4 | |
|\| | ||||||
| * | issues with markdownify and escaped HTML | redmatrix | 2015-06-18 | 1 | -4/+4 | |
| | | ||||||
* | | convert the abook fields | redmatrix | 2015-06-14 | 1 | -8/+7 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-27 | 1 | -0/+66 | |
|\| | | | | | | | | | Conflicts: mod/impel.php | |||||
| * | define some custom attributes and html5 elements for htmlpurifier | Mario Vavti | 2015-05-27 | 1 | -0/+66 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-20 | 1 | -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 circumstances | redmatrix | 2015-05-20 | 1 | -10/+0 | |
| | | ||||||
* | | re-arrange the html cache a bit | redmatrix | 2015-05-20 | 1 | -12/+14 | |
| | | ||||||
* | | add rot47 to the mix. This shouldn't affect the speed to any measurable degree. | redmatrix | 2015-05-19 | 1 | -2/+8 | |
| | | ||||||
* | | mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution ↵ | redmatrix | 2015-05-19 | 1 | -3/+2 | |
| | | | | | | | | cipher would be adequate for our requirements. | |||||
* | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 1 | -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/redmatrix | redmatrix | 2015-05-12 | 1 | -1/+1 | |
| |\| | | | | | | | | | | | | | | | | Conflicts: mod/mitem.php view/nl/strings.php | |||||
| | * | fix a couple of miscellaneous errors which showed up in the logs | redmatrix | 2015-05-11 | 1 | -1/+1 | |
| | | | ||||||
| * | | Hopefully this will make item_cache the default | redmatrix | 2015-05-06 | 1 | -11/+11 | |
| | | | ||||||
| * | | first pass name change | redmatrix | 2015-05-05 | 1 | -3/+3 | |
| |/ | ||||||
* | | Merge branch 'master' into tres | friendica | 2015-05-01 | 1 | -0/+18 | |
|\| | ||||||
| * | more performance work | friendica | 2015-04-30 | 1 | -1/+9 | |
| | | ||||||
| * | just a test, please do not try to implement this as there are severe ↵ | friendica | 2015-04-30 | 1 | -0/+10 | |
| | | | | | | | | security issues | |||||
* | | Merge branch 'master' into tres | friendica | 2015-04-23 | 1 | -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 mail | friendica | 2015-04-19 | 1 | -0/+11 | |
| | | ||||||
| * | dont suggest anything here it explains itself | Mario Vavti | 2015-04-14 | 1 | -1/+1 | |
| | | ||||||
| * | some more on webpages | Mario Vavti | 2015-04-14 | 1 | -12/+15 | |
| | | ||||||
| * | move style to style.css | Mario Vavti | 2015-04-10 | 1 | -3/+3 | |
| | | ||||||
| * | make r# work better with different font sizes | Mario Vavti | 2015-04-10 | 1 | -3/+3 | |
| | | ||||||
| * | that didn't work out well - let's do this instead | friendica | 2015-04-08 | 1 | -27/+16 | |
| | | ||||||
| * | fix selector when sys channel active | friendica | 2015-04-08 | 1 | -0/+13 | |
| | | ||||||
| * | system channel always has allow_code privileges | friendica | 2015-04-08 | 1 | -6/+19 | |
| | | ||||||
| * | Fix Design Tool navigation for sys channel. | Klaus Weidenbach | 2015-04-06 | 1 | -6/+16 | |
| | | | | | | | | Fix creating menu for sys channel. | |||||
| * | Correcting reported Doxygen syntax warnings. | Klaus Weidenbach | 2015-03-29 | 1 | -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. |