aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'upstream/master'Michael Vogel2012-04-111-5/+5
|\
| * cleanup photo menusfriendica2012-04-101-5/+5
* | API: Improved the timeline. Several (disabled) tests with caching of photos.Michael Vogel2012-04-111-5/+0
|/
* Merge branch 'master' of https://github.com/friendica/friendicaAlexander Kampmann2012-04-051-22/+43
|\
| * allow users to set categories on their postsMichael Johnston2012-04-011-0/+2
| * more error handlingfriendica2012-03-311-1/+1
| * rename "file as" to "save to folder"friendica2012-03-301-2/+2
| * bug #352 - qcomment plugin disabled, qcomments still allowedfriendica2012-03-301-2/+5
| * silly mistakefriendica2012-03-291-2/+3
| * zrl on mentionsfriendica2012-03-291-0/+6
| * use zrl to get home againfriendica2012-03-291-17/+26
|/
* remove stray template variable from old codefriendica2012-03-201-2/+1
* replace split() by explode(); split is deprecatedTobias Hößl2012-03-181-1/+1
* add "send pm" link to photo dropdown for Diaspora contactsfriendica2012-03-161-0/+11
* basic ssl_policy for important modulesfriendica2012-03-141-17/+23
* more work on filer, comment level and file tag removalfriendica2012-03-131-15/+19
* file as widget and basic filing implementation for duepuntozero,slackrfriendica2012-03-131-0/+2
* Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-091-118/+112
|\
| * bug in check for private email comment to public conversation prevents authen...friendica2012-03-091-23/+8
| * keep tony from talking to himselffriendica2012-03-081-1/+1
| * bugs #312, #313friendica2012-03-061-1/+1
| * conversation: remove templating items in code and move it to template.Fabio Comuni2012-03-011-94/+103
* | Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.phpTobias Hößl2012-02-281-2/+3
* | Merge remote branch 'upstream/master'Tobias Hößl2012-02-281-2/+12
|\|
| * tagging missing from wallwall and a couple of themes, star missing from dispyfriendica2012-02-261-2/+12
* | wasn't actually changed beforeTobias Hößl2012-02-281-2/+2
|/
* 1 Bugfix (missing $ character) and avoid some noticesTobias Hößl2012-02-261-3/+3
* quick commentsfriendica2012-02-151-2/+3
* preliminary qcomment support, [nosmile] tag to disable smiley processingfriendica2012-02-141-1/+4
* localise links to private photos inside messagesfriendica2012-02-141-0/+22
* make hr bbtag shareable, stray quote in duepuntozero wall_itemfriendica2012-02-131-1/+0
* Merge remote-tracking branch 'friendica/master' into mobileFabio Comuni2012-02-131-18/+21
|\
| * add render_location hook to both sets of conversationsfriendica2012-02-091-11/+5
| * render_location hookfriendica2012-02-091-8/+17
* | hidden jot in "display" to allow reshareFabio Comuni2012-02-101-3/+9
|/
* basic support for plaintext editor configuration (disable tinymce), currently...friendica2012-02-061-86/+90
* bug #254friendica2012-01-241-0/+28
* add remove_user hook (it looks like dreamhost changed all my file permissions...friendica2012-01-181-0/+0
* modified item_photo_menu hookfriendica2012-01-111-2/+4
* post preview to loozahfriendica2012-01-101-0/+4
* post previewfriendica2012-01-091-1/+6
* Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-01-061-2/+3
|\
| * comment previewfriendica2012-01-051-2/+3
* | Use html5 placeholder for title text inputFabio Comuni2012-01-061-1/+2
* | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-01-061-12/+23
|\|
| * dynamic title input box - via fabrixxmfriendica2012-01-041-1/+4
| * suggestion notificationsfriendica2012-01-031-14/+21
| * fix reference variable effects on sortingfriendica2012-01-031-3/+7
* | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-01-031-0/+60
|\|
| * check count before foreachfriendica2012-01-021-2/+3