aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
Commit message (Expand)AuthorAgeFilesLines
...
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-261-1/+12
|\
| * required for future workredmatrix2015-08-261-1/+12
* | photo permission inheritance. We want to use the folder permissions unless sp...redmatrix2015-08-061-1/+1
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-301-1/+1
|\|
| * make superblock block a channel if it's an owner as well as the current autho...redmatrix2015-07-281-1/+1
* | the view_photos and post_photos permissions are redundant and are now mapped ...redmatrix2015-07-191-4/+2
* | since we've got a fresh start without a lot of legacy sites to support, provi...redmatrix2015-07-151-1/+2
* | convert the abook fieldsredmatrix2015-06-141-1/+1
* | Merge branch 'master' into tresfriendica2015-04-291-1/+4
|\|
| * disable voting in blocks, layouts and webpagesMario Vavti2015-04-291-0/+2
| * Provide webpage layout descriptionMario Vavti2015-04-251-1/+1
| * provide block titles in blocklistMario Vavti2015-04-241-0/+1
* | Merge branch 'master' into tresfriendica2015-04-231-238/+332
|\|
| * fix webpage permsMario Vavti2015-04-221-1/+1
| * allow jot to be displayed expanded, remove deprected datetimepicker js and so...Mario Vavti2015-04-171-1/+2
| * provide a separate input field for rpost attachmentsMario Vavti2015-04-161-0/+1
| * title=>nameMario Vavti2015-04-151-1/+1
| * Update/fix Dutch and removing an ugly spacejeroenpraat2015-04-021-1/+1
| * Correcting reported Doxygen syntax warnings.Klaus Weidenbach2015-03-291-5/+3
| * provide ways to over-ride the datetime pickersfriendica2015-03-261-0/+2
| * Fixed an exit of a loop in builtin_activity_puller().Klaus Weidenbach2015-03-211-128/+132
| * phase one of the great file storage unification - use one button for uploads ...friendica2015-03-161-1/+1
| * remove the now redundant audio/video buttons and label the editor text style ...friendica2015-03-111-0/+5
| * View upload photo button only if you have permission.Klaus Weidenbach2015-03-101-59/+54
| * bring back like/dislike summaries on photosfriendica2015-02-161-1/+1
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-02-111-1/+10
| |\
| | * to get the correct total count we should probably only count the arrays with ...marijus2015-02-111-1/+10
| | * typo agree->disagreemarijus2015-02-111-1/+1
| * | more efficient processing of response activities, plus a proof of concept fix...friendica2015-02-111-0/+6
| * | cut/paste typofriendica2015-02-111-1/+1
| |/
| * more permissions tweakingfriendica2015-02-101-0/+3
| * item voting toolsfriendica2015-02-101-0/+5
| * more attendancefriendica2015-02-101-73/+69
| * cleanup event attendance - make sure it works in list mode.friendica2015-02-101-13/+4
| * more progress on event confirmationsfriendica2015-02-101-3/+28
| * like formatting for extended consensus itemsfriendica2015-02-091-0/+53
* | Merge branch 'master' into tresfriendica2015-02-051-5/+4
|\|
| * allow post expiration to be set from a config (and therefore a plugin/addon)friendica2015-02-051-1/+4
| * order ratings friends firstfriendica2015-02-031-4/+0
* | Merge branch 'master' into tresfriendica2015-01-291-26/+26
|\|
| * local_user => local_channelfriendica2015-01-281-26/+26
* | more expanding item flagsfriendica2015-01-221-12/+3
* | heavy lifting converting item flag bitsfriendica2015-01-221-1/+1
|/
* basic proof of concept file activity support - will send activity via the fil...marijus2015-01-181-1/+1
* basic backend work for creating consensus itemsfriendica2015-01-111-16/+49
* basic changes for file activitymarijus2015-01-091-0/+1
* fix label of preview buttonmarijus2014-12-171-1/+1
* edit and preview removed from additional features and turned into core functi...friendica2014-12-161-3/+2
* Provide censorship.Thomas Willingham2014-12-101-4/+9
* show clear browser location button only if use browser location option is set...marijus2014-12-091-1/+1