aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | start on some db_table docofriendica2015-03-152-14/+44
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-1514-1338/+1259
|\ \
| * \ Merge pull request #931 from dawnbreak/masterRedMatrix2015-03-1614-1338/+1259
| |\ \
| | * | Documentation and remove duplicate code.Klaus Weidenbach2015-03-161-72/+79
| | * | Some JavaScript cleanups.Klaus Weidenbach2015-03-1513-1266/+1180
| |/ /
* | | mod_id: load profile so the sidebar profile will workfriendica2015-03-152-39/+20
* | | Show profile on openid server pagefriendica2015-03-151-0/+4
* | | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-152-7/+12
|\| |
| * | assure that badges will be displayed as circles no matter what font is used a...Mario Vavti2015-03-142-7/+12
* | | mysql schema typo, do the install check for store before chcking smarty, as t...friendica2015-03-154-6/+6
|/ /
* | revert the revert - that is working. My test was bad.friendica2015-03-141-3/+3
* | revert and rethinkfriendica2015-03-142-4/+4
* | create terms for Diaspora mention tags - which in Diaspora are handled differ...friendica2015-03-132-9/+103
* | Merge pull request #929 from zzottel/masterRedMatrix2015-03-141-3/+3
|\ \
| * | fix posts not showing up in network if author is not in connectionszottel2015-03-141-3/+3
* | | Merge pull request #928 from dawnbreak/docuRedMatrix2015-03-142-29/+69
|\ \ \ | |/ / |/| |
| * | Some documentation, fix chatroom service class lookup.Klaus Weidenbach2015-03-142-29/+69
* | | use local_channel() connnections to match the abook against when joining the ...friendica2015-03-131-2/+2
* | | make nav badges big enough to be clickable on small touch devicesfriendica2015-03-131-0/+5
* | | invoke tgroup_check() on diaspora posts/comments in case the recipient is a f...friendica2015-03-131-19/+34
|/ /
* | update to-do listfriendica2015-03-133-3962/+2153
* | revert thatfriendica2015-03-121-4/+25
* | try to allow translation of ax regsfriendica2015-03-121-29/+52
* | support a fair number of the common AX regsfriendica2015-03-121-5/+68
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-123-68/+99
|\ \
| * \ Merge pull request #927 from dawnbreak/masterRedMatrix2015-03-133-68/+99
| |\ \
| | * | Some cleanups.Klaus Weidenbach2015-03-133-68/+99
* | | | Add some AX vars to openid server.friendica2015-03-121-11/+28
|/ / /
* | | more JS=1 weirdnessfriendica2015-03-121-1/+1
* | | reduce the occurrence of duplicated notice() messagesfriendica2015-03-121-5/+8
* | | prepare for demise of google codefriendica2015-03-122-1/+9
* | | try and add some regsfriendica2015-03-122-1/+3
* | | Merge pull request #926 from dawnbreak/masterKlaus2015-03-121-56/+46
|\| |
| * | Fix JavaScript problems on channels where you are not allowed to upload photos.Klaus Weidenbach2015-03-121-56/+46
|/ /
* | add generic_addon_settings template and minor fixesMario Vavti2015-03-123-2/+19
* | Merge branch 'master' of https://github.com/friendica/redMario Vavti2015-03-121-1/+1
|\ \
| * | substr() is a mysql alias for substring(). substring() is in the SQL standard...Habeas Codice2015-03-121-1/+1
* | | some work on feature/addon settingsMario Vavti2015-03-123-43/+32
|/ /
* | openid stufffriendica2015-03-112-36/+50
* | Merge branch 'master' into openidfriendica2015-03-1114-25/+105
|\ \
| * | remove the now redundant audio/video buttons and label the editor text style ...friendica2015-03-118-11/+36
| * | Merge pull request #925 from unary/fixinsertRedMatrix2015-03-121-1/+1
| |\ \
| | * | add missing %d for abook_closenessMichael Johnston2015-03-111-1/+1
| * | | make embeds bookmarkablefriendica2015-03-111-1/+1
| * | | turn parse_url into the definitive url attaching mechanismfriendica2015-03-112-3/+35
| * | | parse_url changes for oembed/zvideo/etc.friendica2015-03-111-8/+22
| |/ /
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-111-1/+4
| |\ \
| | * | update sample-nginx.conf redirect to check for argsMario Vavti2015-03-111-1/+4
| * | | don't relay diaspora comments to sys channelfriendica2015-03-111-0/+6
| |/ /
* | | Merge branch 'master' into openidfriendica2015-03-1112-177/+16
|\| |